Remove dependency on deprecated python-pytest-runner

This commit is contained in:
Benjamin A. Beasley 2025-05-27 08:37:50 -04:00
commit 9f0a77cc6b
2 changed files with 46 additions and 3 deletions

39
17.patch Normal file
View file

@ -0,0 +1,39 @@
From 52a68f3d1dd3568dd399ec10b1e5029d0889397d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
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

View file

@ -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