From 8d2a248ef8de6008e7038bf5a244c52b5a67a4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 14 May 2025 00:18:30 +0200 Subject: [PATCH] Update to 2025.5.9.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Resolves: RHEL-91197 Synced to https://src.fedoraproject.org/rpms/python-trove-classifiers/c/b2186050b1f9dda8525635344ac28129a6e94afe Based on the work of the following Fedora contributors: Co-Authored-By: Maxwell G Co-Authored-By: Benjamin A. Beasley Co-Authored-By: Tomáš Hrnčiar --- .gitignore | 13 +++++++++ Move-to-PEP-621-declarative-metadata.patch | 33 ++++++++++++++-------- python-trove-classifiers.spec | 17 ++++++++--- sources | 2 +- 4 files changed, 49 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index c8bddaf..ca24ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,16 @@ /trove-classifiers-2023.8.7.tar.gz /trove-classifiers-2023.9.19.tar.gz /trove-classifiers-2023.10.18.tar.gz +/trove-classifiers-2024.2.23.tar.gz +/trove-classifiers-2024.3.3.tar.gz +/trove_classifiers-2024.5.22.tar.gz +/trove_classifiers-2024.7.2.tar.gz +/trove_classifiers-2024.9.12.tar.gz +/trove_classifiers-2024.10.13.tar.gz +/trove_classifiers-2024.10.21.16.tar.gz +/trove_classifiers-2025.1.7.14.tar.gz +/trove_classifiers-2025.1.10.15.tar.gz +/trove_classifiers-2025.3.13.13.tar.gz +/trove_classifiers-2025.3.19.19.tar.gz +/trove_classifiers-2025.4.11.15.tar.gz +/trove_classifiers-2025.5.9.12.tar.gz diff --git a/Move-to-PEP-621-declarative-metadata.patch b/Move-to-PEP-621-declarative-metadata.patch index 14bcdf5..9e33a7e 100644 --- a/Move-to-PEP-621-declarative-metadata.patch +++ b/Move-to-PEP-621-declarative-metadata.patch @@ -1,19 +1,24 @@ -From 49510fec2cddeb796ab4078be4577eee624833f0 Mon Sep 17 00:00:00 2001 +From 5f61e6432496f3382b9d57bd88ca114b6e1efdb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= -Date: Tue, 21 Feb 2023 18:22:42 +0100 +Date: Fri, 1 Nov 2024 14:02:23 +0100 Subject: [PATCH] Move to PEP 621 declarative metadata +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Co-Authored-By: Bartek Sokorski +Co-Authored-By: Miro Hrončok --- - pyproject.toml | 31 ++++++++++++++++++++++++++++++- - setup.py | 33 --------------------------------- - 2 files changed, 30 insertions(+), 34 deletions(-) + pyproject.toml | 34 +++++++++++++++++++++++++++++++++- + setup.py | 36 ------------------------------------ + 2 files changed, 33 insertions(+), 37 deletions(-) delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml -index 05374a2..1134247 100644 +index 05374a2..d91f3c9 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -1,7 +1,36 @@ +@@ -1,7 +1,39 @@ [build-system] -requires = ["setuptools", "calver"] +requires = ["setuptools >= 61.0"] @@ -37,6 +42,9 @@ index 05374a2..1134247 100644 +[project.urls] +Homepage = "https://github.com/pypa/trove-classifiers" + ++[project.scripts] ++trove-classifiers = "trove_classifiers.__main__:cli" ++ +[tool.setuptools] +package-dir = {"" = "src"} +include-package-data = false @@ -53,10 +61,10 @@ index 05374a2..1134247 100644 warn_unreachable = true diff --git a/setup.py b/setup.py deleted file mode 100644 -index 826eac7..0000000 +index d8d85e4..0000000 --- a/setup.py +++ /dev/null -@@ -1,33 +0,0 @@ +@@ -1,36 +0,0 @@ -from io import open -from os import path - @@ -87,9 +95,12 @@ index 826eac7..0000000 - package_dir={"": "src"}, - packages=find_packages(where="src"), - package_data={"": ["py.typed"]}, -- use_calver=True, +- use_calver="%Y.%m.%d.%H", - setup_requires=["calver"], +- entry_points={ +- "console_scripts": ["trove-classifiers=trove_classifiers.__main__:cli"], +- }, -) -- -2.40.1 +2.49.0 diff --git a/python-trove-classifiers.spec b/python-trove-classifiers.spec index b101ab1..5e1aca6 100644 --- a/python-trove-classifiers.spec +++ b/python-trove-classifiers.spec @@ -1,11 +1,11 @@ Name: python-trove-classifiers -Version: 2023.10.18 -Release: 5%{?dist} +Version: 2025.5.9.12 +Release: 1%{?dist} Summary: Canonical source for classifiers on PyPI (pypi.org) License: Apache-2.0 URL: https://github.com/pypa/trove-classifiers -Source: %{pypi_source trove-classifiers} +Source: %{pypi_source trove_classifiers} # Drop dependency on calver which is not packaged in Fedora. # This patch is rebased version of upstream PR: @@ -31,10 +31,14 @@ Summary: %{summary} %prep -%autosetup -p1 -n trove-classifiers-%{version} +%autosetup -p1 -n trove_classifiers-%{version} # Replace @@VERSION@@ with %%version %writevars -f pyproject.toml version +# Make the the CLI tests work in %%check +# https://github.com/pypa/trove-classifiers/issues/219 +sed -i 's@{BINDIR}/@@' tests/test_cli.py + %generate_buildrequires %pyproject_buildrequires @@ -55,9 +59,14 @@ Summary: %{summary} %files -n python3-trove-classifiers -f %{pyproject_files} %doc README.* +%{_bindir}/trove-classifiers %changelog +* Tue May 13 2025 Miro Hrončok - 2025.5.9.12-1 +- Update to 2025.5.9.12 +- Resolves rhbz#2362823 + * Tue Oct 29 2024 Troy Dawson - 2023.10.18-5 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/sources b/sources index df8f36e..97ca294 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trove-classifiers-2023.10.18.tar.gz) = 6f8449411b8fc82ed798901701a72f3051bb46c189ee95276dcb77a2ee9b26a61c4304b03be20f7e2bc6dc5f8db1021bf02575cadd021fe43f96fd73540bae99 +SHA512 (trove_classifiers-2025.5.9.12.tar.gz) = ee858f52c08b867fe4845ebb19f9b431308d216b5313e2bc030d63340860205d40125ef6cee218f734ccd49e5ae36011c8e3415f03d0ace182cb518ed5f2318d