Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-shell-utilities for
openSUSE:Factory checked in at 2025-11-28 16:53:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-shell-utilities (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-shell-utilities.new.14147
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-shell-utilities"
Fri Nov 28 16:53:14 2025 rev:8 rq:1320396 version:1.9.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-shell-utilities/python-pytest-shell-utilities.changes
2025-11-17 12:25:53.368123500 +0100
+++
/work/SRC/openSUSE:Factory/.python-pytest-shell-utilities.new.14147/python-pytest-shell-utilities.changes
2025-11-28 16:55:03.475655905 +0100
@@ -1,0 +2,7 @@
+Fri Nov 28 01:00:22 UTC 2025 - Steve Kowalik <[email protected]>
+
+- Only require pytest-subtests with pytest < 9.
+- Add patch support-pytest-9.patch:
+ * Import from pytest, falling back to pytest_subtests.
+
+-------------------------------------------------------------------
New:
----
support-pytest-9.patch
----------(New B)----------
New:- Only require pytest-subtests with pytest < 9.
- Add patch support-pytest-9.patch:
* Import from pytest, falling back to pytest_subtests.
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-shell-utilities.spec ++++++
--- /var/tmp/diff_new_pack.8pxbRr/_old 2025-11-28 16:55:04.319691442 +0100
+++ /var/tmp/diff_new_pack.8pxbRr/_new 2025-11-28 16:55:04.323691611 +0100
@@ -34,6 +34,8 @@
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-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
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.8pxbRr/_old 2025-11-28 16:55:04.387694306 +0100
+++ /var/tmp/diff_new_pack.8pxbRr/_new 2025-11-28 16:55:04.391694474 +0100
@@ -1,6 +1,6 @@
-mtime: 1763373317
-commit: 9ffa28a405150b99f00fa8087ced01e26d7963146bc6ea0b2c03b72356df8dc4
+mtime: 1764291651
+commit: b4ad08b8dc91108638348541c7c3dd731510484050930085b299b63d47cb6800
url: https://src.opensuse.org/python-pytest/python-pytest-shell-utilities.git
-revision: 9ffa28a405150b99f00fa8087ced01e26d7963146bc6ea0b2c03b72356df8dc4
+revision: b4ad08b8dc91108638348541c7c3dd731510484050930085b299b63d47cb6800
projectscmsync: https://src.opensuse.org/python-pytest/_ObsPrj.git
++++++ build.specials.obscpio ++++++
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2025-11-28 02:28:38.000000000 +0100
@@ -0,0 +1 @@
+.osc
++++++ support-pytest-9.patch ++++++
>From b6f26e62a20fc8c42635a2b868e8915cc2a0b21d Mon Sep 17 00:00:00 2001
From: Steve Kowalik <[email protected]>
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
