diff --git a/python-boltons.changes b/python-boltons.changes index 09b8bcc..df30416 100644 --- a/python-boltons.changes +++ b/python-boltons.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 15 03:45:13 UTC 2025 - Steve Kowalik + +- Add patch support-pytest-9.patch: + * Use shiny new pathlib arguments for the collection hooks. + ------------------------------------------------------------------- Fri Feb 21 12:30:09 UTC 2025 - Markéta Machová diff --git a/python-boltons.spec b/python-boltons.spec index c59364c..9e70227 100644 --- a/python-boltons.spec +++ b/python-boltons.spec @@ -1,7 +1,7 @@ # # spec file for package python-boltons # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,11 @@ Summary: The "Boltons" utility package for Python License: BSD-3-Clause URL: https://github.com/mahmoud/boltons Source: https://files.pythonhosted.org/packages/source/b/boltons/boltons-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#mahmoud/boltons#391 +Patch0: support-pytest-9.patch BuildRequires: %{python_module flit-core} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch diff --git a/support-pytest-9.patch b/support-pytest-9.patch new file mode 100644 index 0000000..51addcc --- /dev/null +++ b/support-pytest-9.patch @@ -0,0 +1,31 @@ +From 5bf0e99182fc910f641a0849fa209940d68bce32 Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +Date: Mon, 15 Dec 2025 14:38:06 +1100 +Subject: [PATCH] Support pytest 9 changes + +Starting from pytest 7, the py.path arguments to pytest's hook functions +have been deprecated, replaced with pathlib.Path equivalents. Since +pytest 7 is the minimum version we support, move to using it. +--- + tests/conftest.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index d4d2192c..e2c9a0cf 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -5,12 +5,12 @@ + _VERSION_MARKER = re.compile(r'_py(?P\d)(?P\d)?') + + +-def pytest_ignore_collect(path, config): ++def pytest_ignore_collect(collection_path, config): + """ + Ignore tests that end with _pyX, where X does not equal this + interpreter's major version. + """ +- filename = path.basename ++ filename = collection_path.name + modulename = filename.split('.', 1)[0] + match = _VERSION_MARKER.search(modulename) + if not match: