From 58138c0ff904a4b7748403d2daa6291b222af022 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 11:11:49 +0000 Subject: [PATCH 01/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 42f4b34..382e56a 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -10,7 +10,7 @@ Name: python-%{pypi_name} Version: 16.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -167,6 +167,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 16.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Mar 22 2017 Lumir Balhar - 16.8-5 - Epel7 compatible spec/package From 96786c9fb6fc3f45a91a82faa544cbd0ed7dc019 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 09:33:07 +0000 Subject: [PATCH 02/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 382e56a..9f0a573 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -10,7 +10,7 @@ Name: python-%{pypi_name} Version: 16.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -167,6 +167,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 16.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 16.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 75f037510f9295a095c9385fb073480daf4b159e Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Fri, 9 Feb 2018 14:39:59 +0100 Subject: [PATCH 03/89] Update Python 2 dependency declarations to new packaging standards --- python-packaging.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 9f0a573..ea93e7a 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -10,7 +10,7 @@ Name: python-%{pypi_name} Version: 16.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -32,8 +32,8 @@ BuildRequires: pyparsing BuildRequires: python-sphinx %endif -BuildRequires: python-pretend -BuildRequires: python-six +BuildRequires: python2-pretend +BuildRequires: python2-six # Build Python 3 subpackage only for Fedora %if 0%{?with_python3} @@ -48,7 +48,7 @@ BuildRequires: python%{python3_pkgversion}-sphinx %if 0%{?build_wheel} BuildRequires: python2-pip -BuildRequires: python-wheel +BuildRequires: python2-wheel %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-wheel @@ -69,7 +69,7 @@ Requires: python2-pyparsing Requires: pyparsing %endif -Requires: python-six +Requires: python2-six %description -n python2-%{pypi_name} python2-packaging provides core utilities for Python packages like utilities for @@ -167,6 +167,10 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Fri Feb 09 2018 Iryna Shcherbina - 16.8-8 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 16.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 993ddb642862f106356098c53bd4c1240e7a9443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Jun 2018 13:56:37 +0200 Subject: [PATCH 04/89] Make it able to boostrap --- python-packaging.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index ea93e7a..8a7d319 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -5,6 +5,9 @@ %global with_python3 1 %endif +# Use this when bootstraping python3-sphinx +%bcond_with bootstrap + %global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl %global python3_wheelname %python2_wheelname @@ -43,7 +46,12 @@ BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pretend BuildRequires: python%{python3_pkgversion}-pyparsing BuildRequires: python%{python3_pkgversion}-six +%if %{without bootstrap} BuildRequires: python%{python3_pkgversion}-sphinx +%else +# When bootstrapping, we'll use Python 2 sphinx +BuildRequires: python2-sphinx +%endif %endif %if 0%{?build_wheel} @@ -113,7 +121,7 @@ rm -rf %{pypi_name}.egg-info %endif # generate html docs -%if 0%{?with_python3} +%if 0%{?with_python3} && %{without bootstrap} sphinx-build-3 docs html %else sphinx-build docs html From 9f04931a31914e0c34b53964c3b15b979503faa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Jun 2018 14:13:15 +0200 Subject: [PATCH 05/89] Bootstrap for Python 3.7 --- python-packaging.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 8a7d319..f3455e2 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global pypi_name packaging %if 0%{?fedora} @@ -13,7 +14,7 @@ Name: python-%{pypi_name} Version: 16.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -175,6 +176,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Thu Jun 14 2018 Miro Hrončok - 16.8-9 +- Bootstrap for Python 3.7 + * Fri Feb 09 2018 Iryna Shcherbina - 16.8-8 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 0c60185e6c6b1149a48749ccc3da8ebf749dd809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 16 Jun 2018 02:01:36 +0200 Subject: [PATCH 06/89] Rebuilt for Python 3.7 --- python-packaging.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index f3455e2..14718b4 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global pypi_name packaging %if 0%{?fedora} @@ -14,7 +13,7 @@ Name: python-%{pypi_name} Version: 16.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -176,6 +175,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Sat Jun 16 2018 Miro Hrončok - 16.8-10 +- Rebuilt for Python 3.7 + * Thu Jun 14 2018 Miro Hrončok - 16.8-9 - Bootstrap for Python 3.7 From 814f7927311bff3ed69ca6a0a362b2048eb65821 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 01:17:34 +0000 Subject: [PATCH 07/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 14718b4..d998cda 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -13,7 +13,7 @@ Name: python-%{pypi_name} Version: 16.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -175,6 +175,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 16.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Jun 16 2018 Miro Hrončok - 16.8-10 - Rebuilt for Python 3.7 From fc46f80474315bc170e7419fbe3a1f9e7cd8b116 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Wed, 14 Mar 2018 17:50:34 +0100 Subject: [PATCH 08/89] Update to 17.1 --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 14dd33f..0448e01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /packaging-16.7.tar.gz /packaging-16.8.tar.gz +/packaging-17.1.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index d998cda..1afecaa 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -12,8 +12,8 @@ %global python3_wheelname %python2_wheelname Name: python-%{pypi_name} -Version: 16.8 -Release: 11%{?dist} +Version: 17.1 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -175,6 +175,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Tue Jul 31 2018 Charalampos Stratakis - 17.1-1 +- Update to 17.1 + * Sat Jul 14 2018 Fedora Release Engineering - 16.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 5a8f473..bc39b9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53895cdca04ecff80b54128e475b5d3b packaging-16.8.tar.gz +SHA512 (packaging-17.1.tar.gz) = 52d2f482ae5cd0f8e7b3ac35c4b270ca736bc4f7ebaa569631d1dcb8ea024ee6f75127ca2aa3c95e686ebbd427de2ef4bc01bcd839591f7b4c1e26f9b8d9acb0 From 3ec3e60d690d4b6b7b25c2a1b8b901802f7374da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 08:11:48 +0000 Subject: [PATCH 09/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 1afecaa..e9df075 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -13,7 +13,7 @@ Name: python-%{pypi_name} Version: 17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -175,6 +175,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 31 2018 Charalampos Stratakis - 17.1-1 - Update to 17.1 From 78515a2851aa9e8fbcb8d409abfa704cb6177c2a Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 5 Feb 2019 10:20:42 +0100 Subject: [PATCH 10/89] New upstream version --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0448e01..36932c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /packaging-16.7.tar.gz /packaging-16.8.tar.gz /packaging-17.1.tar.gz +/packaging-19.0.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index e9df075..a1185e7 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -12,8 +12,8 @@ %global python3_wheelname %python2_wheelname Name: python-%{pypi_name} -Version: 17.1 -Release: 2%{?dist} +Version: 19.0 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -175,6 +175,9 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %changelog +* Mon Feb 04 2019 Lumír Balhar - 19.0-1 +- New upstream version + * Sat Feb 02 2019 Fedora Release Engineering - 17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index bc39b9f..8930d0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-17.1.tar.gz) = 52d2f482ae5cd0f8e7b3ac35c4b270ca736bc4f7ebaa569631d1dcb8ea024ee6f75127ca2aa3c95e686ebbd427de2ef4bc01bcd839591f7b4c1e26f9b8d9acb0 +SHA512 (packaging-19.0.tar.gz) = aa55b6fbca764e7de2992e294b7be9dc90b25f88b64ba0cd2d1d93042402d4360b4c2cdc134a94b083da0c0bc83de8fa7185c0856bcc96fa25828c10a793fba7 From 727d7901c5b73bd33942b465d23099b9bc79d4b1 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Wed, 20 Feb 2019 01:16:22 +0100 Subject: [PATCH 11/89] Clause in 0%{?rhel} >= 8 similar in value to 0%{?fedora} --- python-packaging.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index a1185e7..a967263 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,6 +1,6 @@ %global pypi_name packaging -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 %global build_wheel 1 %global with_python3 1 %endif @@ -22,7 +22,7 @@ Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{ BuildArch: noarch # Dependencies with different names in Fedora and Epel7 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: python2-setuptools BuildRequires: python2-devel BuildRequires: python2-pytest @@ -71,7 +71,7 @@ dealing with versions, specifiers, markers etc. Summary: %{summary} %{?python_provide:%python_provide python2-%{pypi_name}} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Requires: python2-pyparsing %else Requires: pyparsing @@ -148,7 +148,7 @@ rm -rf html/_static/fonts/ %endif %check -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 %{__python2} -m pytest tests/ %{__python3} -m pytest tests/ %else From 89ba51cee2bf7300783d2fa7c50e760b4325043d Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Wed, 20 Feb 2019 01:35:13 +0100 Subject: [PATCH 12/89] Instead of a bcond for bootstrap, use one for docs --- python-packaging.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index a967263..5af3b98 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -5,8 +5,8 @@ %global with_python3 1 %endif -# Use this when bootstraping python3-sphinx -%bcond_with bootstrap +# Specify --without docs to prevent the dependency loop on python-sphinx +%bcond_without docs %global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl %global python3_wheelname %python2_wheelname @@ -32,8 +32,10 @@ BuildRequires: python-setuptools BuildRequires: python-devel BuildRequires: pytest BuildRequires: pyparsing +%if %{with docs} BuildRequires: python-sphinx %endif +%endif BuildRequires: python2-pretend BuildRequires: python2-six @@ -46,11 +48,8 @@ BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pretend BuildRequires: python%{python3_pkgversion}-pyparsing BuildRequires: python%{python3_pkgversion}-six -%if %{without bootstrap} +%if %{with docs} BuildRequires: python%{python3_pkgversion}-sphinx -%else -# When bootstrapping, we'll use Python 2 sphinx -BuildRequires: python2-sphinx %endif %endif @@ -87,18 +86,22 @@ dealing with versions, specifiers, markers etc. %package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} - + Requires: python%{python3_pkgversion}-pyparsing Requires: python%{python3_pkgversion}-six + %description -n python%{python3_pkgversion}-%{pypi_name} python3-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. %endif +%if %{with docs} %package -n python-%{pypi_name}-doc Summary: python-packaging documentation + %description -n python-%{pypi_name}-doc Documentation for python-packaging +%endif %prep %autosetup -n %{pypi_name}-%{version} @@ -120,8 +123,9 @@ rm -rf %{pypi_name}.egg-info %endif %endif +%if %{with docs} # generate html docs -%if 0%{?with_python3} && %{without bootstrap} +%if 0%{?with_python3} sphinx-build-3 docs html %else sphinx-build docs html @@ -131,6 +135,7 @@ sphinx-build docs html rm -rf html/.{doctrees,buildinfo} # Do not bundle fonts rm -rf html/_static/fonts/ +%endif %install %if 0%{?build_wheel} @@ -170,9 +175,11 @@ rm -rf html/_static/fonts/ %{python3_sitelib}/%{pypi_name}-*-info/ %endif +%if %{with docs} %files -n python-%{pypi_name}-doc %doc html %license LICENSE LICENSE.APACHE LICENSE.BSD +%endif %changelog * Mon Feb 04 2019 Lumír Balhar - 19.0-1 From a80880e08b1ceea990ade05759017c7a846b058a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 15:01:15 +0000 Subject: [PATCH 13/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 5af3b98..743cc11 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -13,7 +13,7 @@ Name: python-%{pypi_name} Version: 19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -182,6 +182,9 @@ rm -rf html/_static/fonts/ %endif %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Feb 04 2019 Lumír Balhar - 19.0-1 - New upstream version From 2d040a4275c5650a68bd2f2cb97aaf10361ae50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 14:42:42 +0200 Subject: [PATCH 14/89] Add bcond for tests --- python-packaging.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 743cc11..4140d05 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -8,6 +8,9 @@ # Specify --without docs to prevent the dependency loop on python-sphinx %bcond_without docs +# Specify --without tests to prevent the dependency loop on python-pytest +%bcond_without tests + %global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl %global python3_wheelname %python2_wheelname @@ -25,29 +28,35 @@ BuildArch: noarch %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: python2-setuptools BuildRequires: python2-devel -BuildRequires: python2-pytest BuildRequires: python2-pyparsing +%if %{with tests} +BuildRequires: python2-pytest +%endif %else BuildRequires: python-setuptools BuildRequires: python-devel -BuildRequires: pytest BuildRequires: pyparsing +%if %{with tests} +BuildRequires: pytest +BuildRequires: python2-pretend +%endif %if %{with docs} BuildRequires: python-sphinx %endif %endif -BuildRequires: python2-pretend BuildRequires: python2-six # Build Python 3 subpackage only for Fedora %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-pretend BuildRequires: python%{python3_pkgversion}-pyparsing BuildRequires: python%{python3_pkgversion}-six +%if %{with tests} +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-pretend +%endif %if %{with docs} BuildRequires: python%{python3_pkgversion}-sphinx %endif @@ -152,6 +161,7 @@ rm -rf html/_static/fonts/ %endif %endif +%if %{with tests} %check %if 0%{?fedora} || 0%{?rhel} >= 8 %{__python2} -m pytest tests/ @@ -160,6 +170,7 @@ rm -rf html/_static/fonts/ # Disable non-working tests in Epel7 %{__python2} -m pytest --ignore=tests/test_requirements.py tests/ %endif +%endif %files -n python2-%{pypi_name} %license LICENSE LICENSE.APACHE LICENSE.BSD From 336f15f7ee4b922ef10674e2a2b732798420ab1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 14:43:24 +0200 Subject: [PATCH 15/89] Bootstrap for Python 3.8 --- python-packaging.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 4140d05..7ac757c 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_docs 1 %global pypi_name packaging %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -16,7 +18,7 @@ Name: python-%{pypi_name} Version: 19.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -193,6 +195,9 @@ rm -rf html/_static/fonts/ %endif %changelog +* Thu Aug 15 2019 Miro Hrončok - 19.0-3 +- Bootstrap for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 822b58197592e5c502d38d5a7b711b4195cbfdbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 16 Aug 2019 16:39:35 +0200 Subject: [PATCH 16/89] Rebuilt for Python 3.8 --- python-packaging.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 7ac757c..9abff2c 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,5 +1,3 @@ -%global _without_tests 1 -%global _without_docs 1 %global pypi_name packaging %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -18,7 +16,7 @@ Name: python-%{pypi_name} Version: 19.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -195,6 +193,9 @@ rm -rf html/_static/fonts/ %endif %changelog +* Fri Aug 16 2019 Miro Hrončok - 19.0-4 +- Rebuilt for Python 3.8 + * Thu Aug 15 2019 Miro Hrončok - 19.0-3 - Bootstrap for Python 3.8 From 7fe02ad74e2b2a070baff5c0a0f789ba300d237c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 16 Aug 2019 17:07:06 +0200 Subject: [PATCH 17/89] Fix tests BRs --- python-packaging.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-packaging.spec b/python-packaging.spec index 9abff2c..036d9f0 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -31,6 +31,7 @@ BuildRequires: python2-devel BuildRequires: python2-pyparsing %if %{with tests} BuildRequires: python2-pytest +BuildRequires: python2-pretend %endif %else BuildRequires: python-setuptools From 91c87948148c5fa5a306b594cb34fe8313641f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Sep 2019 11:25:46 +0200 Subject: [PATCH 18/89] Reduce Python 2 build time dependencies --- python-packaging.spec | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 036d9f0..242d0d5 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -11,12 +11,11 @@ # Specify --without tests to prevent the dependency loop on python-pytest %bcond_without tests -%global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl -%global python3_wheelname %python2_wheelname +%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl Name: python-%{pypi_name} Version: 19.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -64,8 +63,6 @@ BuildRequires: python%{python3_pkgversion}-sphinx %endif %if 0%{?build_wheel} -BuildRequires: python2-pip -BuildRequires: python2-wheel %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-wheel @@ -119,11 +116,7 @@ Documentation for python-packaging rm -rf %{pypi_name}.egg-info %build -%if 0%{?build_wheel} -%py2_build_wheel -%else %py2_build -%endif %if 0%{?with_python3} %if 0%{?build_wheel} @@ -148,15 +141,11 @@ rm -rf html/_static/fonts/ %endif %install -%if 0%{?build_wheel} -%py2_install_wheel %{python2_wheelname} -%else %py2_install -%endif %if 0%{?with_python3} %if 0%{?build_wheel} -%py3_install_wheel %{python3_wheelname} +%py3_install_wheel %{python_wheelname} %else %py3_install %endif @@ -194,6 +183,9 @@ rm -rf html/_static/fonts/ %endif %changelog +* Mon Sep 02 2019 Miro Hrončok - 19.0-5 +- Reduce Python 2 build time dependencies + * Fri Aug 16 2019 Miro Hrončok - 19.0-4 - Rebuilt for Python 3.8 From 1901358560cd4ff4d553aa0dda3a0be231efe42d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 23 Sep 2019 10:26:44 +0200 Subject: [PATCH 19/89] Remove Python 2 subpackage and make spec fedora-specific --- python-packaging.spec | 122 +++++++++--------------------------------- 1 file changed, 25 insertions(+), 97 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 242d0d5..2d1a333 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,9 +1,7 @@ %global pypi_name packaging -%if 0%{?fedora} || 0%{?rhel} >= 8 -%global build_wheel 1 -%global with_python3 1 -%endif +# Specify --without wheel to prevent building the wheel +%bcond_without wheel # Specify --without docs to prevent the dependency loop on python-sphinx %bcond_without docs @@ -15,7 +13,7 @@ Name: python-%{pypi_name} Version: 19.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -23,84 +21,37 @@ URL: https://github.com/pypa/packaging Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -# Dependencies with different names in Fedora and Epel7 -%if 0%{?fedora} || 0%{?rhel} >= 8 -BuildRequires: python2-setuptools -BuildRequires: python2-devel -BuildRequires: python2-pyparsing +BuildRequires: python3-setuptools +BuildRequires: python3-devel +BuildRequires: python3-pyparsing +BuildRequires: python3-six %if %{with tests} -BuildRequires: python2-pytest -BuildRequires: python2-pretend -%endif -%else -BuildRequires: python-setuptools -BuildRequires: python-devel -BuildRequires: pyparsing -%if %{with tests} -BuildRequires: pytest -BuildRequires: python2-pretend +BuildRequires: python3-pytest +BuildRequires: python3-pretend %endif %if %{with docs} -BuildRequires: python-sphinx -%endif +BuildRequires: python3-sphinx %endif -BuildRequires: python2-six - -# Build Python 3 subpackage only for Fedora -%if 0%{?with_python3} -BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-pyparsing -BuildRequires: python%{python3_pkgversion}-six -%if %{with tests} -BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-pretend -%endif -%if %{with docs} -BuildRequires: python%{python3_pkgversion}-sphinx -%endif -%endif - -%if 0%{?build_wheel} -%if 0%{?with_python3} -BuildRequires: python%{python3_pkgversion}-pip -BuildRequires: python%{python3_pkgversion}-wheel -%endif +%if %{with wheel} +BuildRequires: python3-pip +BuildRequires: python3-wheel %endif %description python-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. -%package -n python2-%{pypi_name} +%package -n python3-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypi_name}} +%{?python_provide:%python_provide python3-%{pypi_name}} -%if 0%{?fedora} || 0%{?rhel} >= 8 -Requires: python2-pyparsing -%else -Requires: pyparsing -%endif +Requires: python3-pyparsing +Requires: python3-six -Requires: python2-six - -%description -n python2-%{pypi_name} -python2-packaging provides core utilities for Python packages like utilities for -dealing with versions, specifiers, markers etc. - -%if 0%{?with_python3} -%package -n python%{python3_pkgversion}-%{pypi_name} -Summary: %{summary} -%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} - -Requires: python%{python3_pkgversion}-pyparsing -Requires: python%{python3_pkgversion}-six - -%description -n python%{python3_pkgversion}-%{pypi_name} +%description -n python3-%{pypi_name} python3-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. -%endif %if %{with docs} %package -n python-%{pypi_name}-doc @@ -116,24 +67,15 @@ Documentation for python-packaging rm -rf %{pypi_name}.egg-info %build -%py2_build - -%if 0%{?with_python3} -%if 0%{?build_wheel} +%if %{with wheel} %py3_build_wheel %else %py3_build %endif -%endif %if %{with docs} # generate html docs -%if 0%{?with_python3} sphinx-build-3 docs html -%else -sphinx-build docs html -%endif - # remove the sphinx-build leftovers rm -rf html/.{doctrees,buildinfo} # Do not bundle fonts @@ -141,40 +83,22 @@ rm -rf html/_static/fonts/ %endif %install -%py2_install - -%if 0%{?with_python3} -%if 0%{?build_wheel} +%if %{with wheel} %py3_install_wheel %{python_wheelname} %else %py3_install %endif -%endif %if %{with tests} %check -%if 0%{?fedora} || 0%{?rhel} >= 8 -%{__python2} -m pytest tests/ %{__python3} -m pytest tests/ -%else -# Disable non-working tests in Epel7 -%{__python2} -m pytest --ignore=tests/test_requirements.py tests/ -%endif %endif -%files -n python2-%{pypi_name} -%license LICENSE LICENSE.APACHE LICENSE.BSD -%doc README.rst CHANGELOG.rst CONTRIBUTING.rst -%{python2_sitelib}/%{pypi_name}/ -%{python2_sitelib}/%{pypi_name}-*-info/ - -%if 0%{?with_python3} -%files -n python%{python3_pkgversion}-%{pypi_name} +%files -n python3-%{pypi_name} %license LICENSE LICENSE.APACHE LICENSE.BSD %doc README.rst CHANGELOG.rst CONTRIBUTING.rst %{python3_sitelib}/%{pypi_name}/ %{python3_sitelib}/%{pypi_name}-*-info/ -%endif %if %{with docs} %files -n python-%{pypi_name}-doc @@ -183,6 +107,10 @@ rm -rf html/_static/fonts/ %endif %changelog +* Mon Sep 23 2019 Lumír Balhar - 19.0-6 +- Remove Python 2 subpackage +- Make spec fedora-specific + * Mon Sep 02 2019 Miro Hrončok - 19.0-5 - Reduce Python 2 build time dependencies From 5e52c250b873a2acfac5dd1c1c91d80bb9ee5b12 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 26 Sep 2019 11:52:32 +0200 Subject: [PATCH 20/89] New upstream version 19.2 (bz#1742388) --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 36932c9..d03f029 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /packaging-16.8.tar.gz /packaging-17.1.tar.gz /packaging-19.0.tar.gz +/packaging-19.2.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 2d1a333..9bffd86 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -12,8 +12,8 @@ %global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl Name: python-%{pypi_name} -Version: 19.0 -Release: 6%{?dist} +Version: 19.2 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -107,6 +107,9 @@ rm -rf html/_static/fonts/ %endif %changelog +* Thu Sep 26 2019 Lumír Balhar - 19.2-1 +- New upstream version 19.2 (bz#1742388) + * Mon Sep 23 2019 Lumír Balhar - 19.0-6 - Remove Python 2 subpackage - Make spec fedora-specific diff --git a/sources b/sources index 8930d0c..ac84ca1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-19.0.tar.gz) = aa55b6fbca764e7de2992e294b7be9dc90b25f88b64ba0cd2d1d93042402d4360b4c2cdc134a94b083da0c0bc83de8fa7185c0856bcc96fa25828c10a793fba7 +SHA512 (packaging-19.2.tar.gz) = af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a From ac1537fec679b1b4da20d654328b297475591832 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 6 Jan 2020 09:05:18 +0100 Subject: [PATCH 21/89] Update to 20.0 (#1788012) --- .gitignore | 1 + python-packaging.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d03f029..dc4d66e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /packaging-17.1.tar.gz /packaging-19.0.tar.gz /packaging-19.2.tar.gz +/packaging-20.0.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 9bffd86..1090ee6 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -12,7 +12,7 @@ %global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl Name: python-%{pypi_name} -Version: 19.2 +Version: 20.0 Release: 1%{?dist} Summary: Core utilities for Python packages @@ -107,6 +107,9 @@ rm -rf html/_static/fonts/ %endif %changelog +* Mon Jan 06 2020 Lumír Balhar - 20.0-1 +- Update to 20.0 (#1788012) + * Thu Sep 26 2019 Lumír Balhar - 19.2-1 - New upstream version 19.2 (bz#1742388) diff --git a/sources b/sources index ac84ca1..f9929c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-19.2.tar.gz) = af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a +SHA512 (packaging-20.0.tar.gz) = f7d99700d27d5aebbb3343f1de6ee9ce1372750b805c55a40d1a1fbeb6cfcfe2184875db56de175c6cd46e17f1567c30a39d5527870902c3c69168d025447587 From 37523e17a096579a6d1360655710b95b53a07ef7 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 6 Jan 2020 11:39:15 +0100 Subject: [PATCH 22/89] Ignore broken tests --- python-packaging.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 1090ee6..7bcfcdb 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -13,7 +13,7 @@ Name: python-%{pypi_name} Version: 20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -91,7 +91,11 @@ rm -rf html/_static/fonts/ %if %{with tests} %check -%{__python3} -m pytest tests/ +# Ignore test_linux_platforms_manylinux* tests because they seems to be arch-dependant +# GH: https://github.com/pypa/packaging/issues/254 +%{__python3} -m pytest -k \ +'not test_linux_platforms_manylinux1 and not test_linux_platforms_manylinux2010 and not test_linux_platforms_manylinux2014' \ +tests/ %endif %files -n python3-%{pypi_name} @@ -107,6 +111,9 @@ rm -rf html/_static/fonts/ %endif %changelog +* Mon Jan 06 2020 Lumír Balhar - 20.0-2 +- Ignore broken tests + * Mon Jan 06 2020 Lumír Balhar - 20.0-1 - Update to 20.0 (#1788012) From b76594063e94207cecdf5d0386a2d93c30a41a30 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 27 Jan 2020 10:26:46 +0100 Subject: [PATCH 23/89] Update to 20.1 (#1794865) --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc4d66e..42183bc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /packaging-19.0.tar.gz /packaging-19.2.tar.gz /packaging-20.0.tar.gz +/packaging-20.1.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 7bcfcdb..a38fb30 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -12,8 +12,8 @@ %global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl Name: python-%{pypi_name} -Version: 20.0 -Release: 2%{?dist} +Version: 20.1 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -111,6 +111,9 @@ tests/ %endif %changelog +* Mon Jan 27 2020 Lumír Balhar - 20.1-1 +- Update to 20.1 (#1794865) + * Mon Jan 06 2020 Lumír Balhar - 20.0-2 - Ignore broken tests diff --git a/sources b/sources index f9929c2..fda4243 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-20.0.tar.gz) = f7d99700d27d5aebbb3343f1de6ee9ce1372750b805c55a40d1a1fbeb6cfcfe2184875db56de175c6cd46e17f1567c30a39d5527870902c3c69168d025447587 +SHA512 (packaging-20.1.tar.gz) = 1d51e81ab8b8c552d880ae3d210fe140835de181b6fcee3eb382f0f1d6a416e9cbdaeb52a81c50c53d2c5f5cdc40ee516f29ced845868a1bf7be3b23433f21d7 From bca0c5234a7908b8b7dda4b2a38b3812f85d8057 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 13:52:36 +0000 Subject: [PATCH 24/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index a38fb30..eb0c7e1 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -13,7 +13,7 @@ Name: python-%{pypi_name} Version: 20.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -111,6 +111,9 @@ tests/ %endif %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 20.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 27 2020 Lumír Balhar - 20.1-1 - Update to 20.1 (#1794865) From 9ed6379f25023e6d72e3481726544e96c703283d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Fri, 6 Mar 2020 09:14:13 +0100 Subject: [PATCH 25/89] Update to 20.3 (#1810738) --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 42183bc..6cc9a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /packaging-19.2.tar.gz /packaging-20.0.tar.gz /packaging-20.1.tar.gz +/packaging-20.3.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index eb0c7e1..5a9867e 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -12,8 +12,8 @@ %global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl Name: python-%{pypi_name} -Version: 20.1 -Release: 2%{?dist} +Version: 20.3 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -111,6 +111,9 @@ tests/ %endif %changelog +* Fri Mar 06 2020 Lumír Balhar - 20.3-1 +- Update to 20.3 (#1810738) + * Thu Jan 30 2020 Fedora Release Engineering - 20.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index fda4243..fe97836 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-20.1.tar.gz) = 1d51e81ab8b8c552d880ae3d210fe140835de181b6fcee3eb382f0f1d6a416e9cbdaeb52a81c50c53d2c5f5cdc40ee516f29ced845868a1bf7be3b23433f21d7 +SHA512 (packaging-20.3.tar.gz) = b27ad6f72bfe0965a6e6bff78e4e37d4cbab73dc0a1b019673c85615c9d99edf237effeb9756702c6e8c1575a2d981f6d1af364c73d0a451fbb167d64678630f From 3a2a6421c4ef3c3165209dfd4f71bdba90d05084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 6 Mar 2020 14:05:37 +0100 Subject: [PATCH 26/89] Fedora CI: Add %pyproject macros integration tests --- tests/tests.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 tests/tests.yml diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..49b6d3d --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,26 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git" + dest: "pyproject-rpm-macros" + tests: + - pyproject_pytest: + dir: pyproject-rpm-macros/tests + run: ./mocktest.sh python-pytest + - pyproject_entrypoints: + dir: pyproject-rpm-macros/tests + run: ./mocktest.sh python-entrypoints + - pyproject_pluggy: + dir: pyproject-rpm-macros/tests + run: ./mocktest.sh python-pluggy + - pyproject_clikit: + dir: pyproject-rpm-macros/tests + run: ./mocktest.sh python-clikit + required_packages: + - mock + - rpmdevtools + - rpm-build From 5e0e21e9a81e289f8ab3336d210c94fd537b4d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 25 Mar 2020 15:30:51 +0100 Subject: [PATCH 27/89] Enable gating Example copy-pasted from https://docs.fedoraproject.org/en-US/ci/gating/#_enable --- gating.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..282e16b --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 0fd490d885bd8fd48b305eddc3bf2d2638bc54b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 14:55:33 +0200 Subject: [PATCH 28/89] Bootstrap for Python 3.9 --- python-packaging.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 5a9867e..995476e 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_docs 1 %global pypi_name packaging # Specify --without wheel to prevent building the wheel @@ -13,7 +15,7 @@ Name: python-%{pypi_name} Version: 20.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -111,6 +113,9 @@ tests/ %endif %changelog +* Fri May 22 2020 Miro Hrončok - 20.3-2 +- Bootstrap for Python 3.9 + * Fri Mar 06 2020 Lumír Balhar - 20.3-1 - Update to 20.3 (#1810738) From 5048fe4810bce7d84ab6142eeacd068c95de1d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 09:24:37 +0200 Subject: [PATCH 29/89] Rebuilt for Python 3.9 --- python-packaging.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 995476e..b4392bc 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,5 +1,3 @@ -%global _without_tests 1 -%global _without_docs 1 %global pypi_name packaging # Specify --without wheel to prevent building the wheel @@ -15,7 +13,7 @@ Name: python-%{pypi_name} Version: 20.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -113,6 +111,9 @@ tests/ %endif %changelog +* Sat May 23 2020 Miro Hrončok - 20.3-3 +- Rebuilt for Python 3.9 + * Fri May 22 2020 Miro Hrončok - 20.3-2 - Bootstrap for Python 3.9 From 184ce340e41fccb00c54917911b1155c1adb1bb6 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 1 Jun 2020 13:31:10 +0200 Subject: [PATCH 30/89] Update to 20.4 (#1838285) --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6cc9a1e..b58f7e6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /packaging-20.0.tar.gz /packaging-20.1.tar.gz /packaging-20.3.tar.gz +/packaging-20.4.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index b4392bc..6d6a452 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -12,8 +12,8 @@ %global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl Name: python-%{pypi_name} -Version: 20.3 -Release: 3%{?dist} +Version: 20.4 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -111,6 +111,9 @@ tests/ %endif %changelog +* Mon Jun 01 2020 Lumír Balhar - 20.4-1 +- Update to 20.4 (#1838285) + * Sat May 23 2020 Miro Hrončok - 20.3-3 - Rebuilt for Python 3.9 diff --git a/sources b/sources index fe97836..db1ec74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-20.3.tar.gz) = b27ad6f72bfe0965a6e6bff78e4e37d4cbab73dc0a1b019673c85615c9d99edf237effeb9756702c6e8c1575a2d981f6d1af364c73d0a451fbb167d64678630f +SHA512 (packaging-20.4.tar.gz) = d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4 From eaf2953d693669bf3c5d959593e8d8ae58fd7bfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 02:37:08 +0000 Subject: [PATCH 31/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 6d6a452..7617a68 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -13,7 +13,7 @@ Name: python-%{pypi_name} Version: 20.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -111,6 +111,9 @@ tests/ %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 20.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 01 2020 Lumír Balhar - 20.4-1 - Update to 20.4 (#1838285) From 8d87885d584fae06b17642c99acd4252b8414bc9 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 7 Sep 2020 12:17:41 +0200 Subject: [PATCH 32/89] Use `%{python3_pkgversion}` to make specfile more universal --- python-packaging.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 7617a68..2ddbbc5 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -21,35 +21,35 @@ URL: https://github.com/pypa/packaging Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python3-setuptools -BuildRequires: python3-devel -BuildRequires: python3-pyparsing -BuildRequires: python3-six +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-pyparsing +BuildRequires: python%{python3_pkgversion}-six %if %{with tests} -BuildRequires: python3-pytest -BuildRequires: python3-pretend +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-pretend %endif %if %{with docs} -BuildRequires: python3-sphinx +BuildRequires: python%{python3_pkgversion}-sphinx %endif %if %{with wheel} -BuildRequires: python3-pip -BuildRequires: python3-wheel +BuildRequires: python%{python3_pkgversion}-pip +BuildRequires: python%{python3_pkgversion}-wheel %endif %description python-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. -%package -n python3-%{pypi_name} +%package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} -Requires: python3-pyparsing -Requires: python3-six +Requires: python%{python3_pkgversion}-pyparsing +Requires: python%{python3_pkgversion}-six -%description -n python3-%{pypi_name} +%description -n python%{python3_pkgversion}-%{pypi_name} python3-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. @@ -98,7 +98,7 @@ rm -rf html/_static/fonts/ tests/ %endif -%files -n python3-%{pypi_name} +%files -n python%{python3_pkgversion}-%{pypi_name} %license LICENSE LICENSE.APACHE LICENSE.BSD %doc README.rst CHANGELOG.rst CONTRIBUTING.rst %{python3_sitelib}/%{pypi_name}/ From 2a2fb373ad9beda349758f82822af5559928eb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 11:44:11 +0200 Subject: [PATCH 33/89] Drop the dependency on six to make the package lighter --- 39a70cce.patch | 51 +++++++++++++++++++++++++++++++++++++++++++ python-packaging.spec | 12 ++++++---- 2 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 39a70cce.patch diff --git a/39a70cce.patch b/39a70cce.patch new file mode 100644 index 0000000..ed49176 --- /dev/null +++ b/39a70cce.patch @@ -0,0 +1,51 @@ +From 39a70cce69d9b08cc4d02b225114d556d5b59ada Mon Sep 17 00:00:00 2001 +From: Hugo van Kemenade +Date: Wed, 19 Aug 2020 22:37:34 +0300 +Subject: [PATCH] Remove dependency on six to make package lighter (#331) + +--- + packaging/requirements.py | 8 +++++++- + setup.py | 2 +- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/packaging/requirements.py b/packaging/requirements.py +index 91f81ed..2226e98 100644 +--- a/packaging/requirements.py ++++ b/packaging/requirements.py +@@ -5,16 +5,22 @@ + + import string + import re ++import sys + + from pyparsing import stringStart, stringEnd, originalTextFor, ParseException + from pyparsing import ZeroOrMore, Word, Optional, Regex, Combine + from pyparsing import Literal as L # noqa +-from six.moves.urllib import parse as urlparse + + from ._typing import TYPE_CHECKING + from .markers import MARKER_EXPR, Marker + from .specifiers import LegacySpecifier, Specifier, SpecifierSet + ++if sys.version_info[0] >= 3: ++ from urllib import parse as urlparse # pragma: no cover ++else: # pragma: no cover ++ import urlparse ++ ++ + if TYPE_CHECKING: # pragma: no cover + from typing import List + +diff --git a/setup.py b/setup.py +index f533a7d..a14d926 100644 +--- a/setup.py ++++ b/setup.py +@@ -49,7 +49,7 @@ + author=about["__author__"], + author_email=about["__email__"], + python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*", +- install_requires=["pyparsing>=2.0.2", "six"], # Needed to avoid issue #91 ++ install_requires=["pyparsing>=2.0.2"], # Needed to avoid issue #91 + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", diff --git a/python-packaging.spec b/python-packaging.spec index 2ddbbc5..fc5f37f 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -13,7 +13,7 @@ Name: python-%{pypi_name} Version: 20.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -21,10 +21,12 @@ URL: https://github.com/pypa/packaging Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch +# Remove dependency on six to make package lighter, backported from upstream +Patch1: %{url}/commit/39a70cce.patch + BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-pyparsing -BuildRequires: python%{python3_pkgversion}-six %if %{with tests} BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pretend @@ -47,7 +49,6 @@ Summary: %{summary} %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} Requires: python%{python3_pkgversion}-pyparsing -Requires: python%{python3_pkgversion}-six %description -n python%{python3_pkgversion}-%{pypi_name} python3-packaging provides core utilities for Python packages like utilities for @@ -62,7 +63,7 @@ Documentation for python-packaging %endif %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p1 -n %{pypi_name}-%{version} # Remove bundled egg-info rm -rf %{pypi_name}.egg-info @@ -111,6 +112,9 @@ tests/ %endif %changelog +* Fri Oct 02 2020 Miro Hrončok - 20.4-3 +- Drop the dependency on six to make the package lighter + * Wed Jul 29 2020 Fedora Release Engineering - 20.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7bd7dc017503c554488e5c87750fe90439b993ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 11:44:25 +0200 Subject: [PATCH 34/89] Drop manual requires --- python-packaging.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index fc5f37f..f3f8c1c 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -48,8 +48,6 @@ dealing with versions, specifiers, markers etc. Summary: %{summary} %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} -Requires: python%{python3_pkgversion}-pyparsing - %description -n python%{python3_pkgversion}-%{pypi_name} python3-packaging provides core utilities for Python packages like utilities for dealing with versions, specifiers, markers etc. From 523520afa2c83d6db24fb5bb2b92a23be3a3e214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 11:47:24 +0200 Subject: [PATCH 35/89] Run all tests, the manylinux tests were fixed upstream --- python-packaging.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index f3f8c1c..c55e9a1 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -90,11 +90,7 @@ rm -rf html/_static/fonts/ %if %{with tests} %check -# Ignore test_linux_platforms_manylinux* tests because they seems to be arch-dependant -# GH: https://github.com/pypa/packaging/issues/254 -%{__python3} -m pytest -k \ -'not test_linux_platforms_manylinux1 and not test_linux_platforms_manylinux2010 and not test_linux_platforms_manylinux2014' \ -tests/ +%{__python3} -m pytest tests/ %endif %files -n python%{python3_pkgversion}-%{pypi_name} From 0bd61604bbf4fa0bdb30de6f26b60f66e9c3b6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 11:49:19 +0200 Subject: [PATCH 36/89] Switch to %pytest --- python-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index c55e9a1..dd5ca68 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -90,7 +90,7 @@ rm -rf html/_static/fonts/ %if %{with tests} %check -%{__python3} -m pytest tests/ +%pytest %endif %files -n python%{python3_pkgversion}-%{pypi_name} From 696a51ecf39df92b479c7b83ebdc2f9bedbac4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 11:53:00 +0200 Subject: [PATCH 37/89] Use %pypi_source --- python-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index dd5ca68..0d360d7 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -18,7 +18,7 @@ Summary: Core utilities for Python packages License: BSD or ASL 2.0 URL: https://github.com/pypa/packaging -Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: %{pypi_source} BuildArch: noarch # Remove dependency on six to make package lighter, backported from upstream From b03bc8ec553b2906b659c2f1a11d03d49e3ba644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 11:57:24 +0200 Subject: [PATCH 38/89] Drop unused wheel %bcond --- python-packaging.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 0d360d7..b076044 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,8 +1,5 @@ %global pypi_name packaging -# Specify --without wheel to prevent building the wheel -%bcond_without wheel - # Specify --without docs to prevent the dependency loop on python-sphinx %bcond_without docs @@ -35,10 +32,8 @@ BuildRequires: python%{python3_pkgversion}-pretend BuildRequires: python%{python3_pkgversion}-sphinx %endif -%if %{with wheel} BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-wheel -%endif %description python-packaging provides core utilities for Python packages like utilities for @@ -66,11 +61,7 @@ Documentation for python-packaging rm -rf %{pypi_name}.egg-info %build -%if %{with wheel} %py3_build_wheel -%else -%py3_build -%endif %if %{with docs} # generate html docs @@ -82,11 +73,7 @@ rm -rf html/_static/fonts/ %endif %install -%if %{with wheel} %py3_install_wheel %{python_wheelname} -%else -%py3_install -%endif %if %{with tests} %check From 7c53583d11de3185c74f58413fae4db4638b6081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Oct 2020 12:24:34 +0200 Subject: [PATCH 39/89] Convert to pyproject-rpm-macros --- python-packaging.spec | 63 ++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index b076044..d6aa532 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -6,8 +6,6 @@ # Specify --without tests to prevent the dependency loop on python-pytest %bcond_without tests -%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl - Name: python-%{pypi_name} Version: 20.4 Release: 3%{?dist} @@ -21,31 +19,44 @@ BuildArch: noarch # Remove dependency on six to make package lighter, backported from upstream Patch1: %{url}/commit/39a70cce.patch -BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-pyparsing -%if %{with tests} -BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-pretend -%endif -%if %{with docs} -BuildRequires: python%{python3_pkgversion}-sphinx -%endif +BuildRequires: pyproject-rpm-macros +# We specify dependencies to build the wheel manually to avoid circular +# dependency on self. +# We also don't use the python3dist() form, in case packaging is ever used +# in the provides generator. +BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-wheel -%description +# Upstream uses nox for testing, we specify the test deps manually as well. +%if %{with tests} +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-pretend +BuildRequires: python%{python3_pkgversion}-pyparsing +%endif +%if %{with docs} +BuildRequires: python%{python3_pkgversion}-sphinx +BuildRequires: python%{python3_pkgversion}-pyparsing +%endif + + +%global _description %{expand: python-packaging provides core utilities for Python packages like utilities for -dealing with versions, specifiers, markers etc. +dealing with versions, specifiers, markers etc.} + +%description %_description + %package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} -%description -n python%{python3_pkgversion}-%{pypi_name} -python3-packaging provides core utilities for Python packages like utilities for -dealing with versions, specifiers, markers etc. +# This is kept for compatibility with Fedora < 33 only: +%py_provides python%{python3_pkgversion}-%{pypi_name} + +%description -n python%{python3_pkgversion}-%{pypi_name} %_description + %if %{with docs} %package -n python-%{pypi_name}-doc @@ -55,13 +66,13 @@ Summary: python-packaging documentation Documentation for python-packaging %endif + %prep %autosetup -p1 -n %{pypi_name}-%{version} -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info + %build -%py3_build_wheel +%pyproject_wheel %if %{with docs} # generate html docs @@ -72,19 +83,22 @@ rm -rf html/.{doctrees,buildinfo} rm -rf html/_static/fonts/ %endif + %install -%py3_install_wheel %{python_wheelname} +%pyproject_install +%pyproject_save_files %{pypi_name} + %if %{with tests} %check %pytest %endif -%files -n python%{python3_pkgversion}-%{pypi_name} + +%files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files} %license LICENSE LICENSE.APACHE LICENSE.BSD %doc README.rst CHANGELOG.rst CONTRIBUTING.rst -%{python3_sitelib}/%{pypi_name}/ -%{python3_sitelib}/%{pypi_name}-*-info/ + %if %{with docs} %files -n python-%{pypi_name}-doc @@ -92,6 +106,7 @@ rm -rf html/_static/fonts/ %license LICENSE LICENSE.APACHE LICENSE.BSD %endif + %changelog * Fri Oct 02 2020 Miro Hrončok - 20.4-3 - Drop the dependency on six to make the package lighter From 14817c6e2d55eed68a869da721ba1372ca225360 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 30 Nov 2020 09:48:42 +0100 Subject: [PATCH 40/89] Update to 20.7 (#1902369) --- .gitignore | 1 + 39a70cce.patch | 51 ------------------------------------------- python-packaging.spec | 18 ++++++++------- sources | 2 +- 4 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 39a70cce.patch diff --git a/.gitignore b/.gitignore index b58f7e6..f86d466 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /packaging-20.1.tar.gz /packaging-20.3.tar.gz /packaging-20.4.tar.gz +/packaging-20.7.tar.gz diff --git a/39a70cce.patch b/39a70cce.patch deleted file mode 100644 index ed49176..0000000 --- a/39a70cce.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 39a70cce69d9b08cc4d02b225114d556d5b59ada Mon Sep 17 00:00:00 2001 -From: Hugo van Kemenade -Date: Wed, 19 Aug 2020 22:37:34 +0300 -Subject: [PATCH] Remove dependency on six to make package lighter (#331) - ---- - packaging/requirements.py | 8 +++++++- - setup.py | 2 +- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/packaging/requirements.py b/packaging/requirements.py -index 91f81ed..2226e98 100644 ---- a/packaging/requirements.py -+++ b/packaging/requirements.py -@@ -5,16 +5,22 @@ - - import string - import re -+import sys - - from pyparsing import stringStart, stringEnd, originalTextFor, ParseException - from pyparsing import ZeroOrMore, Word, Optional, Regex, Combine - from pyparsing import Literal as L # noqa --from six.moves.urllib import parse as urlparse - - from ._typing import TYPE_CHECKING - from .markers import MARKER_EXPR, Marker - from .specifiers import LegacySpecifier, Specifier, SpecifierSet - -+if sys.version_info[0] >= 3: -+ from urllib import parse as urlparse # pragma: no cover -+else: # pragma: no cover -+ import urlparse -+ -+ - if TYPE_CHECKING: # pragma: no cover - from typing import List - -diff --git a/setup.py b/setup.py -index f533a7d..a14d926 100644 ---- a/setup.py -+++ b/setup.py -@@ -49,7 +49,7 @@ - author=about["__author__"], - author_email=about["__email__"], - python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*", -- install_requires=["pyparsing>=2.0.2", "six"], # Needed to avoid issue #91 -+ install_requires=["pyparsing>=2.0.2"], # Needed to avoid issue #91 - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", diff --git a/python-packaging.spec b/python-packaging.spec index d6aa532..e895cc9 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -7,18 +7,15 @@ %bcond_without tests Name: python-%{pypi_name} -Version: 20.4 -Release: 3%{?dist} +Version: 20.7 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 URL: https://github.com/pypa/packaging -Source0: %{pypi_source} +Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -# Remove dependency on six to make package lighter, backported from upstream -Patch1: %{url}/commit/39a70cce.patch - BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pyproject-rpm-macros @@ -26,9 +23,8 @@ BuildRequires: pyproject-rpm-macros # dependency on self. # We also don't use the python3dist() form, in case packaging is ever used # in the provides generator. -BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-flit-core BuildRequires: python%{python3_pkgversion}-pip -BuildRequires: python%{python3_pkgversion}-wheel # Upstream uses nox for testing, we specify the test deps manually as well. %if %{with tests} @@ -70,6 +66,9 @@ Documentation for python-packaging %prep %autosetup -p1 -n %{pypi_name}-%{version} +# Do not use furo as HTML theme in docs +# furo is not available in Fedora +sed -i '/html_theme = "furo"/d' docs/conf.py %build %pyproject_wheel @@ -108,6 +107,9 @@ rm -rf html/_static/fonts/ %changelog +* Mon Nov 30 2020 Lumír Balhar - 20.7-1 +- Update to 20.7 (#1902369) + * Fri Oct 02 2020 Miro Hrončok - 20.4-3 - Drop the dependency on six to make the package lighter diff --git a/sources b/sources index db1ec74..878f9eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-20.4.tar.gz) = d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4 +SHA512 (packaging-20.7.tar.gz) = 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c From 817d75b79155e2a262e6b17c688d2819611d5462 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 14 Dec 2020 11:25:44 +0100 Subject: [PATCH 41/89] Update to 20.8 (#1906985) --- .gitignore | 1 + python-packaging.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f86d466..0760673 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /packaging-20.3.tar.gz /packaging-20.4.tar.gz /packaging-20.7.tar.gz +/packaging-20.8.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index e895cc9..8b0fd8d 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -7,7 +7,7 @@ %bcond_without tests Name: python-%{pypi_name} -Version: 20.7 +Version: 20.8 Release: 1%{?dist} Summary: Core utilities for Python packages @@ -23,8 +23,9 @@ BuildRequires: pyproject-rpm-macros # dependency on self. # We also don't use the python3dist() form, in case packaging is ever used # in the provides generator. -BuildRequires: python%{python3_pkgversion}-flit-core +BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-pip +BuildRequires: python%{python3_pkgversion}-wheel # Upstream uses nox for testing, we specify the test deps manually as well. %if %{with tests} @@ -107,6 +108,9 @@ rm -rf html/_static/fonts/ %changelog +* Mon Dec 14 2020 Lumír Balhar - 20.8-1 +- Update to 20.8 (#1906985) + * Mon Nov 30 2020 Lumír Balhar - 20.7-1 - Update to 20.7 (#1902369) diff --git a/sources b/sources index 878f9eb..b1f31e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-20.7.tar.gz) = 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c +SHA512 (packaging-20.8.tar.gz) = 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4 From 56eac3c3f98f26e9198eb600bc7dfe9a50aa7ebb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 12:08:44 +0000 Subject: [PATCH 42/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 8b0fd8d..882d30a 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -8,7 +8,7 @@ Name: python-%{pypi_name} Version: 20.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -108,6 +108,9 @@ rm -rf html/_static/fonts/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 20.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Lumír Balhar - 20.8-1 - Update to 20.8 (#1906985) From 25f529f4bcd998df5c47707ba8cf2d903dc9b548 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 1 Feb 2021 07:54:22 +0100 Subject: [PATCH 43/89] Update to 20.9 --- .gitignore | 1 + python-packaging.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0760673..fce3d94 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /packaging-20.4.tar.gz /packaging-20.7.tar.gz /packaging-20.8.tar.gz +/packaging-20.9.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 882d30a..36a7851 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -7,8 +7,8 @@ %bcond_without tests Name: python-%{pypi_name} -Version: 20.8 -Release: 2%{?dist} +Version: 20.9 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -108,6 +108,10 @@ rm -rf html/_static/fonts/ %changelog +* Mon Feb 01 2021 Lumír Balhar - 20.9-1 +- Update to 20.9 +Resolves: rhbz#1922545 + * Wed Jan 27 2021 Fedora Release Engineering - 20.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index b1f31e6..7667c23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-20.8.tar.gz) = 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4 +SHA512 (packaging-20.9.tar.gz) = fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b From 704f208529462dcfe4c89eff08517d6210d516db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 24 Feb 2021 17:10:39 +0100 Subject: [PATCH 44/89] Add new bootstrapping bcond The Python RPM dependency generators now require python3-packaging. In order to bootstrap a new Python version, we need to build this without the generators first. The provides and requires are added manually in that case. At that point, we cannot build the docs or run the tests either, so the bootstrap bcond also disables docs and tests. --- python-packaging.spec | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 36a7851..fa120ea 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,10 +1,20 @@ %global pypi_name packaging +# Specify --with bootstrap to build in bootstrap mode +# This mode is needed, because python3-rpm-generators need packaging +# When bootstrapping, disable tests and docs as well. +%bcond_with bootstrap + +%if %{without bootstrap} # Specify --without docs to prevent the dependency loop on python-sphinx %bcond_without docs # Specify --without tests to prevent the dependency loop on python-pytest %bcond_without tests +%else +%bcond_with docs +%bcond_with tests +%endif Name: python-%{pypi_name} Version: 20.9 @@ -19,23 +29,17 @@ BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pyproject-rpm-macros -# We specify dependencies to build the wheel manually to avoid circular -# dependency on self. -# We also don't use the python3dist() form, in case packaging is ever used -# in the provides generator. +%if %{with bootstrap} BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-pip -BuildRequires: python%{python3_pkgversion}-wheel +%endif # Upstream uses nox for testing, we specify the test deps manually as well. %if %{with tests} BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pretend -BuildRequires: python%{python3_pkgversion}-pyparsing %endif %if %{with docs} BuildRequires: python%{python3_pkgversion}-sphinx -BuildRequires: python%{python3_pkgversion}-pyparsing %endif @@ -52,6 +56,12 @@ Summary: %{summary} # This is kept for compatibility with Fedora < 33 only: %py_provides python%{python3_pkgversion}-%{pypi_name} +%if %{with bootstrap} +Provides: python%{python3_pkgversion}dist(packaging) = %{version} +Provides: python%{python3_version}dist(packaging) = %{version} +Requires: python%{python3_version}dist(pyparsing) +%endif + %description -n python%{python3_pkgversion}-%{pypi_name} %_description @@ -71,8 +81,18 @@ Documentation for python-packaging # furo is not available in Fedora sed -i '/html_theme = "furo"/d' docs/conf.py +%if %{without bootstrap} +%generate_buildrequires +%pyproject_buildrequires -r +%endif + + %build +%if %{with bootstrap} +%py3_build +%else %pyproject_wheel +%endif %if %{with docs} # generate html docs @@ -85,8 +105,13 @@ rm -rf html/_static/fonts/ %install +%if %{with bootstrap} +%py3_install +echo '%{python3_sitelib}/packaging*' > %{pyproject_files} +%else %pyproject_install %pyproject_save_files %{pypi_name} +%endif %if %{with tests} From 08e0012c510efc579ac38290a375dd69770f7756 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 1 Jun 2021 16:34:45 +0200 Subject: [PATCH 45/89] Bootstrap for Python 3.10 --- python-packaging.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index fa120ea..6e2739a 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,6 @@ +%global _without_docs 1 +%global _without_tests 1 +%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -18,7 +21,7 @@ Name: python-%{pypi_name} Version: 20.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -133,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Tue Jun 01 2021 Python Maint - 20.9-2 +- Bootstrap for Python 3.10 + * Mon Feb 01 2021 Lumír Balhar - 20.9-1 - Update to 20.9 Resolves: rhbz#1922545 From 687c0dae8491ae288a4ec07ae808d37023b9973e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 3 Jun 2021 13:49:45 +0200 Subject: [PATCH 46/89] Rebuilt for Python 3.10 --- python-packaging.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 6e2739a..d96ab64 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,6 +1,3 @@ -%global _without_docs 1 -%global _without_tests 1 -%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -21,7 +18,7 @@ Name: python-%{pypi_name} Version: 20.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +133,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Thu Jun 03 2021 Python Maint - 20.9-3 +- Rebuilt for Python 3.10 + * Tue Jun 01 2021 Python Maint - 20.9-2 - Bootstrap for Python 3.10 From 2340979f37459793a80d486d423d5cd6d9908bd9 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 7 Jul 2021 10:18:50 +0200 Subject: [PATCH 47/89] Update to 21.0 --- .gitignore | 1 + python-packaging.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fce3d94..2045acc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /packaging-20.7.tar.gz /packaging-20.8.tar.gz /packaging-20.9.tar.gz +/packaging-21.0.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index d96ab64..de818de 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -17,8 +17,8 @@ %endif Name: python-%{pypi_name} -Version: 20.9 -Release: 3%{?dist} +Version: 21.0 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -133,6 +133,10 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Wed Jul 07 2021 Lumír Balhar - 21.0-1 +- Update to 21.0 +Resolves: rhbz#1978925 + * Thu Jun 03 2021 Python Maint - 20.9-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 7667c23..0e72e43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-20.9.tar.gz) = fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b +SHA512 (packaging-21.0.tar.gz) = 612744ad8d0b834709af5d4e2415679271e4cdc304a2e9297ec741e37e62241a041b678568130cd733828a1bf2e5885d62de706934f4018195566107989a6f6b From 2472d8b4fd003f9cdccd1d2445d9b5260618ef6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 08:03:21 +0000 Subject: [PATCH 48/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index de818de..ead3800 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -18,7 +18,7 @@ Name: python-%{pypi_name} Version: 21.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -133,6 +133,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 07 2021 Lumír Balhar - 21.0-1 - Update to 21.0 Resolves: rhbz#1978925 From f7cb0a90d9da7de1668b6e8f86d9aeef48f49b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 12 Oct 2021 20:42:43 +0200 Subject: [PATCH 49/89] Also require python(abi) when bootstrapping --- python-packaging.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-packaging.spec b/python-packaging.spec index ead3800..4eb299f 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -60,6 +60,7 @@ Summary: %{summary} Provides: python%{python3_pkgversion}dist(packaging) = %{version} Provides: python%{python3_version}dist(packaging) = %{version} Requires: python%{python3_version}dist(pyparsing) +Requires: python(abi) = %{python3_version} %endif %description -n python%{python3_pkgversion}-%{pypi_name} %_description From 5acb671d7f9ac26f466cfabb7f0c4e65ae02fbf0 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 1 Nov 2021 08:35:06 +0100 Subject: [PATCH 50/89] Update to 21.2 --- .gitignore | 1 + python-packaging.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2045acc..b7eb8ed 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /packaging-20.8.tar.gz /packaging-20.9.tar.gz /packaging-21.0.tar.gz +/packaging-21.2.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 4eb299f..f73c608 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -17,8 +17,8 @@ %endif Name: python-%{pypi_name} -Version: 21.0 -Release: 2%{?dist} +Version: 21.2 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -134,6 +134,10 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Nov 01 2021 Lumír Balhar - 21.2-1 +- Update to 21.2 +Resolves: rhbz#2018534 + * Fri Jul 23 2021 Fedora Release Engineering - 21.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 0e72e43..ed3c1de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-21.0.tar.gz) = 612744ad8d0b834709af5d4e2415679271e4cdc304a2e9297ec741e37e62241a041b678568130cd733828a1bf2e5885d62de706934f4018195566107989a6f6b +SHA512 (packaging-21.2.tar.gz) = 29bc0a556fc34b7bc249f42c5d5dec05cd65c6db379186b1b2acb9a0d7d720eb4e7152449c299b72b69e059bb16c0ec12755846dd3f07e18e0b35dd765d4a534 From c05d8d4109d2548b7d5bc596ed9007030a4908ce Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 18 Nov 2021 07:36:31 +0100 Subject: [PATCH 51/89] Update to 21.3 --- .gitignore | 1 + python-packaging.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b7eb8ed..c49077f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /packaging-20.9.tar.gz /packaging-21.0.tar.gz /packaging-21.2.tar.gz +/packaging-21.3.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index f73c608..3e6c783 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -17,7 +17,7 @@ %endif Name: python-%{pypi_name} -Version: 21.2 +Version: 21.3 Release: 1%{?dist} Summary: Core utilities for Python packages @@ -117,7 +117,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %if %{with tests} %check -%pytest +# Specified tests don't work on big endian platforms +# Reported in: https://github.com/pypa/packaging/issues/472 +%pytest -k "not test_get_musl_version and not test_parse_ld_musl_from_elf_no_interpreter_section and not test_parse_ld_musl_from_elf" %endif @@ -134,6 +136,10 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Thu Nov 18 2021 Lumír Balhar - 21.3-1 +- Update to 21.3 +Resolves: rhbz#2024413 + * Mon Nov 01 2021 Lumír Balhar - 21.2-1 - Update to 21.2 Resolves: rhbz#2018534 diff --git a/sources b/sources index ed3c1de..86f680e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-21.2.tar.gz) = 29bc0a556fc34b7bc249f42c5d5dec05cd65c6db379186b1b2acb9a0d7d720eb4e7152449c299b72b69e059bb16c0ec12755846dd3f07e18e0b35dd765d4a534 +SHA512 (packaging-21.3.tar.gz) = 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a From 0a7e13a101099897bd20d29f6f3d2183d523dfad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 13:59:35 +0000 Subject: [PATCH 52/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 3e6c783..b34f0a4 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -18,7 +18,7 @@ Name: python-%{pypi_name} Version: 21.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 21.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Nov 18 2021 Lumír Balhar - 21.3-1 - Update to 21.3 Resolves: rhbz#2024413 From 45c0133151a017daa7b9e347fecfaff21f587be3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 13:00:28 +0200 Subject: [PATCH 53/89] Bootstrap for Python 3.11 --- python-packaging.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index b34f0a4..511a34d 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,6 @@ +%global _without_docs 1 +%global _without_tests 1 +%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -18,7 +21,7 @@ Name: python-%{pypi_name} Version: 21.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +139,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Jun 13 2022 Python Maint - 21.3-3 +- Bootstrap for Python 3.11 + * Fri Jan 21 2022 Fedora Release Engineering - 21.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 2d42cc7bc54e3b296ca699615aa0d50714c693bd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 18:20:28 +0200 Subject: [PATCH 54/89] Rebuilt for Python 3.11 --- python-packaging.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 511a34d..49a7b19 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,6 +1,3 @@ -%global _without_docs 1 -%global _without_tests 1 -%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -21,7 +18,7 @@ Name: python-%{pypi_name} Version: 21.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -139,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Jun 13 2022 Python Maint - 21.3-4 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Python Maint - 21.3-3 - Bootstrap for Python 3.11 From 0c0b12cd23c84fecbd805a6db8965224b8255f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 19 Jul 2022 11:12:50 +0200 Subject: [PATCH 55/89] Rebuilt for pyparsing-3.0.9 --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 49a7b19..19f1464 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -18,7 +18,7 @@ Name: python-%{pypi_name} Version: 21.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek - 21.3-5 +- Rebuilt for pyparsing-3.0.9 + * Mon Jun 13 2022 Python Maint - 21.3-4 - Rebuilt for Python 3.11 From 39913c9376bab3af5ce58325c77a3cb73dc44b4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 20:37:45 +0000 Subject: [PATCH 56/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 19f1464..2a3a8d9 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -18,7 +18,7 @@ Name: python-%{pypi_name} Version: 21.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 21.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek - 21.3-5 - Rebuilt for pyparsing-3.0.9 From 55f98e2c6ebe3c43c800c3c98d66dd8cbaed18e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 23 Aug 2022 20:55:38 +0200 Subject: [PATCH 57/89] Fix tests on Big Endian builders --- 538.patch | 62 +++++++++++++++++++++++++++++++++++++++++++ python-packaging.spec | 14 +++++++--- 2 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 538.patch diff --git a/538.patch b/538.patch new file mode 100644 index 0000000..e421590 --- /dev/null +++ b/538.patch @@ -0,0 +1,62 @@ +From c3476c3207efef576a185a047e6596b3b0cbcb42 Mon Sep 17 00:00:00 2001 +From: Tzu-ping Chung +Date: Wed, 20 Apr 2022 10:00:07 +0800 +Subject: [PATCH 1/2] Correctly parse ELF for musllinux on Big Endian + +--- + packaging/_musllinux.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/packaging/_musllinux.py b/packaging/_musllinux.py +index 8ac3059b..d5d3e044 100644 +--- a/packaging/_musllinux.py ++++ b/packaging/_musllinux.py +@@ -39,9 +39,11 @@ def _parse_ld_musl_from_elf(f: IO[bytes]) -> Optional[str]: + # p_fmt: Format for section header. + # p_idx: Indexes to find p_type, p_offset, and p_filesz. + e_fmt, p_fmt, p_idx = { +- 1: ("IIIIHHH", "IIIIIIII", (0, 1, 4)), # 32-bit. +- 2: ("QQQIHHH", "IIQQQQQQ", (0, 2, 5)), # 64-bit. +- }[ident[4]] ++ (1, 1): ("IIIIHHH", ">IIIIIIII", (0, 1, 4)), # 32-bit MSB. ++ (2, 1): ("QQQIHHH", ">IIQQQQQQ", (0, 2, 5)), # 64-bit MSB. ++ }[(ident[4], ident[5])] + except KeyError: + return None + else: + +From a339dd3374b334a1a999481f3014f68a7389dacc Mon Sep 17 00:00:00 2001 +From: Tzu-ping Chung +Date: Sun, 29 May 2022 11:55:30 +0800 +Subject: [PATCH 2/2] Always use LSB to parse binary in tests + +--- + tests/test_musllinux.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/tests/test_musllinux.py b/tests/test_musllinux.py +index d2c87ca1..2623bdbc 100644 +--- a/tests/test_musllinux.py ++++ b/tests/test_musllinux.py +@@ -101,14 +101,15 @@ def test_parse_ld_musl_from_elf_no_interpreter_section(): + with BIN_MUSL_X86_64.open("rb") as f: + data = f.read() + +- # Change all sections to *not* PT_INTERP. +- unpacked = struct.unpack("16BHHIQQQIHHH", data[:58]) ++ # Change all sections to *not* PT_INTERP. We are explicitly using LSB rules ++ # because the binaries are in LSB. ++ unpacked = struct.unpack("<16BHHIQQQIHHH", data[:58]) + *_, e_phoff, _, _, _, e_phentsize, e_phnum = unpacked + for i in range(e_phnum + 1): + sb = e_phoff + e_phentsize * i + se = sb + 56 +- section = struct.unpack("IIQQQQQQ", data[sb:se]) +- data = data[:sb] + struct.pack("IIQQQQQQ", 0, *section[1:]) + data[se:] ++ section = struct.unpack(" %{pyproject_files} %if %{with tests} %check -# Specified tests don't work on big endian platforms -# Reported in: https://github.com/pypa/packaging/issues/472 -%pytest -k "not test_get_musl_version and not test_parse_ld_musl_from_elf_no_interpreter_section and not test_parse_ld_musl_from_elf" +%pytest %endif @@ -136,6 +139,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Tue Aug 23 2022 Miro Hrončok - 21.3-7 +- Fix tests on Big Endian builders + * Fri Jul 22 2022 Fedora Release Engineering - 21.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8e81d52210335fafe14fce35a1d17f237a4aa05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 1 Dec 2022 13:28:34 +0100 Subject: [PATCH 58/89] Remove Fedora < 33 cruft --- python-packaging.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 3997496..f12b936 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -58,9 +58,6 @@ dealing with versions, specifiers, markers etc.} %package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} -# This is kept for compatibility with Fedora < 33 only: -%py_provides python%{python3_pkgversion}-%{pypi_name} - %if %{with bootstrap} Provides: python%{python3_pkgversion}dist(packaging) = %{version} Provides: python%{python3_version}dist(packaging) = %{version} From 0eec469fd778e794a93547551b37d187049254b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 15:25:18 +0000 Subject: [PATCH 59/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index f12b936..8845951 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -18,7 +18,7 @@ Name: python-%{pypi_name} Version: 21.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 21.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Aug 23 2022 Miro Hrončok - 21.3-7 - Fix tests on Big Endian builders From 89328a2950cda463e88739ba2d74751bb0c46ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Thu, 8 Dec 2022 08:36:47 +0100 Subject: [PATCH 60/89] Update to 23.0 --- .gitignore | 1 + 538.patch | 62 ------------------------------------------- python-packaging.spec | 14 +++++----- sources | 2 +- 4 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 538.patch diff --git a/.gitignore b/.gitignore index c49077f..d6afcb7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /packaging-21.0.tar.gz /packaging-21.2.tar.gz /packaging-21.3.tar.gz +/packaging-23.0.tar.gz diff --git a/538.patch b/538.patch deleted file mode 100644 index e421590..0000000 --- a/538.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c3476c3207efef576a185a047e6596b3b0cbcb42 Mon Sep 17 00:00:00 2001 -From: Tzu-ping Chung -Date: Wed, 20 Apr 2022 10:00:07 +0800 -Subject: [PATCH 1/2] Correctly parse ELF for musllinux on Big Endian - ---- - packaging/_musllinux.py | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/packaging/_musllinux.py b/packaging/_musllinux.py -index 8ac3059b..d5d3e044 100644 ---- a/packaging/_musllinux.py -+++ b/packaging/_musllinux.py -@@ -39,9 +39,11 @@ def _parse_ld_musl_from_elf(f: IO[bytes]) -> Optional[str]: - # p_fmt: Format for section header. - # p_idx: Indexes to find p_type, p_offset, and p_filesz. - e_fmt, p_fmt, p_idx = { -- 1: ("IIIIHHH", "IIIIIIII", (0, 1, 4)), # 32-bit. -- 2: ("QQQIHHH", "IIQQQQQQ", (0, 2, 5)), # 64-bit. -- }[ident[4]] -+ (1, 1): ("IIIIHHH", ">IIIIIIII", (0, 1, 4)), # 32-bit MSB. -+ (2, 1): ("QQQIHHH", ">IIQQQQQQ", (0, 2, 5)), # 64-bit MSB. -+ }[(ident[4], ident[5])] - except KeyError: - return None - else: - -From a339dd3374b334a1a999481f3014f68a7389dacc Mon Sep 17 00:00:00 2001 -From: Tzu-ping Chung -Date: Sun, 29 May 2022 11:55:30 +0800 -Subject: [PATCH 2/2] Always use LSB to parse binary in tests - ---- - tests/test_musllinux.py | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/test_musllinux.py b/tests/test_musllinux.py -index d2c87ca1..2623bdbc 100644 ---- a/tests/test_musllinux.py -+++ b/tests/test_musllinux.py -@@ -101,14 +101,15 @@ def test_parse_ld_musl_from_elf_no_interpreter_section(): - with BIN_MUSL_X86_64.open("rb") as f: - data = f.read() - -- # Change all sections to *not* PT_INTERP. -- unpacked = struct.unpack("16BHHIQQQIHHH", data[:58]) -+ # Change all sections to *not* PT_INTERP. We are explicitly using LSB rules -+ # because the binaries are in LSB. -+ unpacked = struct.unpack("<16BHHIQQQIHHH", data[:58]) - *_, e_phoff, _, _, _, e_phentsize, e_phnum = unpacked - for i in range(e_phnum + 1): - sb = e_phoff + e_phentsize * i - se = sb + 56 -- section = struct.unpack("IIQQQQQQ", data[sb:se]) -- data = data[:sb] + struct.pack("IIQQQQQQ", 0, *section[1:]) + data[se:] -+ section = struct.unpack(" %{pyproject_files} %changelog +* Fri Feb 03 2023 Tomáš Hrnčiar - 23.0-1 +- Update to 23.0.0 +- https://fedoraproject.org/wiki/Changes/Update_python-packaging_to_version_22_plus +- Fixes: rhbz#2151743 + * Fri Jan 20 2023 Fedora Release Engineering - 21.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 86f680e..9cf6523 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-21.3.tar.gz) = 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a +SHA512 (packaging-23.0.tar.gz) = 5dd2f4a596e5a1ed01b461a37e063573f5ae08e181df40377a167fe2483205b3d965e10dc403cd173d0f87e0bdcae3cde05bd39024783fbe44541d0f777d94de From 53b34627ade1d8222eefb2a8efcc232237d8576d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 10 Feb 2023 12:55:55 -0500 Subject: [PATCH 61/89] Disable docs and tests by default in RHEL builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoided unwanted dependencies, particularly python-pretend needed for tests, in the RHEL buildroot. The docs don't pull in any unwanted dependencies, but it's easier to disable them together with tests and we don't particularly desire python-packaging-docs in RHEL anyway. Co-Authored-By: Miro Hrončok --- python-packaging.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 437d636..64c4171 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -2,10 +2,12 @@ # Specify --with bootstrap to build in bootstrap mode # This mode is needed, because python3-rpm-generators need packaging -# When bootstrapping, disable tests and docs as well. %bcond_with bootstrap -%if %{without bootstrap} +# When bootstrapping, the tests and docs are disabled because the dependencies are not yet available. +# We don't want python-pretend in future RHEL, so we disable tests on RHEL as well. +# No reason to ship the documentation in RHEL either, so it is also disabled by default. +%if %{without bootstrap} && %{undefined rhel} # Specify --without docs to prevent the dependency loop on python-sphinx %bcond_without docs From 6b36dd46a43b9b9b23deb8282c136dbedb7d470f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 10 Feb 2023 20:00:19 +0100 Subject: [PATCH 62/89] When not running the tests, at least check the imports --- python-packaging.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 64c4171..be4d504 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -114,8 +114,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %endif -%if %{with tests} %check +%pyproject_check_import +%if %{with tests} %pytest %endif From 8378b5a6774d6107413eae4fa99d0ab4c0ce24ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Mon, 13 Feb 2023 13:51:22 +0100 Subject: [PATCH 63/89] Fix bootstrap mode for packaging 22.0+ Necessary changes in spec file so packaging builds with new flit_core backend. --- python-packaging.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index be4d504..27f872a 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -31,9 +31,10 @@ BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pyproject-rpm-macros +BuildRequires: unzip %if %{with bootstrap} -BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-flit-core %endif # Upstream uses nox for testing, we specify the test deps manually as well. @@ -89,7 +90,7 @@ sed -i '/html_theme = "furo"/d' docs/conf.py %build %if %{with bootstrap} -%py3_build +%{python3} -m flit_core.wheel %else %pyproject_wheel %endif @@ -106,7 +107,8 @@ rm -rf html/_static/fonts/ %install %if %{with bootstrap} -%py3_install +mkdir -p %{buildroot}%{python3_sitelib} +unzip dist/packaging-%{version}-py3-none-any.whl -d %{buildroot}%{python3_sitelib} -x packaging-%{version}.dist-info/RECORD echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %else %pyproject_install @@ -115,7 +117,7 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %check -%pyproject_check_import +%{!?with_bootstrap:%pyproject_check_import} %if %{with tests} %pytest %endif From 239094cefea71d43fb58ce6d02012a15e9d894e3 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 17 Apr 2023 11:22:42 +0200 Subject: [PATCH 64/89] Update to 23.1 (rhbz#2186423) --- .gitignore | 1 + python-packaging.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d6afcb7..06b12b4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /packaging-21.2.tar.gz /packaging-21.3.tar.gz /packaging-23.0.tar.gz +/packaging-23.1.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 27f872a..84f5780 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -19,7 +19,7 @@ %endif Name: python-%{pypi_name} -Version: 23.0 +Version: 23.1 Release: 1%{?dist} Summary: Core utilities for Python packages @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Apr 17 2023 Lumír Balhar - 23.1-1 +- Update to 23.1 (rhbz#2186423) + * Fri Feb 03 2023 Tomáš Hrnčiar - 23.0-1 - Update to 23.0.0 - https://fedoraproject.org/wiki/Changes/Update_python-packaging_to_version_22_plus diff --git a/sources b/sources index 9cf6523..f45e7ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-23.0.tar.gz) = 5dd2f4a596e5a1ed01b461a37e063573f5ae08e181df40377a167fe2483205b3d965e10dc403cd173d0f87e0bdcae3cde05bd39024783fbe44541d0f777d94de +SHA512 (packaging-23.1.tar.gz) = 1e717a2c97371e177f6b73de8de0440384e7abf361771e68b1696bc8e67d9d0995d2aeb2037995a16ecd374f58317793e66574c9fc28691b4e6094ece69cb5f0 From 7a83b85259f5cdc66f916768f88d950d3742751f Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 19 Apr 2023 10:13:01 +0200 Subject: [PATCH 65/89] Run unit tests of Python RPM generators in CI --- tests/tests.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index 49b6d3d..c89a956 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -7,6 +7,8 @@ repositories: - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git" dest: "pyproject-rpm-macros" + - repo: "https://src.fedoraproject.org/rpms/python-rpm-generators.git" + dest: "python-rpm-generators" tests: - pyproject_pytest: dir: pyproject-rpm-macros/tests @@ -20,7 +22,16 @@ - pyproject_clikit: dir: pyproject-rpm-macros/tests run: ./mocktest.sh python-clikit + - rpm_generators_unit_tests: + dir: python-rpm-generators + run: ./tests/download_data_and_run_pytest.sh required_packages: + - fedpkg-minimal - mock + - python3-pip + - python3-pytest + - python3-pyyaml + - python3-setuptools + - python3-wheel - rpmdevtools - rpm-build From 78d9d81428638cf09f212e9f4656b80a45cfd5be Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 15:49:43 +0200 Subject: [PATCH 66/89] Bootstrap for Python 3.12 --- python-packaging.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 84f5780..a00f94b 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -20,7 +21,7 @@ Name: python-%{pypi_name} Version: 23.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +137,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Tue Jun 13 2023 Python Maint - 23.1-2 +- Bootstrap for Python 3.12 + * Mon Apr 17 2023 Lumír Balhar - 23.1-1 - Update to 23.1 (rhbz#2186423) From 19e8fe46fdd9f591691e2a532bd801405fcb529f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 08:19:17 +0200 Subject: [PATCH 67/89] Rebuilt for Python 3.12 --- python-packaging.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index a00f94b..ddf4274 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -21,7 +20,7 @@ Name: python-%{pypi_name} Version: 23.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -137,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jun 16 2023 Python Maint - 23.1-3 +- Rebuilt for Python 3.12 + * Tue Jun 13 2023 Python Maint - 23.1-2 - Bootstrap for Python 3.12 From 98fd036469f3a96e0aebc44ae4ad00b5e3c0386b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 12:03:56 +0000 Subject: [PATCH 68/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index ddf4274..0b7233e 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -20,7 +20,7 @@ Name: python-%{pypi_name} Version: 23.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Core utilities for Python packages License: BSD or ASL 2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 23.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 16 2023 Python Maint - 23.1-3 - Rebuilt for Python 3.12 From 5ffbd5971a6b9f5f715b8f0bf13d56656c6da1b6 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 8 Aug 2023 15:33:48 +0200 Subject: [PATCH 69/89] Declare the license as an SPDX expression --- python-packaging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 0b7233e..ce0f03e 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -20,10 +20,10 @@ Name: python-%{pypi_name} Version: 23.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Core utilities for Python packages -License: BSD or ASL 2.0 +License: BSD-2-Clause OR Apache-2.0 URL: https://github.com/pypa/packaging Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Tue Aug 08 2023 Karolina Surma - 23.1-5 +- Declare the license as an SPDX expression + * Fri Jul 21 2023 Fedora Release Engineering - 23.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From bd4cd4d994f226a1e9140e74858b1a6ffe473da2 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 2 Oct 2023 09:44:53 +0200 Subject: [PATCH 70/89] Update to 23.2 (rhbz#2241653) --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 06b12b4..0e19ead 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /packaging-21.3.tar.gz /packaging-23.0.tar.gz /packaging-23.1.tar.gz +/packaging-23.2.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index ce0f03e..07d364b 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -19,8 +19,8 @@ %endif Name: python-%{pypi_name} -Version: 23.1 -Release: 5%{?dist} +Version: 23.2 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Oct 02 2023 Lumír Balhar - 23.2-1 +- Update to 23.2 (rhbz#2241653) + * Tue Aug 08 2023 Karolina Surma - 23.1-5 - Declare the license as an SPDX expression diff --git a/sources b/sources index f45e7ad..ae5b0c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-23.1.tar.gz) = 1e717a2c97371e177f6b73de8de0440384e7abf361771e68b1696bc8e67d9d0995d2aeb2037995a16ecd374f58317793e66574c9fc28691b4e6094ece69cb5f0 +SHA512 (packaging-23.2.tar.gz) = 77dfeb0dc6499c55eb5bc4a5bdcdaa146122b97e8f6190c0bf75baadb4e89e4cb5b62ac7d96175acc3d8b387507472b97f0bf18c70df2b6aa78ac54e6c0eb5a3 From 26e089b1d7c83e90797c5ab41d0a628d12ca2c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Oct 2023 19:22:32 +0200 Subject: [PATCH 71/89] Stop sedding out the furo Sphinx theme It is available in Fedora for a year now in all the supported releases. This also won't pull furo into RHEL, because the docs are not built there. It won't complicate the Python bootstrap either, the bootstrap build is without docs. --- python-packaging.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index 07d364b..f86b8af 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -20,7 +20,7 @@ Name: python-%{pypi_name} Version: 23.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -44,6 +44,7 @@ BuildRequires: python%{python3_pkgversion}-pretend %endif %if %{with docs} BuildRequires: python%{python3_pkgversion}-sphinx +BuildRequires: python%{python3_pkgversion}-furo %endif @@ -78,9 +79,6 @@ Documentation for python-packaging %prep %autosetup -p1 -n %{pypi_name}-%{version} -# Do not use furo as HTML theme in docs -# furo is not available in Fedora -sed -i '/html_theme = "furo"/d' docs/conf.py %if %{without bootstrap} %generate_buildrequires @@ -136,6 +134,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Oct 09 2023 Miro Hrončok - 23.2-2 +- Use the furo Sphinx theme, as intended upstream + * Mon Oct 02 2023 Lumír Balhar - 23.2-1 - Update to 23.2 (rhbz#2241653) From a2f753e4b87b34f0c5946cac157ef356aa97de3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 04:29:03 +0000 Subject: [PATCH 72/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index f86b8af..3adaeb0 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -20,7 +20,7 @@ Name: python-%{pypi_name} Version: 23.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -134,6 +134,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 23.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Oct 09 2023 Miro Hrončok - 23.2-2 - Use the furo Sphinx theme, as intended upstream From 7b4e59e4a740defaa6e0e0e509acb5a34375c20f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 07:49:32 +0000 Subject: [PATCH 73/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 3adaeb0..c89672b 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -20,7 +20,7 @@ Name: python-%{pypi_name} Version: 23.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -134,6 +134,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 23.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 23.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5bfafe20bc11b358fe968d263f654b47711a2157 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 11 Mar 2024 09:17:40 +0100 Subject: [PATCH 74/89] Update to 24.0 (rhbz#2268783) --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0e19ead..3de6bae 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /packaging-23.0.tar.gz /packaging-23.1.tar.gz /packaging-23.2.tar.gz +/packaging-24.0.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index c89672b..5c83b94 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -19,8 +19,8 @@ %endif Name: python-%{pypi_name} -Version: 23.2 -Release: 4%{?dist} +Version: 24.0 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -134,6 +134,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Mar 11 2024 Lumír Balhar - 24.0-1 +- Update to 24.0 (rhbz#2268783) + * Fri Jan 26 2024 Fedora Release Engineering - 23.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index ae5b0c6..a550b95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-23.2.tar.gz) = 77dfeb0dc6499c55eb5bc4a5bdcdaa146122b97e8f6190c0bf75baadb4e89e4cb5b62ac7d96175acc3d8b387507472b97f0bf18c70df2b6aa78ac54e6c0eb5a3 +SHA512 (packaging-24.0.tar.gz) = bfffe6e677f3bdcaee87053caf5840396b694dfa771c37680282d70d62b6d928dae399a2da7f1a9ea2af482f1b61b353da0c6902d80ad932535995a8b21baabc From 7677c1835b3f11c4388a53bf3e182c000f60bbf5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 6 Jun 2024 16:27:54 +0200 Subject: [PATCH 75/89] Bootstrap for Python 3.13 --- python-packaging.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 5c83b94..db720a1 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -20,7 +21,7 @@ Name: python-%{pypi_name} Version: 24.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -134,6 +135,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Thu Jun 06 2024 Python Maint - 24.0-2 +- Bootstrap for Python 3.13 + * Mon Mar 11 2024 Lumír Balhar - 24.0-1 - Update to 24.0 (rhbz#2268783) From 51ca0837a366889134b4ad7a68655fcf92d3fc3d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 11:12:19 +0200 Subject: [PATCH 76/89] Rebuilt for Python 3.13 --- python-packaging.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-packaging.spec b/python-packaging.spec index db720a1..ee7612d 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode @@ -21,7 +20,7 @@ Name: python-%{pypi_name} Version: 24.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -135,6 +134,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Sun Jun 09 2024 Python Maint - 24.0-3 +- Rebuilt for Python 3.13 + * Thu Jun 06 2024 Python Maint - 24.0-2 - Bootstrap for Python 3.13 From fe0f20a43fe5ece4e49369df2e7d8f1dd1a4c70b Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 11 Jun 2024 10:26:58 +0200 Subject: [PATCH 77/89] Update to 24.1 (rhbz#2291172) --- .gitignore | 1 + python-packaging.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3de6bae..36ebd5a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /packaging-23.1.tar.gz /packaging-23.2.tar.gz /packaging-24.0.tar.gz +/packaging-24.1.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index ee7612d..f7065a8 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -9,7 +9,9 @@ # No reason to ship the documentation in RHEL either, so it is also disabled by default. %if %{without bootstrap} && %{undefined rhel} # Specify --without docs to prevent the dependency loop on python-sphinx -%bcond_without docs +# Doc subpackage is disabled because it requires sphinx-toolbox since packaging 24.1 +# and that package is not available in Fedora yet. +%bcond_with docs # Specify --without tests to prevent the dependency loop on python-pytest %bcond_without tests @@ -19,8 +21,8 @@ %endif Name: python-%{pypi_name} -Version: 24.0 -Release: 3%{?dist} +Version: 24.1 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -134,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Mon Jun 10 2024 Lumír Balhar - 24.1-1 +- Update to 24.1 (rhbz#2291172) + * Sun Jun 09 2024 Python Maint - 24.0-3 - Rebuilt for Python 3.13 diff --git a/sources b/sources index a550b95..74bc30e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-24.0.tar.gz) = bfffe6e677f3bdcaee87053caf5840396b694dfa771c37680282d70d62b6d928dae399a2da7f1a9ea2af482f1b61b353da0c6902d80ad932535995a8b21baabc +SHA512 (packaging-24.1.tar.gz) = 45836ea0e7531c485a7d5e568f9740c7f075ff1b72a0d60422c5b76c031866428ff2137d9bd153790a9fcfff6bd4a7555bc40555409ad46debae7f1c9c1fe129 From 8f10829b0dee4e5f58ef232c907f7f90e1953920 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 13:49:39 +0000 Subject: [PATCH 78/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- python-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index f7065a8..849ecf0 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -22,7 +22,7 @@ Name: python-%{pypi_name} Version: 24.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 24.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jun 10 2024 Lumír Balhar - 24.1-1 - Update to 24.1 (rhbz#2291172) From d9532d2d6e02f82dbe3c03dfe875a5cbfdee51fb Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sat, 9 Nov 2024 13:48:17 +0100 Subject: [PATCH 79/89] Update to 24.2 (rhbz#2324709) --- .gitignore | 1 + python-packaging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 36ebd5a..a32df9f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /packaging-23.2.tar.gz /packaging-24.0.tar.gz /packaging-24.1.tar.gz +/packaging-24.2.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 849ecf0..07cb3b6 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -21,8 +21,8 @@ %endif Name: python-%{pypi_name} -Version: 24.1 -Release: 2%{?dist} +Version: 24.2 +Release: 1%{?dist} Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -136,6 +136,9 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog +* Sat Nov 09 2024 Lumír Balhar - 24.2-1 +- Update to 24.2 (rhbz#2324709) + * Fri Jul 19 2024 Fedora Release Engineering - 24.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 74bc30e..0b9396f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-24.1.tar.gz) = 45836ea0e7531c485a7d5e568f9740c7f075ff1b72a0d60422c5b76c031866428ff2137d9bd153790a9fcfff6bd4a7555bc40555409ad46debae7f1c9c1fe129 +SHA512 (packaging-24.2.tar.gz) = cab6be7284c6bc2abce7a5bbdc25a40e33378576c5590dad4aef9d835a2205af81ca24af7ae3603d0e4e32f8865d87a621187dae2f86df6ac613c9886d482804 From 1d6067dd6a9141a60a50414a867769aaf4819f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lum=C3=ADr=20Balhar?= Date: Mon, 11 Nov 2024 17:12:14 +0100 Subject: [PATCH 80/89] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 199 +++++++++++++++++++++++++++++++++++++++++ python-packaging.spec | 202 +----------------------------------------- 2 files changed, 201 insertions(+), 200 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..c998f50 --- /dev/null +++ b/changelog @@ -0,0 +1,199 @@ +* Sat Nov 09 2024 Lumír Balhar - 24.2-1 +- Update to 24.2 (rhbz#2324709) + +* Fri Jul 19 2024 Fedora Release Engineering - 24.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 10 2024 Lumír Balhar - 24.1-1 +- Update to 24.1 (rhbz#2291172) + +* Sun Jun 09 2024 Python Maint - 24.0-3 +- Rebuilt for Python 3.13 + +* Thu Jun 06 2024 Python Maint - 24.0-2 +- Bootstrap for Python 3.13 + +* Mon Mar 11 2024 Lumír Balhar - 24.0-1 +- Update to 24.0 (rhbz#2268783) + +* Fri Jan 26 2024 Fedora Release Engineering - 23.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 23.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 09 2023 Miro Hrončok - 23.2-2 +- Use the furo Sphinx theme, as intended upstream + +* Mon Oct 02 2023 Lumír Balhar - 23.2-1 +- Update to 23.2 (rhbz#2241653) + +* Tue Aug 08 2023 Karolina Surma - 23.1-5 +- Declare the license as an SPDX expression + +* Fri Jul 21 2023 Fedora Release Engineering - 23.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Python Maint - 23.1-3 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 23.1-2 +- Bootstrap for Python 3.12 + +* Mon Apr 17 2023 Lumír Balhar - 23.1-1 +- Update to 23.1 (rhbz#2186423) + +* Fri Feb 03 2023 Tomáš Hrnčiar - 23.0-1 +- Update to 23.0.0 +- https://fedoraproject.org/wiki/Changes/Update_python-packaging_to_version_22_plus +- Fixes: rhbz#2151743 + +* Fri Jan 20 2023 Fedora Release Engineering - 21.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 23 2022 Miro Hrončok - 21.3-7 +- Fix tests on Big Endian builders + +* Fri Jul 22 2022 Fedora Release Engineering - 21.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek - 21.3-5 +- Rebuilt for pyparsing-3.0.9 + +* Mon Jun 13 2022 Python Maint - 21.3-4 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 21.3-3 +- Bootstrap for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 21.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Nov 18 2021 Lumír Balhar - 21.3-1 +- Update to 21.3 +Resolves: rhbz#2024413 + +* Mon Nov 01 2021 Lumír Balhar - 21.2-1 +- Update to 21.2 +Resolves: rhbz#2018534 + +* Fri Jul 23 2021 Fedora Release Engineering - 21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 07 2021 Lumír Balhar - 21.0-1 +- Update to 21.0 +Resolves: rhbz#1978925 + +* Thu Jun 03 2021 Python Maint - 20.9-3 +- Rebuilt for Python 3.10 + +* Tue Jun 01 2021 Python Maint - 20.9-2 +- Bootstrap for Python 3.10 + +* Mon Feb 01 2021 Lumír Balhar - 20.9-1 +- Update to 20.9 +Resolves: rhbz#1922545 + +* Wed Jan 27 2021 Fedora Release Engineering - 20.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 14 2020 Lumír Balhar - 20.8-1 +- Update to 20.8 (#1906985) + +* Mon Nov 30 2020 Lumír Balhar - 20.7-1 +- Update to 20.7 (#1902369) + +* Fri Oct 02 2020 Miro Hrončok - 20.4-3 +- Drop the dependency on six to make the package lighter + +* Wed Jul 29 2020 Fedora Release Engineering - 20.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 01 2020 Lumír Balhar - 20.4-1 +- Update to 20.4 (#1838285) + +* Sat May 23 2020 Miro Hrončok - 20.3-3 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 20.3-2 +- Bootstrap for Python 3.9 + +* Fri Mar 06 2020 Lumír Balhar - 20.3-1 +- Update to 20.3 (#1810738) + +* Thu Jan 30 2020 Fedora Release Engineering - 20.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 27 2020 Lumír Balhar - 20.1-1 +- Update to 20.1 (#1794865) + +* Mon Jan 06 2020 Lumír Balhar - 20.0-2 +- Ignore broken tests + +* Mon Jan 06 2020 Lumír Balhar - 20.0-1 +- Update to 20.0 (#1788012) + +* Thu Sep 26 2019 Lumír Balhar - 19.2-1 +- New upstream version 19.2 (bz#1742388) + +* Mon Sep 23 2019 Lumír Balhar - 19.0-6 +- Remove Python 2 subpackage +- Make spec fedora-specific + +* Mon Sep 02 2019 Miro Hrončok - 19.0-5 +- Reduce Python 2 build time dependencies + +* Fri Aug 16 2019 Miro Hrončok - 19.0-4 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 19.0-3 +- Bootstrap for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Feb 04 2019 Lumír Balhar - 19.0-1 +- New upstream version + +* Sat Feb 02 2019 Fedora Release Engineering - 17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Charalampos Stratakis - 17.1-1 +- Update to 17.1 + +* Sat Jul 14 2018 Fedora Release Engineering - 16.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Jun 16 2018 Miro Hrončok - 16.8-10 +- Rebuilt for Python 3.7 + +* Thu Jun 14 2018 Miro Hrončok - 16.8-9 +- Bootstrap for Python 3.7 + +* Fri Feb 09 2018 Iryna Shcherbina - 16.8-8 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 16.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 16.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 22 2017 Lumir Balhar - 16.8-5 +- Epel7 compatible spec/package + +* Mon Feb 13 2017 Charalampos Stratakis - 16.8-4 +- Rebuild as wheel + +* Sat Feb 11 2017 Fedora Release Engineering - 16.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 16.8-2 +- Rebuild for Python 3.6 + +* Wed Nov 02 2016 Lumir Balhar - 16.8-1 +- New upstream version + +* Fri Sep 16 2016 Lumir Balhar - 16.7-1 +- Initial package. diff --git a/python-packaging.spec b/python-packaging.spec index 07cb3b6..49c22f4 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -22,7 +22,7 @@ Name: python-%{pypi_name} Version: 24.2 -Release: 1%{?dist} +Release: %autorelease Summary: Core utilities for Python packages License: BSD-2-Clause OR Apache-2.0 @@ -136,202 +136,4 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files} %changelog -* Sat Nov 09 2024 Lumír Balhar - 24.2-1 -- Update to 24.2 (rhbz#2324709) - -* Fri Jul 19 2024 Fedora Release Engineering - 24.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 10 2024 Lumír Balhar - 24.1-1 -- Update to 24.1 (rhbz#2291172) - -* Sun Jun 09 2024 Python Maint - 24.0-3 -- Rebuilt for Python 3.13 - -* Thu Jun 06 2024 Python Maint - 24.0-2 -- Bootstrap for Python 3.13 - -* Mon Mar 11 2024 Lumír Balhar - 24.0-1 -- Update to 24.0 (rhbz#2268783) - -* Fri Jan 26 2024 Fedora Release Engineering - 23.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 23.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 09 2023 Miro Hrončok - 23.2-2 -- Use the furo Sphinx theme, as intended upstream - -* Mon Oct 02 2023 Lumír Balhar - 23.2-1 -- Update to 23.2 (rhbz#2241653) - -* Tue Aug 08 2023 Karolina Surma - 23.1-5 -- Declare the license as an SPDX expression - -* Fri Jul 21 2023 Fedora Release Engineering - 23.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jun 16 2023 Python Maint - 23.1-3 -- Rebuilt for Python 3.12 - -* Tue Jun 13 2023 Python Maint - 23.1-2 -- Bootstrap for Python 3.12 - -* Mon Apr 17 2023 Lumír Balhar - 23.1-1 -- Update to 23.1 (rhbz#2186423) - -* Fri Feb 03 2023 Tomáš Hrnčiar - 23.0-1 -- Update to 23.0.0 -- https://fedoraproject.org/wiki/Changes/Update_python-packaging_to_version_22_plus -- Fixes: rhbz#2151743 - -* Fri Jan 20 2023 Fedora Release Engineering - 21.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Aug 23 2022 Miro Hrončok - 21.3-7 -- Fix tests on Big Endian builders - -* Fri Jul 22 2022 Fedora Release Engineering - 21.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek - 21.3-5 -- Rebuilt for pyparsing-3.0.9 - -* Mon Jun 13 2022 Python Maint - 21.3-4 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 21.3-3 -- Bootstrap for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 21.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 18 2021 Lumír Balhar - 21.3-1 -- Update to 21.3 -Resolves: rhbz#2024413 - -* Mon Nov 01 2021 Lumír Balhar - 21.2-1 -- Update to 21.2 -Resolves: rhbz#2018534 - -* Fri Jul 23 2021 Fedora Release Engineering - 21.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jul 07 2021 Lumír Balhar - 21.0-1 -- Update to 21.0 -Resolves: rhbz#1978925 - -* Thu Jun 03 2021 Python Maint - 20.9-3 -- Rebuilt for Python 3.10 - -* Tue Jun 01 2021 Python Maint - 20.9-2 -- Bootstrap for Python 3.10 - -* Mon Feb 01 2021 Lumír Balhar - 20.9-1 -- Update to 20.9 -Resolves: rhbz#1922545 - -* Wed Jan 27 2021 Fedora Release Engineering - 20.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 14 2020 Lumír Balhar - 20.8-1 -- Update to 20.8 (#1906985) - -* Mon Nov 30 2020 Lumír Balhar - 20.7-1 -- Update to 20.7 (#1902369) - -* Fri Oct 02 2020 Miro Hrončok - 20.4-3 -- Drop the dependency on six to make the package lighter - -* Wed Jul 29 2020 Fedora Release Engineering - 20.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 01 2020 Lumír Balhar - 20.4-1 -- Update to 20.4 (#1838285) - -* Sat May 23 2020 Miro Hrončok - 20.3-3 -- Rebuilt for Python 3.9 - -* Fri May 22 2020 Miro Hrončok - 20.3-2 -- Bootstrap for Python 3.9 - -* Fri Mar 06 2020 Lumír Balhar - 20.3-1 -- Update to 20.3 (#1810738) - -* Thu Jan 30 2020 Fedora Release Engineering - 20.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 27 2020 Lumír Balhar - 20.1-1 -- Update to 20.1 (#1794865) - -* Mon Jan 06 2020 Lumír Balhar - 20.0-2 -- Ignore broken tests - -* Mon Jan 06 2020 Lumír Balhar - 20.0-1 -- Update to 20.0 (#1788012) - -* Thu Sep 26 2019 Lumír Balhar - 19.2-1 -- New upstream version 19.2 (bz#1742388) - -* Mon Sep 23 2019 Lumír Balhar - 19.0-6 -- Remove Python 2 subpackage -- Make spec fedora-specific - -* Mon Sep 02 2019 Miro Hrončok - 19.0-5 -- Reduce Python 2 build time dependencies - -* Fri Aug 16 2019 Miro Hrončok - 19.0-4 -- Rebuilt for Python 3.8 - -* Thu Aug 15 2019 Miro Hrončok - 19.0-3 -- Bootstrap for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 19.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Feb 04 2019 Lumír Balhar - 19.0-1 -- New upstream version - -* Sat Feb 02 2019 Fedora Release Engineering - 17.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Charalampos Stratakis - 17.1-1 -- Update to 17.1 - -* Sat Jul 14 2018 Fedora Release Engineering - 16.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 16 2018 Miro Hrončok - 16.8-10 -- Rebuilt for Python 3.7 - -* Thu Jun 14 2018 Miro Hrončok - 16.8-9 -- Bootstrap for Python 3.7 - -* Fri Feb 09 2018 Iryna Shcherbina - 16.8-8 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 16.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 16.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 22 2017 Lumir Balhar - 16.8-5 -- Epel7 compatible spec/package - -* Mon Feb 13 2017 Charalampos Stratakis - 16.8-4 -- Rebuild as wheel - -* Sat Feb 11 2017 Fedora Release Engineering - 16.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 16.8-2 -- Rebuild for Python 3.6 - -* Wed Nov 02 2016 Lumir Balhar - 16.8-1 -- New upstream version - -* Fri Sep 16 2016 Lumir Balhar - 16.7-1 -- Initial package. +%autochangelog From 190cdfa5c6a2b1d41791403883cbc600f8293df2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 16:57:04 +0000 Subject: [PATCH 81/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f20db6945ae28becb23fdbe501d2e52db3f26372 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 12 Nov 2024 12:25:43 +0100 Subject: [PATCH 82/89] Run a smoke test on CI Unify the test suite between Fedora and CentOS Stream. This has been cherry-picked from c10s branch. --- tests/smoke/runtest.sh | 13 +++++++++++++ tests/tests.yml | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 tests/smoke/runtest.sh diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh new file mode 100644 index 0000000..d0e4f06 --- /dev/null +++ b/tests/smoke/runtest.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -eux + +# Currently there is no easy way to see the versions of installed packages. +# Let's list them to make sure we're testing against the correct package set. +rpm -qa | sort +python3 -c 'import packaging' +python3 -c 'from packaging import version; version.Version("2.5.1rc2")' +python3 -c 'from packaging import specifiers; specifiers.SpecifierSet("~=1.0")' +python3 -c 'from packaging import markers; markers.Marker("python_version>'"'"'2'"'"'")' +python3 -c 'from packaging import requirements; requirements.Requirement('"'"'name[foo]>=2,<3; python_version>"2.0"'"'"')' +python3 -c 'from packaging import tags; tags.Tag("py39", "none", "any")' +python3 -c 'from packaging.utils import canonicalize_name; canonicalize_name("Django_foobar")' diff --git a/tests/tests.yml b/tests/tests.yml index c89a956..a403286 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -25,6 +25,9 @@ - rpm_generators_unit_tests: dir: python-rpm-generators run: ./tests/download_data_and_run_pytest.sh + - smoke: + dir: . + run: ./smoke/runtest.sh required_packages: - fedpkg-minimal - mock From 177dbd914ca7088d38f2e3ac26792ffb69a585d4 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 20 Apr 2025 20:26:22 +0200 Subject: [PATCH 83/89] Update to 25.0 (rhbz#2361114) --- .gitignore | 1 + python-packaging.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a32df9f..12c5076 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /packaging-24.0.tar.gz /packaging-24.1.tar.gz /packaging-24.2.tar.gz +/packaging-25.0.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 49c22f4..3ccae48 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -21,7 +21,7 @@ %endif Name: python-%{pypi_name} -Version: 24.2 +Version: 25.0 Release: %autorelease Summary: Core utilities for Python packages diff --git a/sources b/sources index 0b9396f..b75606d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-24.2.tar.gz) = cab6be7284c6bc2abce7a5bbdc25a40e33378576c5590dad4aef9d835a2205af81ca24af7ae3603d0e4e32f8865d87a621187dae2f86df6ac613c9886d482804 +SHA512 (packaging-25.0.tar.gz) = fb8419f81f0f817440c0b297fc6e963832e219e7a324bf4e0321f1e131a4822f17a19f2eb033a8d4adb622ccb16db59776ec44906a0c0b34f2877b59b9558c18 From 1d5255c3b74a90bb944718f6c1f13f2ffa22d89c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 11:22:42 +0200 Subject: [PATCH 84/89] Bootstrap for Python 3.14 --- python-packaging.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-packaging.spec b/python-packaging.spec index 3ccae48..6f117ab 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode From 4f8ffba24fd567d1d4e0dbbf91b66359ed283699 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 11:30:32 +0200 Subject: [PATCH 85/89] Rebuilt for Python 3.14 --- python-packaging.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 6f117ab..3ccae48 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode From 6fcf0545b171b2627731a0b0a4f045f0c1aa001c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:13:37 +0000 Subject: [PATCH 86/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5826dff7bbe1f6c2403675bf544376dabfc5f8be Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:19:05 +0200 Subject: [PATCH 87/89] Rebuilt for Python 3.14.0rc2 bytecode From 38746eb07fc3e3df1920f777a03b9a4b1ee729b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Fri, 25 Jul 2025 14:55:26 +0200 Subject: [PATCH 88/89] CI: Drop STI and use tmt instead Resolves: rhbz#2383038 --- .fmf/version | 1 + plan.fmf | 51 ++++++++++++++++++++++++++++++++++++++++++ tests/smoke/runtest.sh | 0 tests/tests.yml | 40 --------------------------------- 4 files changed, 52 insertions(+), 40 deletions(-) create mode 100644 .fmf/version create mode 100644 plan.fmf mode change 100644 => 100755 tests/smoke/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..bd248b6 --- /dev/null +++ b/plan.fmf @@ -0,0 +1,51 @@ +execute: + how: tmt + +discover: + - name: same_repo + how: shell + tests: + - name: smoke + test: ./smoke/runtest.sh + path: /tests + - name: rpms_pyproject-rpm-macros + how: shell + url: https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git + tests: + - name: pyproject_pytest + path: /tests + test: ./mocktest.sh python-pytest + - name: pyproject_entrypoints + path: /tests + test: ./mocktest.sh python-entrypoints + - name: pyproject_pluggy + path: /tests + test: ./mocktest.sh python-pluggy + - name: pyproject_clikit + path: /tests + test: ./mocktest.sh python-clikit + - name: rpms_python-rpm-generators + how: shell + test: | + # Need to clone on our own, tmt clones it into 'tests' subdirectory + # which breaks fedpkg-minimal pkgname detection + git clone --depth=1 https://src.fedoraproject.org/rpms/python-rpm-generators.git python-rpm-generators && + cd python-rpm-generators && + ./tests/download_data_and_run_pytest.sh +prepare: + - name: Install dependencies + how: install + package: + - fedpkg-minimal + - mock + - python3-pip + - python3-pytest + - python3-pyyaml + - python3-setuptools + - python3-wheel + - rpmdevtools + - rpm-build + - dnf + - name: Update packages + how: shell + script: dnf upgrade -y diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh old mode 100644 new mode 100755 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index a403286..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - repositories: - - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git" - dest: "pyproject-rpm-macros" - - repo: "https://src.fedoraproject.org/rpms/python-rpm-generators.git" - dest: "python-rpm-generators" - tests: - - pyproject_pytest: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-pytest - - pyproject_entrypoints: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-entrypoints - - pyproject_pluggy: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-pluggy - - pyproject_clikit: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-clikit - - rpm_generators_unit_tests: - dir: python-rpm-generators - run: ./tests/download_data_and_run_pytest.sh - - smoke: - dir: . - run: ./smoke/runtest.sh - required_packages: - - fedpkg-minimal - - mock - - python3-pip - - python3-pytest - - python3-pyyaml - - python3-setuptools - - python3-wheel - - rpmdevtools - - rpm-build From efb6ac5714056740a6cccaf214b439063fa70e3f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:55:23 +0200 Subject: [PATCH 89/89] Rebuilt for Python 3.14.0rc3 bytecode