#49 F31: Handle extracting debuginfo from extension modules
Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.
rpms/ churchyard/pyproject-rpm-macros debugsource  into  f31

file modified
+1 -1
@@ -33,7 +33,7 @@ 

      %install

      %pyproject_install

  

- `%pyproject_install` installs all wheels in `$PWD/pyproject-macros-wheeldir/`. If you would like to save wheels somewhere else redefine `%{_pyproject_wheeldir}`.

+ `%pyproject_install` installs all wheels in `$PWD/pyproject-wheeldir/`. If you would like to save wheels somewhere else redefine `%{_pyproject_wheeldir}`.

  

  

  Adding run-time and test-time dependencies

file modified
+15 -2
@@ -1,14 +1,27 @@ 

- %_pyproject_wheeldir ./pyproject-macros-wheeldir

+ # This is a directory where wheels are stored and installed from, relative to PWD

+ %_pyproject_wheeldir pyproject-wheeldir

+ 

+ # This is a directory used as TMPDIR, where pip copies sources to and builds from, relative to PWD

+ # For proper debugsource packages, we create TMPDIR within PWD

+ # See https://github.com/pypa/pip/issues/7555#issuecomment-595180864

+ #

+ # This will be used in debugsource package paths (applies to extension modules only)

+ # NB: pytest collects tests from here if not hidden

+ #     https://docs.pytest.org/en/latest/reference.html#confval-norecursedirs

+ %_pyproject_builddir .pyproject-builddir

  

  %pyproject_files %{_builddir}/pyproject-files

  

  %pyproject_wheel() %{expand:\\\

+ export TMPDIR="${PWD}/%{_pyproject_builddir}"

+ mkdir -p "${TMPDIR}"

  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" \\\

- %{__python3} -m pip wheel --wheel-dir %{_pyproject_wheeldir} --no-deps --use-pep517 --no-build-isolation --disable-pip-version-check --progress-bar off --verbose .

+ %{__python3} -m pip wheel --wheel-dir %{_pyproject_wheeldir} --no-deps --use-pep517 --no-build-isolation --disable-pip-version-check --no-clean --progress-bar off --verbose .

  }

  

  

  %pyproject_install() %{expand:\\\

+ export TMPDIR="${PWD}/%{_pyproject_builddir}"

  %{__python3} -m pip install --root %{buildroot} --no-deps --disable-pip-version-check --progress-bar off --verbose --ignore-installed --no-warn-script-location %{_pyproject_wheeldir}/*.whl

  if [ -d %{buildroot}%{_bindir} ]; then

    pathfix.py -pni "%{__python3}" -k%{?py3_shbang_opts: -a%{py3_shbang_opts_nodash}} %{buildroot}%{_bindir}/*

@@ -102,6 +102,7 @@ 

  %changelog

  * Wed Apr 15 2020 Patrik Kopkan <pkopkan@redhat.com> - 0-14

  - Add %%pyproject_save_file macro for generating file section

+ - Handle extracting debuginfo from extension modules (#1806625)

  

  * Mon Mar 02 2020 Miro Hrončok <mhroncok@redhat.com> - 0-13

  - Tox dependency generator: Handle deps read in from a text file (#1808601)

file modified
-3
@@ -1,6 +1,3 @@ 

- # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1806625

- %global debug_package %{nil}

- 

  Name:           python-ldap

  Version:        3.1.0

  Release:        9%{?dist}

@@ -1,6 +1,3 @@ 

- # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1806625

- %global debug_package %{nil}

- 

  Name:           python-mistune

  Version:        0.8.3

  Release:        11%{?dist}

Build succeeded.

Build succeeded.

Build succeeded.

Pull-Request has been merged by churchyard

4 years ago