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 01/33] 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 02/33] 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 03/33] 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 04/33] 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 05/33] 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 06/33] 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 07/33] 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 08/33] 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 09/33] 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 10/33] 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 11/33] 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 12/33] 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 13/33] 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 14/33] 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 15/33] 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 16/33] 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 17/33] 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 18/33] 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 19/33] 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 20/33] 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 21/33] 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 22/33] 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 23/33] 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 24/33] 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 25/33] 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 26/33] 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 27/33] 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 28/33] 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 29/33] 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 30/33] 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 31/33] 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 32/33] 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 33/33] Rebuilt for Python 3.14.0rc3 bytecode