rpms/python-setuptools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Only verify bundled provides --without bootstrap, supply all vendor files at once

Browse Source 
The initial build for new Python version does not yet have the script available.
Multiple input files for the script are supported since Fedora 35,
but we keep the versioned BuildRequires for RHEL's sake.

The $PWD makes no sense --without bootstrap and the script should not even import pkg_resources,
see https://src.fedoraproject.org/rpms/python-rpm-generators/pull-request/59
This commit is contained in:
Miro Hrončok 2023-03-07 17:44:57 +01:00
parent 2c17e79de6
commit d5c59824d3
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python-setuptools.spec
View File

@ -56,8 +56,8 @@ BuildRequires: pyproject-rpm-macros >= 0-44
BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-setuptools
# python3 bootstrap: this is built before the final build of python3, which # python3 bootstrap: this is built before the final build of python3, which
# adds the dependency on python3-rpm-generators, so we require it manually # adds the dependency on python3-rpm-generators, so we require it manually
# The minimal version is for bundled provides verification script # The minimal version is for bundled provides verification script to accept multiple files as input
BuildRequires: python3-rpm-generators >= 11-8 BuildRequires: python3-rpm-generators >= 12-8
%endif %endif
%description %description
@ -69,11 +69,8 @@ This package also contains the runtime components of setuptools, necessary to
execute the software that requires pkg_resources. execute the software that requires pkg_resources.
# Virtual provides for the packages bundled by setuptools. # Virtual provides for the packages bundled by setuptools.
# Bundled packages are defined in two files: # Bundled packages are defined in multiple files. Generate the list with:
# - pkg_resources/_vendor/vendored.txt, and # %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{python3_pkgversion}dist' */_vendor/vendored.txt
# - setuptools/_vendor/vendored.txt
# Merge them to one and then generate the list with:
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{python3_pkgversion}dist' allvendor.txt
%global bundled %{expand: %global bundled %{expand:
Provides: bundled(python%{python3_pkgversion}dist(appdirs)) = 1.4.3 Provides: bundled(python%{python3_pkgversion}dist(appdirs)) = 1.4.3
Provides: bundled(python%{python3_pkgversion}dist(importlib-metadata)) = 4.11.1 Provides: bundled(python%{python3_pkgversion}dist(importlib-metadata)) = 4.11.1
@ -171,11 +168,10 @@ install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_w
%check %check
# Verify bundled provides are up to date, pythonbundles.py uses pkg_resources from $PWD
cat pkg_resources/_vendor/vendored.txt setuptools/_vendor/vendored.txt > allvendor.txt
PYTHONPATH=. %{_rpmconfigdir}/pythonbundles.py allvendor.txt --namespace 'python%{python3_pkgversion}dist' --compare-with '%{bundled}'
%if %{without bootstrap} %if %{without bootstrap}
# Verify bundled provides are up to date
%{_rpmconfigdir}/pythonbundles.py */_vendor/vendored.txt --namespace 'python%{python3_pkgversion}dist' --compare-with '%{bundled}'
# Regression test, the wheel should not be larger than 900 kB # Regression test, the wheel should not be larger than 900 kB
# https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3 # https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3
test $(stat --format %%s %{_pyproject_wheeldir}/%{python_wheel_name}) -lt 900000 test $(stat --format %%s %{_pyproject_wheeldir}/%{python_wheel_name}) -lt 900000