python-pytest-shell-utilities.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 28 01:00:22 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Only require pytest-subtests with pytest < 9.
+- Add patch support-pytest-9.patch:
+  * Import from pytest, falling back to pytest_subtests.
+
 -------------------------------------------------------------------
 Mon Nov 17 09:53:35 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
 

python-pytest-shell-utilities.spec

@@ -34,6 +34,8 @@ URL:            https://github.com/saltstack/pytest-shell-utilities
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-shell-utilities/pytest_shell_utilities-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM python314.patch gh#saltstack/pytest-shell-utilities#57
 Patch0:         python314.patch
+# PATCH-FIX-UPSTREAM gh#saltstack/pytest-shell-utilities#58
+Patch1:         support-pytest-9.patch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools >= 50.3.2}
 BuildRequires:  %{python_module setuptools_scm >= 3.4}
@@ -48,7 +50,7 @@ BuildRequires:  %{python_module pytest >= 7.3.0}
 BuildRequires:  %{python_module pytest-helpers-namespace}
 BuildRequires:  %{python_module pytest-shell-utilities = %{version}}
 BuildRequires:  %{python_module pytest-skip-markers}
-BuildRequires:  %{python_module pytest-subtests}
+BuildRequires:  %{python_module pytest-subtests if %python-pytest < 9}
 BuildRequires:  %{python_module typing-extensions}
 %endif
 # /SECTION

support-pytest-9.patch

@@ -0,0 +1,45 @@
+From b6f26e62a20fc8c42635a2b868e8915cc2a0b21d Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Fri, 28 Nov 2025 11:27:17 +1100
+Subject: [PATCH] Support pytest 9
+
+pytest 9 has included support for subtests, marking pytest_subtests as
+unmaintained at the same time -- attempt to import from pytest first,
+falling back to pytest_subtests if required.
+---
+ tests/functional/shell/test_script_subprocess.py | 5 ++++-
+ tests/unit/utils/processes/test_processresult.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/tests/functional/shell/test_script_subprocess.py b/tests/functional/shell/test_script_subprocess.py
+index 3bbc6d5..3255056 100644
+--- a/tests/functional/shell/test_script_subprocess.py
++++ b/tests/functional/shell/test_script_subprocess.py
+@@ -8,7 +8,10 @@
+ from typing import cast
+ 
+ import pytest
+-from pytest_subtests import SubTests
++try:
++    from pytest import Subtests as SubTests
++except ImportError:
++    from pytest_subtests import SubTests
+ 
+ from pytestshellutils.customtypes import EnvironDict
+ from pytestshellutils.exceptions import FactoryTimeout
+diff --git a/tests/unit/utils/processes/test_processresult.py b/tests/unit/utils/processes/test_processresult.py
+index 3ab90fd..5c88a52 100644
+--- a/tests/unit/utils/processes/test_processresult.py
++++ b/tests/unit/utils/processes/test_processresult.py
+@@ -8,7 +8,10 @@
+ import textwrap
+ 
+ import pytest
+-from pytest_subtests import SubTests
++try:
++    from pytest import Subtests as SubTests
++except ImportError:
++    from pytest_subtests import SubTests
+ 
+ from pytestshellutils.utils.processes import ProcessResult
+