From b5ec79e64557ea6fb7952e60da3a5b4ba5d98a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hr=C4=8Dka?= Date: Tue, 13 Jul 2021 08:12:28 +0000 Subject: [PATCH 01/13] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6f84d09 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# python-platformdirs + +The python-platformdirs package From 93c7b8b62dea3c9829249ce6f602306db8645580 Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 13 Jul 2021 08:38:27 -0500 Subject: [PATCH 02/13] Initial import https://bugzilla.redhat.com/show_bug.cgi?id=1981607 --- .gitignore | 1 + README.md | 3 --- python-platformdirs.spec | 56 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 python-platformdirs.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..277005b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +platformdirs-*.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 6f84d09..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# python-platformdirs - -The python-platformdirs package diff --git a/python-platformdirs.spec b/python-platformdirs.spec new file mode 100644 index 0000000..0e39eb5 --- /dev/null +++ b/python-platformdirs.spec @@ -0,0 +1,56 @@ +%global srcname platformdirs +%global common_description %{expand: +A small Python module for determining appropriate platform-specific dirs, e.g. +a "user data dir".} + +Name: python-%{srcname} +Version: 2.0.0 +Release: 1%{?dist} +Summary: Python module for determining appropriate platform-specific dirs +License: MIT +URL: https://github.com/platformdirs/platformdirs +Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +BuildArch: noarch +BuildRequires: pyproject-rpm-macros + + +%description %{common_description} + + +%package -n python3-%{srcname} +Summary: %{summary} +BuildRequires: python3-devel + + +%description -n python3-%{srcname} %{common_description} + + +%prep +%autosetup -n %{srcname}-%{version} + + +%generate_buildrequires +%pyproject_buildrequires -t + + +%build +%pyproject_wheel + + +%install +%pyproject_install +%pyproject_save_files %{srcname} + + +%check +%tox + + +%files -n python3-%{srcname} -f %{pyproject_files} +%license LICENSE.txt +%doc README.rst CHANGES.rst + + +%changelog +* Mon Jul 12 2021 Carl George - 2.0.0-1 +- Initial package rhbz#1981607 diff --git a/sources b/sources new file mode 100644 index 0000000..187aaf0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (platformdirs-2.0.0.tar.gz) = 751803e1e4fe38abcf04d9302683ac29d9e3326c08a7a6159fca6f5e37e601bc1f51de15699b29781b684421d4074c27cd824a3fac6c149b8bdaab7eae9aa22a From 0918b2ded346fa943624d116441515eff8a57f33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 08:15:46 +0000 Subject: [PATCH 03/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-platformdirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 0e39eb5..5602fee 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -5,7 +5,7 @@ a "user data dir".} Name: python-%{srcname} Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT URL: https://github.com/platformdirs/platformdirs @@ -52,5 +52,8 @@ BuildRequires: python3-devel %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jul 12 2021 Carl George - 2.0.0-1 - Initial package rhbz#1981607 From e2bdb39e4a07d0049da7d633dc44b62c46b62c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 21 Jul 2021 12:35:12 +0200 Subject: [PATCH 04/13] Prepare for future backwards incompatibility of %pyproject_buildrequires Currently, we see: WARNING: Skipping invalid requirement: https://github.com/ActiveState/appdirs/archive/8eacfa312d77aba28d483fbfb6f6fc54099622be.zip Parse error at "'://githu'": Expected stringEnd It will become an error after https://src.fedoraproject.org/rpms/pyproject-rpm-macros/pull-request/189 With this change, it becomes: WARNING: Simplifying 'appdirs@https://github.com/ActiveState/appdirs/archive/8eacfa312d77aba28d483fbfb6f6fc54099622be.zip' to 'appdirs'. --- python-platformdirs.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 5602fee..00e59e7 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -5,7 +5,7 @@ a "user data dir".} Name: python-%{srcname} Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT URL: https://github.com/platformdirs/platformdirs @@ -28,6 +28,11 @@ BuildRequires: python3-devel %prep %autosetup -n %{srcname}-%{version} +# from https://github.com/platformdirs/platformdirs/pull/16 +# can be removed with 2.0.3+ +# let the buildrequires generator know what package is this: +sed -Ei 's|\b(https://github\.com/ActiveState/appdirs/archive)|appdirs@\1|' tox.ini + %generate_buildrequires %pyproject_buildrequires -t @@ -52,6 +57,9 @@ BuildRequires: python3-devel %changelog +* Fri Jul 23 2021 Miro Hrončok - 2.0.0-3 +- Let %%pyproject_buildrequires know we need appdirs + * Fri Jul 23 2021 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d3a562e1762b99710ed440aed32ed271e79ff71f Mon Sep 17 00:00:00 2001 From: Carl George Date: Sat, 31 Jul 2021 20:38:29 -0500 Subject: [PATCH 05/13] Latest upstream 2.2.0 Resolves: rhbz#1985567 --- python-platformdirs.spec | 16 +++++++--------- sources | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 00e59e7..5f6175e 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -4,14 +4,13 @@ A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".} Name: python-%{srcname} -Version: 2.0.0 -Release: 3%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT URL: https://github.com/platformdirs/platformdirs -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Source0: %pypi_source BuildArch: noarch -BuildRequires: pyproject-rpm-macros %description %{common_description} @@ -28,11 +27,6 @@ BuildRequires: python3-devel %prep %autosetup -n %{srcname}-%{version} -# from https://github.com/platformdirs/platformdirs/pull/16 -# can be removed with 2.0.3+ -# let the buildrequires generator know what package is this: -sed -Ei 's|\b(https://github\.com/ActiveState/appdirs/archive)|appdirs@\1|' tox.ini - %generate_buildrequires %pyproject_buildrequires -t @@ -57,6 +51,10 @@ sed -Ei 's|\b(https://github\.com/ActiveState/appdirs/archive)|appdirs@\1|' tox. %changelog +* Sun Aug 01 2021 Carl George - 2.2.0-1 +- Latest upstream +- Resolves: rhbz#1985567 + * Fri Jul 23 2021 Miro Hrončok - 2.0.0-3 - Let %%pyproject_buildrequires know we need appdirs diff --git a/sources b/sources index 187aaf0..7cfef3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (platformdirs-2.0.0.tar.gz) = 751803e1e4fe38abcf04d9302683ac29d9e3326c08a7a6159fca6f5e37e601bc1f51de15699b29781b684421d4074c27cd824a3fac6c149b8bdaab7eae9aa22a +SHA512 (platformdirs-2.2.0.tar.gz) = 9822b7602aad04a0f5e8540a470c4e935ac6cd975b4f12c919f0ccba8395d7516764c764dea043e47e6f4e79d21afe049aa7f1ea57a9c9f67c83ed4decb82a67 From 46072df01a4481e5d108602b60f574c09d37cbdf Mon Sep 17 00:00:00 2001 From: Carl George Date: Mon, 30 Aug 2021 19:06:39 -0500 Subject: [PATCH 06/13] Latest upstream 2.3.0 Resolves: rhbz#1999337 --- python-platformdirs.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 5f6175e..74e63b7 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -4,7 +4,7 @@ A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".} Name: python-%{srcname} -Version: 2.2.0 +Version: 2.3.0 Release: 1%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT @@ -51,6 +51,10 @@ BuildRequires: python3-devel %changelog +* Mon Aug 30 2021 Carl George - 2.3.0-1 +- Latest upstream +- Resolves: rhbz#1999337 + * Sun Aug 01 2021 Carl George - 2.2.0-1 - Latest upstream - Resolves: rhbz#1985567 diff --git a/sources b/sources index 7cfef3f..606da8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (platformdirs-2.2.0.tar.gz) = 9822b7602aad04a0f5e8540a470c4e935ac6cd975b4f12c919f0ccba8395d7516764c764dea043e47e6f4e79d21afe049aa7f1ea57a9c9f67c83ed4decb82a67 +SHA512 (platformdirs-2.3.0.tar.gz) = 06c570f1c206f557fe989e79a1a98da90c05f15a66a56ebbe260884b2250c2cd1a6345d664af63a886268b5a2bb366186927561721fd6a4b52b11eb2868677b1 From 9c8af9d92e7f78d57335fedbc348c2574e3188f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 Oct 2021 19:18:47 +0200 Subject: [PATCH 07/13] Don't use tox during the build to avoid a build dependency loop platformdirs <- virtualenv <- tox --- python-platformdirs.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 74e63b7..c47f473 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -5,7 +5,7 @@ a "user data dir".} Name: python-%{srcname} Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT URL: https://github.com/platformdirs/platformdirs @@ -29,7 +29,9 @@ BuildRequires: python3-devel %generate_buildrequires -%pyproject_buildrequires -t +# Upstream uses tox, but we don't use it, to avoid a build dependency loop +# platformdirs <- virtualenv <- tox +%pyproject_buildrequires -r %build @@ -42,7 +44,7 @@ BuildRequires: python3-devel %check -%tox +%{python3} -m unittest discover %files -n python3-%{srcname} -f %{pyproject_files} @@ -51,6 +53,9 @@ BuildRequires: python3-devel %changelog +* Tue Oct 26 2021 Miro Hrončok - 2.3.0-2 +- Don't use tox during the build to avoid a build dependency loop + * Mon Aug 30 2021 Carl George - 2.3.0-1 - Latest upstream - Resolves: rhbz#1999337 From dcc8e6f3357b73058de9a80f931989dc2107722d Mon Sep 17 00:00:00 2001 From: Carl George Date: Sat, 4 Dec 2021 02:01:28 -0600 Subject: [PATCH 08/13] Fix tests Before this change, tests weren't being detected and thus were not being run. Upstream uses pytest and has a "test" extra we can leverage. --- python-platformdirs.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index c47f473..161130c 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -5,7 +5,7 @@ a "user data dir".} Name: python-%{srcname} Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT URL: https://github.com/platformdirs/platformdirs @@ -31,7 +31,7 @@ BuildRequires: python3-devel %generate_buildrequires # Upstream uses tox, but we don't use it, to avoid a build dependency loop # platformdirs <- virtualenv <- tox -%pyproject_buildrequires -r +%pyproject_buildrequires -x test %build @@ -44,7 +44,7 @@ BuildRequires: python3-devel %check -%{python3} -m unittest discover +%pytest %files -n python3-%{srcname} -f %{pyproject_files} @@ -53,6 +53,10 @@ BuildRequires: python3-devel %changelog +* Sat Dec 04 2021 Carl George - 2.3.0-3 +- Use "test" extra to generate buildrequires +- Run tests with %%pytest + * Tue Oct 26 2021 Miro Hrončok - 2.3.0-2 - Don't use tox during the build to avoid a build dependency loop From 76fc99ebda4b1682184bc28a69cf5ceb0cf726ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 4 Dec 2021 17:06:23 +0100 Subject: [PATCH 09/13] Drop dependency on pytest-cov --- python-platformdirs.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 161130c..94317a2 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -26,6 +26,8 @@ BuildRequires: python3-devel %prep %autosetup -n %{srcname}-%{version} +# No need to measure coverage +sed -i '/pytest-cov/d' setup.cfg %generate_buildrequires From ad8eade4c443421b0d7000a871366a0eea95b5ec Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 22 Mar 2022 12:00:02 -0400 Subject: [PATCH 10/13] Update to 2.5.1 (close RHBZ#2007878) --- python-platformdirs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 94317a2..d658b91 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -4,8 +4,8 @@ A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".} Name: python-%{srcname} -Version: 2.3.0 -Release: 3%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT URL: https://github.com/platformdirs/platformdirs @@ -55,6 +55,9 @@ sed -i '/pytest-cov/d' setup.cfg %changelog +* Tue Mar 22 2022 Benjamin A. Beasley - 2.5.1-1 +- Update to 2.5.1 (close RHBZ#2007878) + * Sat Dec 04 2021 Carl George - 2.3.0-3 - Use "test" extra to generate buildrequires - Run tests with %%pytest diff --git a/sources b/sources index 606da8d..f116f03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (platformdirs-2.3.0.tar.gz) = 06c570f1c206f557fe989e79a1a98da90c05f15a66a56ebbe260884b2250c2cd1a6345d664af63a886268b5a2bb366186927561721fd6a4b52b11eb2868677b1 +SHA512 (platformdirs-2.5.1.tar.gz) = 44e31df3f76475de2db4ca0e998d0540b87d7eb514fa139b80f26c2217bf7040d725ea1b89751f8660f0c41a59f63a9efc8c70919d0db8a1ce479821c7051e73 From d2d93124a07147c0b2ec4d91af5fb2d666627483 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 21 Apr 2022 09:05:38 -0400 Subject: [PATCH 11/13] Update to 2.5.2 --- python-platformdirs.spec | 25 +++++++++++++++++++------ sources | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index d658b91..9e3604c 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -1,10 +1,12 @@ +%bcond_without tests + %global srcname platformdirs %global common_description %{expand: A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".} Name: python-%{srcname} -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT @@ -19,6 +21,8 @@ BuildArch: noarch %package -n python3-%{srcname} Summary: %{summary} BuildRequires: python3-devel +# RHBZ#1712140, RHBZ#2076994 +BuildRequires: pyproject-rpm-macros >= 1.2.0 %description -n python3-%{srcname} %{common_description} @@ -26,14 +30,13 @@ BuildRequires: python3-devel %prep %autosetup -n %{srcname}-%{version} -# No need to measure coverage -sed -i '/pytest-cov/d' setup.cfg + +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters +sed -r -i '/^[[:blank:]]*"pytest-cov\b/d' pyproject.toml %generate_buildrequires -# Upstream uses tox, but we don't use it, to avoid a build dependency loop -# platformdirs <- virtualenv <- tox -%pyproject_buildrequires -x test +%pyproject_buildrequires -w %{?with_tests:-x test} %build @@ -46,7 +49,13 @@ sed -i '/pytest-cov/d' setup.cfg %check +%if %{with tests} +# Upstream uses tox, but we don’t use it, to avoid a build dependency loop +# platformdirs <- virtualenv <- tox %pytest +%else +%pyproject_check_import +%endif %files -n python3-%{srcname} -f %{pyproject_files} @@ -55,6 +64,10 @@ sed -i '/pytest-cov/d' setup.cfg %changelog +* Thu Apr 21 2022 Benjamin A. Beasley - 2.5.2-1 +- Update to 2.5.2; accommodate upstream’s switch to hatchling build backend +- Add a build conditional for the tests + * Tue Mar 22 2022 Benjamin A. Beasley - 2.5.1-1 - Update to 2.5.1 (close RHBZ#2007878) diff --git a/sources b/sources index f116f03..5a2872c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (platformdirs-2.5.1.tar.gz) = 44e31df3f76475de2db4ca0e998d0540b87d7eb514fa139b80f26c2217bf7040d725ea1b89751f8660f0c41a59f63a9efc8c70919d0db8a1ce479821c7051e73 +SHA512 (platformdirs-2.5.2.tar.gz) = b0b0dee3ac4176e64f302b3d34e253b2e33784160051b9dafb563962e597df75f2c9f714c050d5bdeb1769a1f56c2878a47e9a42361596e287ae7b2afe870370 From 38efe9fdc2ba34c570a778c8619b4ca1b68ce259 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 2 Aug 2023 13:26:17 -0400 Subject: [PATCH 12/13] Update to 2.5.4 (requires hatchling >=1.11.1) --- python-platformdirs.spec | 11 ++++++++--- sources | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/python-platformdirs.spec b/python-platformdirs.spec index 9e3604c..1b20989 100644 --- a/python-platformdirs.spec +++ b/python-platformdirs.spec @@ -6,7 +6,7 @@ A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".} Name: python-%{srcname} -Version: 2.5.2 +Version: 2.5.4 Release: 1%{?dist} Summary: Python module for determining appropriate platform-specific dirs License: MIT @@ -34,9 +34,12 @@ BuildRequires: pyproject-rpm-macros >= 1.2.0 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters sed -r -i '/^[[:blank:]]*"pytest-cov\b/d' pyproject.toml +# Work with the test dependency versions we have in EPEL9: +sed -r -i 's/^([[:blank:]]*"(pytest.*|appdirs))[>~=]=.*"/\1"/' pyproject.toml + %generate_buildrequires -%pyproject_buildrequires -w %{?with_tests:-x test} +%pyproject_buildrequires %{?with_tests:-x test} %build @@ -59,11 +62,13 @@ sed -r -i '/^[[:blank:]]*"pytest-cov\b/d' pyproject.toml %files -n python3-%{srcname} -f %{pyproject_files} -%license LICENSE.txt %doc README.rst CHANGES.rst %changelog +* Wed Aug 02 2023 Benjamin A. Beasley - 2.5.4-1 +- Update to 2.5.4 (requires hatchling >=1.11.1) + * Thu Apr 21 2022 Benjamin A. Beasley - 2.5.2-1 - Update to 2.5.2; accommodate upstream’s switch to hatchling build backend - Add a build conditional for the tests diff --git a/sources b/sources index 5a2872c..bf2d931 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (platformdirs-2.5.2.tar.gz) = b0b0dee3ac4176e64f302b3d34e253b2e33784160051b9dafb563962e597df75f2c9f714c050d5bdeb1769a1f56c2878a47e9a42361596e287ae7b2afe870370 +SHA512 (platformdirs-2.5.4.tar.gz) = 1b7ff79a421bc0b0320a9b1ba8f99dbbecd34a9bea7fa7696b58007f2e05d8a910a3f32e2c03e6e3a8f3d272ab1c045051a682e3155c5bc5285e66e4add59489 From 857c6a77fff62f4cb8e929efe18f1a23359a470d Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:59:30 +0300 Subject: [PATCH 13/13] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index bf2d931..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (platformdirs-2.5.4.tar.gz) = 1b7ff79a421bc0b0320a9b1ba8f99dbbecd34a9bea7fa7696b58007f2e05d8a910a3f32e2c03e6e3a8f3d272ab1c045051a682e3155c5bc5285e66e4add59489