#391 Make %pyproject_build_lib work with RPM 4.16
Merged a year ago by churchyard. Opened a year ago by churchyard.
rpms/ churchyard/pyproject-rpm-macros rpm4.16  into  rawhide

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

  or $PWD/build/lib.%%{python3_platform}-cpython-%%{python3_version_nodots} for packages with extension modules.

  Other build backends and older distributions may need different paths.

  See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/HMLOPAU3RZLXD4BOJHTIPKI3I4U6U7OE/ for details.

- }%{global __pyproject_build_lib_warned 1}}%{expand:\\\

+ }%global __pyproject_build_lib_warned 1}%{expand:\\\

  $(

  pyproject_build_lib=()

  if [ -d build/lib.%{python3_platform}-cpython-%{python3_version_nodots} ]; then

file modified
+8 -6
@@ -28,26 +28,28 @@ 

  

  %prep

  %autosetup -p1 -n virtualenv-%{version}

- # Relax the upper bounds of some dependencies to their known available versions in Fedora 36

- # This can be reduced once Fedora 36 goes EOL, but might still be partially needed on Fedora 37

- sed -i -e 's/distlib<1,>=0.3.6/distlib<1,>=0.3.4/' \

+ # Relax the upper bounds of some dependencies to their known available versions in EL 9

+ sed -i -e 's/distlib<1,>=0.3.6/distlib<1,>=0.3.2/' \

         -e 's/filelock<4,>=3.4.1/filelock<4,>=3.3.1/' \

         -e 's/platformdirs<4,>=2.4/platformdirs<4,>=2.3/' \

+        -e 's/hatchling>=1.12.2/hatchling>=0.25/' \

+        -e 's/hatch-vcs>=0.3/hatch-vcs>=0.2.1/' \

      pyproject.toml

  

  

  %generate_buildrequires

- %pyproject_buildrequires

+ %pyproject_buildrequires -w

  

  

  %build

- %pyproject_wheel

+ # %%pyproject_buildrequires -w makes this redundant

+ # %%pyproject_wheel

  

  

  %install

  %pyproject_install

  %pyproject_save_files virtualenv

- %{?fc36:

+ %{?el9:

  # old version of setuptools_scm produces files incompatible with

  # assumptions in virtualenv code, we append the expected attributes:

  echo '__version__, __version_tuple__ = version, version_tuple' >> %{buildroot}%{python3_sitelib}/virtualenv/version.py

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/7144948373214daf83104766c4ab3ad0

1 new commit added

  • CI: Make python-virtualenv.spec EL9-compatible
a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/c4843d99d9a54abe91f549c573c07849

2 new commits added

  • CI: Make python-virtualenv.spec EL9-compatible
  • Make %pyproject_build_lib work with RPM 4.16
a year ago

I plan to merge this. It has unblocked the c9s CI and the change is trivial. The rawhide failure is expected (escape_percentages only).

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/d7563fdda2154ab293b64f275c907a49

Pull-Request has been merged by churchyard

a year ago