PR#1: Update to 5.0.0 - rpms/auditwheel

rpms / auditwheel

#1 Update to 5.0.0

Merged 2 years ago by churchyard. Opened 2 years ago by churchyard.

rpms/ churchyard/auditwheel 5.0.0 into rawhide

Update to 5.0.0

Miro Hrončok • 2 years ago

4a4b18f

319.patch

file removed

-28

		`@@ -1,28 +0,0 @@`
		`- From 520e5fb4c710b08a56c7ff3493af89e1d3348a8e Mon Sep 17 00:00:00 2001`
		`- From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>`
		`- Date: Fri, 13 Aug 2021 15:29:40 +0200`
		`- Subject: [PATCH] Don't installs self in tox deps`
		`-`
		`- Tox already does that by default.`
		`-`
		`- In Fedora, when we build RPM packages,`
		`- we use a tox plugin that installs the test requirements from RPMs.`
		`- It does not know how to install the package we are building.`
		`- ---`
		`- tox.ini \| 3 +--`
		`- 1 file changed, 1 insertion(+), 2 deletions(-)`
		`-`
		`- diff --git a/tox.ini b/tox.ini`
		`- index 5f25cf3c..43c5b6d4 100644`
		`- --- a/tox.ini`
		`- +++ b/tox.ini`
		`- @@ -4,8 +4,7 @@ skipsdist = True`
		`- envlist = py36,py37,py38,py39,lint,cov`
		`-`
		`- [testenv]`
		`- -deps = .`
		`- - -r{toxinidir}/test-requirements.txt`
		`- +deps = -r{toxinidir}/test-requirements.txt`
		`- commands = pytest --doctest-modules auditwheel tests []`
		`-`
		`- [testenv:lint]`

auditwheel.spec

file modified

+20 -28

		`@@ -1,5 +1,5 @@`
		`Name: auditwheel`
		`- Version: 4.0.0`
		`+ Version: 5.0.0`
		`Release: 1%{?dist}`
		`Summary: Cross-distribution Linux wheels auditing and relabeling`

		`@@ -7,9 +7,6 @@`
		`URL: https://github.com/pypa/auditwheel`
		`Source0: %{pypi_source}`

		`- # Don't installs self in tox deps, merged upstream`
		`- Patch1: https://github.com/pypa/auditwheel/pull/319.patch`
		`-`
		`BuildArch: noarch`
		`BuildRequires: python3-devel`

		`@@ -46,28 +43,15 @@`

		`%prep`
		`%autosetup -p1`
		`- # Coverage, we don't need that`
		`- # https://github.com/pypa/auditwheel/issues/322`
		`- sed -E -i '/\bpytest-cov\b/d' test-requirements.txt`
		`-`
		`- # Linters, we don't need those`
		`- # https://github.com/pypa/auditwheel/issues/322`
		`- sed -E -i '/\b(flake8\|mypy)\b/d' test-requirements.txt`
		`-`
		`# pypatchelf is patchelf, packaged for pip -- we'll use the native one instead`
		`sed -E -i '/\bpypatchelf\b/d' test-requirements.txt`

		`# docker is only used for integration testing we don't run`
		`sed -E -i '/\bdocker\b/d' test-requirements.txt`

		`- # There is an undeclared dependency on setuptools/pkg_resources,`
		`- # once https://github.com/pypa/auditwheel/pull/307 is released, this can be removed`
		`- grep 'import pkg_resources' auditwheel/main.py # make sure this is still relevant`
		`- echo setuptools >> requirements.txt`
		`-`

		`%generate_buildrequires`
		`- %pyproject_buildrequires -t`
		`+ %pyproject_buildrequires -r test-requirements.txt`


		`%build`
		`@@ -78,29 +62,37 @@`
		`%pyproject_install`
		`%pyproject_save_files auditwheel`

		`- # https://github.com/pypa/auditwheel/issues/321`
		`- cp -p auditwheel/policy/*.json %{buildroot}%{python3_sitelib}/auditwheel/policy/`
		`-`

		`%check`
		`- # We cannot run %%tox here:`
		`- # - it runs pytest with --doctest-modules and fails:`
		`- # https://github.com/pypa/auditwheel/issues/320`
		`- # - it runs integration tests in docker manylinux images`
		`+ # Upstream uses nox, so we invoke pytest directly`
		`+ # Integration tests need docker manylinux images, so we only run unit`
		`%pytest -v tests/unit`

		`- # Assert the bundled wheel version`
		`+ # Sanity check for the command line tool`
		`export PYTHONPATH=%{buildroot}%{python3_sitelib}`
		`+ %{buildroot}%{_bindir}/auditwheel --help`
		`+ %{buildroot}%{_bindir}/auditwheel lddtree %{python3}`
		`+`
		`+ # Assert the bundled wheel version, assumes $PYTHONPATH already exported`
		`test "$(%{python3} -c 'from auditwheel._vendor import wheel; print(wheel.__version__)')" == "%{wheel_version}"`

		`+ # Assert the policy files are installed`
		`+ # Regression test for https://github.com/pypa/auditwheel/issues/321`
		`+ for json in manylinux-policy.json musllinux-policy.json policy-schema.json; do`
		`+ test -f %{buildroot}%{python3_sitelib}/auditwheel/policy/${json}`
		`+ done`
		`+`
		`+`
		`%files -f %{pyproject_files}`
		`%doc README.rst`
		`%{_bindir}/auditwheel`
		`- # https://github.com/pypa/auditwheel/issues/321`
		`- %{python3_sitelib}/auditwheel/policy/*.json`


		`%changelog`
		`+ * Mon Sep 20 2021 Miro Hrončok <mhroncok@redhat.com> - 5.0.0-1`
		`+ - Update to 5.0.0`
		`+ - Fixes: rhbz#2005582`
		`+`
		`* Fri Aug 13 2021 Miro Hrončok <mhroncok@redhat.com> - 4.0.0-1`
		`- Initial package`
		`- Fixes: rhbz#1993535`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (auditwheel-4.0.0.tar.gz) = ab93828de9a22c054a1164605a48b57521cf75ea7d41e7cd1acee76bcf0ffd9308539b152c14328d087d57791a5e62182430226a9255b86a12e971c7d94aaca3`
		`+ SHA512 (auditwheel-5.0.0.tar.gz) = eb7175208966833e6cb80197470737309deb0a13cf5e79d28aeb7340e5988c9ae1722e7ac6c4ab76f16c75de5c1ba27255cdf2f5b7860dcb8a9143a1e4cb879c`

no initial comment

rebased onto f28a864

2 years ago

rebased onto 4a4b18f

2 years ago

cstratak commented 2 years ago

Everything looks good from a SPEC sanity perspective. Most of the changes are related to upstream fixes which were hacked before at the SPEC. Feel free to merge.

Pull-Request has been merged by churchyard

2 years ago