From 62f5a8590532c5f8dc0c784ff6aff0b72e0de746 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 23:06:03 +0000 Subject: [PATCH 01/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-admesh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-admesh.spec b/python-admesh.spec index 0575392..6827215 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 0.98.9 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Python bindings for ADMesh, STL manipulation library License: GPLv2+ @@ -65,6 +65,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v \ %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.98.9-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 0.98.9-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 48ac8dff08bcefc34e637417dec32ab721a26ace Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 00:59:51 +0000 Subject: [PATCH 02/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-admesh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-admesh.spec b/python-admesh.spec index 6827215..423bb93 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 0.98.9 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Python bindings for ADMesh, STL manipulation library License: GPLv2+ @@ -65,6 +65,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v \ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 0.98.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.98.9-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8f50592c20588b9522811926700ccc3185b75d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 29 Jan 2024 15:35:02 +0100 Subject: [PATCH 03/15] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 117 +++++++++++++++++++++++++++++++++++++++++++ python-admesh.spec | 120 +-------------------------------------------- 2 files changed, 119 insertions(+), 118 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..f50f5df --- /dev/null +++ b/changelog @@ -0,0 +1,117 @@ +* Fri Jan 26 2024 Fedora Release Engineering - 0.98.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.98.9-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.98.9-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.98.9-16 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.98.9-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.98.9-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.98.9-13 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 0.98.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.98.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.98.9-10 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.98.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.98.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.98.9-7 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.98.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Aug 19 2019 Miro Hrončok - 0.98.9-5 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.98.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.98.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.98.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 25 2018 Miro Hrončok - 0.98.9-1 +- Update to 0.98.9 +- Temporarily skip a test on ppc64 + +* Tue Jun 19 2018 Miro Hrončok - 0.98.8-3 +- Rebuilt for Python 3.7 + +* Fri Mar 02 2018 Miro Hrončok - 0.98.8-2 +- Remove legacy Python subpackage + +* Wed Feb 14 2018 Miro Hrončok - 0.98.8-1 +- Updated to new version 0.98.8 to fix FTBFS + +* Fri Feb 09 2018 Fedora Release Engineering - 0.98.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.98.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.98.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 13 2017 Miro Hrončok - 0.98.7-1 +- Updated to new version 0.98.7 +- Updated to the new naming scheme + +* Sat Feb 11 2017 Fedora Release Engineering - 0.98.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 0.98.5-4 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.98.5-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 0.98.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Dec 08 2015 Miro Hrončok - 0.98.5-1 +- New version 0.98.5, fix FTBFS + +* Tue Nov 10 2015 Fedora Release Engineering - 0.98.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Jun 18 2015 Fedora Release Engineering - 0.98.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Feb 25 2015 Miro Hrončok - 0.98.3-1 +- New version 0.98.3 + +* Wed Sep 03 2014 Miro Hrončok - 0.98.1-1 +- New version +- Run tests, add BR pytest + +* Wed Sep 03 2014 Miro Hrončok - 0.98-3 +- Set correct executable permissions +- Typo in summary + +* Thu Jul 31 2014 Miro Hrončok - 0.98-2 +- Require setuptools. + +* Tue Jul 29 2014 Miro Hrončok - 0.98-1 +- Initial package. diff --git a/python-admesh.spec b/python-admesh.spec index 423bb93..c56f1b0 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 0.98.9 -Release: 19%{?dist} +Release: %autorelease Summary: Python bindings for ADMesh, STL manipulation library License: GPLv2+ @@ -65,120 +65,4 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v \ %changelog -* Fri Jan 26 2024 Fedora Release Engineering - 0.98.9-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.98.9-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 0.98.9-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 0.98.9-16 -- Rebuilt for Python 3.12 - -* Fri Jan 20 2023 Fedora Release Engineering - 0.98.9-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.98.9-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 0.98.9-13 -- Rebuilt for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 0.98.9-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.98.9-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.98.9-10 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 0.98.9-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.98.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.98.9-7 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 0.98.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Aug 19 2019 Miro Hrončok - 0.98.9-5 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 0.98.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 0.98.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.98.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 25 2018 Miro Hrončok - 0.98.9-1 -- Update to 0.98.9 -- Temporarily skip a test on ppc64 - -* Tue Jun 19 2018 Miro Hrončok - 0.98.8-3 -- Rebuilt for Python 3.7 - -* Fri Mar 02 2018 Miro Hrončok - 0.98.8-2 -- Remove legacy Python subpackage - -* Wed Feb 14 2018 Miro Hrončok - 0.98.8-1 -- Updated to new version 0.98.8 to fix FTBFS - -* Fri Feb 09 2018 Fedora Release Engineering - 0.98.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.98.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.98.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Apr 13 2017 Miro Hrončok - 0.98.7-1 -- Updated to new version 0.98.7 -- Updated to the new naming scheme - -* Sat Feb 11 2017 Fedora Release Engineering - 0.98.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 0.98.5-4 -- Rebuild for Python 3.6 - -* Tue Jul 19 2016 Fedora Release Engineering - 0.98.5-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Feb 04 2016 Fedora Release Engineering - 0.98.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Dec 08 2015 Miro Hrončok - 0.98.5-1 -- New version 0.98.5, fix FTBFS - -* Tue Nov 10 2015 Fedora Release Engineering - 0.98.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Jun 18 2015 Fedora Release Engineering - 0.98.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 25 2015 Miro Hrončok - 0.98.3-1 -- New version 0.98.3 - -* Wed Sep 03 2014 Miro Hrončok - 0.98.1-1 -- New version -- Run tests, add BR pytest - -* Wed Sep 03 2014 Miro Hrončok - 0.98-3 -- Set correct executable permissions -- Typo in summary - -* Thu Jul 31 2014 Miro Hrončok - 0.98-2 -- Require setuptools. - -* Tue Jul 29 2014 Miro Hrončok - 0.98-1 -- Initial package. +%autochangelog From 366c64c8dde9211eca68bb8b8b2bd31e4ac2ca23 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 11:10:43 +0200 Subject: [PATCH 04/15] Rebuilt for Python 3.13 From 664d1f3496eda879f01c03bb489e9db60824a528 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 09:15:11 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 23d99fa5d365af35c4dad5d1087c62636ee3d367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 02:15:03 +0200 Subject: [PATCH 06/15] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- python-admesh.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-admesh.spec b/python-admesh.spec index c56f1b0..286a044 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -5,7 +5,8 @@ Version: 0.98.9 Release: %autorelease Summary: Python bindings for ADMesh, STL manipulation library -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/admesh/python-admesh Source0: https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz From a54b47b89fdb4c556e29c5f5dc1c1661d842ef5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 11:38:09 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 16fddc3830dfc2e018d2989fd11a03211ea219bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Mar 2025 14:13:54 +0100 Subject: [PATCH 08/15] Exclude i686 on Fedora 42+ https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- python-admesh.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-admesh.spec b/python-admesh.spec index 286a044..6c2d557 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -13,6 +13,11 @@ Source0: https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{ # https://github.com/admesh/python-admesh/issues/15 Source1: %{url}/raw/v%{version}/test/utils.py +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11 +ExcludeArch: %{ix86} +%endif + BuildRequires: gcc BuildRequires: admesh-devel >= 0.98 From 76bad0c2c822c98e2854ea2453e50ef7ea6ea818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 18 May 2025 21:59:13 +0200 Subject: [PATCH 09/15] Convert to %pyproject macros [skip changelog] --- python-admesh.spec | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/python-admesh.spec b/python-admesh.spec index 6c2d557..c808633 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -24,9 +24,6 @@ BuildRequires: admesh-devel >= 0.98 BuildRequires: python3-devel BuildRequires: python3-pytest -BuildRequires: python3-setuptools -BuildRequires: python3-Cython -BuildRequires: python3-pytest-runner %description This module provides bindings for the ADMesh library. @@ -35,7 +32,6 @@ format and partially repair them if necessary. %package -n python3-%{pypi_name} Summary: Python 3 bindings for ADMesh, STL manipulation library -%{?python_provide:%python_provide python3-%{pypi_name}} Obsoletes: python2-%{pypi_name} < 0.98.8-2 Obsoletes: python-%{pypi_name} < 0.98.8-2 @@ -50,24 +46,23 @@ format and partially repair them if necessary. %setup -q -n %{pypi_name}-%{version} cp %{SOURCE1} test/ +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files -l %{pypi_name} %check -PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v \ -%ifarch ppc64 - -k "not test_saved_equals_original_binary" # likely a bug in admesh itself -%endif +%pyproject_check_import +%pytest -v -%files -n python3-%{pypi_name} +%files -n python3-%{pypi_name} -f %{pyproject_files} %doc README.rst -%license COPYING -%attr(0755,root,root) %{python3_sitearch}/%{pypi_name}.*.so -%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog From e682be4cf82fddd74b7f519ff50d6ebe74550875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 18 May 2025 22:00:16 +0200 Subject: [PATCH 10/15] Expand %{pypi_name} [skip changelog] --- python-admesh.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/python-admesh.spec b/python-admesh.spec index c808633..f19b572 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -1,6 +1,4 @@ -%global pypi_name admesh - -Name: python-%{pypi_name} +Name: python-admesh Version: 0.98.9 Release: %autorelease Summary: Python bindings for ADMesh, STL manipulation library @@ -8,7 +6,7 @@ Summary: Python bindings for ADMesh, STL manipulation library # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/admesh/python-admesh -Source0: https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/a/admesh/admesh-%{version}.tar.gz # https://github.com/admesh/python-admesh/issues/15 Source1: %{url}/raw/v%{version}/test/utils.py @@ -30,20 +28,20 @@ This module provides bindings for the ADMesh library. It lets you manipulate 3D models in binary or ASCII STL format and partially repair them if necessary. -%package -n python3-%{pypi_name} +%package -n python3-admesh Summary: Python 3 bindings for ADMesh, STL manipulation library -Obsoletes: python2-%{pypi_name} < 0.98.8-2 -Obsoletes: python-%{pypi_name} < 0.98.8-2 +Obsoletes: python2-admesh < 0.98.8-2 +Obsoletes: python-admesh < 0.98.8-2 -%description -n python3-%{pypi_name} +%description -n python3-admesh This module provides bindings for the ADMesh library. It lets you manipulate 3D models in binary or ASCII STL format and partially repair them if necessary. %prep -%setup -q -n %{pypi_name}-%{version} +%setup -q -n admesh-%{version} cp %{SOURCE1} test/ %generate_buildrequires @@ -55,13 +53,13 @@ cp %{SOURCE1} test/ %install %pyproject_install -%pyproject_save_files -l %{pypi_name} +%pyproject_save_files -l admesh %check %pyproject_check_import %pytest -v -%files -n python3-%{pypi_name} -f %{pyproject_files} +%files -n python3-admesh -f %{pyproject_files} %doc README.rst From 6526d2573cf83b00c1c30f031767f4decb1f3943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 18 May 2025 22:00:53 +0200 Subject: [PATCH 11/15] Review the SPDX license [skip changelog] --- python-admesh.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-admesh.spec b/python-admesh.spec index f19b572..a248a97 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -3,7 +3,6 @@ Version: 0.98.9 Release: %autorelease Summary: Python bindings for ADMesh, STL manipulation library -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/admesh/python-admesh Source0: https://files.pythonhosted.org/packages/source/a/admesh/admesh-%{version}.tar.gz From 30d68123bcce8dfc97fe11f055ac2684600d179e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 18 May 2025 22:01:19 +0200 Subject: [PATCH 12/15] Remove no-longer-needed Obsoletes --- python-admesh.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/python-admesh.spec b/python-admesh.spec index a248a97..5bbf161 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -30,9 +30,6 @@ format and partially repair them if necessary. %package -n python3-admesh Summary: Python 3 bindings for ADMesh, STL manipulation library -Obsoletes: python2-admesh < 0.98.8-2 -Obsoletes: python-admesh < 0.98.8-2 - %description -n python3-admesh This module provides bindings for the ADMesh library. It lets you manipulate 3D models in binary or ASCII STL From 9f0a77cc6b95b3f90902cfa59eb2949549652d17 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 27 May 2025 08:37:50 -0400 Subject: [PATCH 13/15] Remove dependency on deprecated python-pytest-runner --- 17.patch | 39 +++++++++++++++++++++++++++++++++++++++ python-admesh.spec | 10 +++++++--- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 17.patch diff --git a/17.patch b/17.patch new file mode 100644 index 0000000..3d82d9d --- /dev/null +++ b/17.patch @@ -0,0 +1,39 @@ +From 52a68f3d1dd3568dd399ec10b1e5029d0889397d Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Tue, 27 May 2025 08:33:05 -0400 +Subject: [PATCH] Drop pytest-runner and "setup.py test" support + +--- + setup.py | 4 ++-- + tox.ini | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 0f003dd..9476806 100755 +--- a/setup.py ++++ b/setup.py +@@ -19,8 +19,8 @@ def _autogen(*args, **kwargs): + author_email='miro@hroncok.cz', + url='https://github.com/admesh/python-admesh', + license='GPLv2+', +- setup_requires=['Cython>=0.22', 'pytest-runner'], +- tests_require=['pytest'], ++ setup_requires=['Cython>=0.22'], ++ extras_require={'test': ['pytest']}, + packages=find_packages(), + cmdclass={'build_ext': _autogen}, + ext_modules=[Extension("admesh", ["admesh.pyx"], libraries=["admesh"])], +diff --git a/tox.ini b/tox.ini +index b41f291..3e0e723 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -2,7 +2,8 @@ + envlist = py37,py36,py35,py34,py27,pypy3,pypy + [testenv] + deps=Cython +-commands=python setup.py test ++extras=test ++commands=pytest + passenv = + CFLAGS + LDFLAGS diff --git a/python-admesh.spec b/python-admesh.spec index 5bbf161..9c36a0d 100644 --- a/python-admesh.spec +++ b/python-admesh.spec @@ -10,6 +10,11 @@ Source0: https://files.pythonhosted.org/packages/source/a/admesh/admesh-% # https://github.com/admesh/python-admesh/issues/15 Source1: %{url}/raw/v%{version}/test/utils.py +# Drop pytest-runner and "setup.py test" support +# https://github.com/admesh/python-admesh/pull/17 +# https://fedoraproject.org/wiki/Changes/DeprecatePythonPytestRunner +Patch: %{url}/pull/17.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval %if 0%{?fedora} >= 42 || 0%{?rhel} >= 11 ExcludeArch: %{ix86} @@ -20,7 +25,6 @@ BuildRequires: gcc BuildRequires: admesh-devel >= 0.98 BuildRequires: python3-devel -BuildRequires: python3-pytest %description This module provides bindings for the ADMesh library. @@ -37,11 +41,11 @@ format and partially repair them if necessary. %prep -%setup -q -n admesh-%{version} +%autosetup -n admesh-%{version} -p1 cp %{SOURCE1} test/ %generate_buildrequires -%pyproject_buildrequires +%pyproject_buildrequires -x test %build %pyproject_wheel From 0e5da8e29375b30b29152161f69a67a06585dc34 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 22:44:09 +0200 Subject: [PATCH 14/15] Rebuilt for Python 3.14 From 0cfa05858be80b9833b48ea05a29b8e718a332d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:33:06 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild