Accepting request 1322559 from systemsmanagement:wbem

- Add patch support-pytest-9.patch:
  * Support pytest 9 changes. (forwarded request 1321872 from StevenK)

OBS-URL: https://build.opensuse.org/request/show/1322559
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pywbem?expand=0&rev=26

python-pywbem.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Dec 10 00:50:41 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch support-pytest-9.patch:
+  * Support pytest 9 changes.
+
+-------------------------------------------------------------------
+Thu Nov 27 10:02:45 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Update to 1.8.1
+  * Removed setup.py and therefore the possibility to run setup.py
+    as a command
+  * Removed the support for building, installing and testing a cythonized
+    distribution of pywbem, because of the transition from setup.py.
+  * Removed support for Python 2.7, 3.6, and 3.7
+  * Fixed safety issues
+  * Added support for Python 3.13.
+
+-------------------------------------------------------------------
+Tue Sep 30 08:12:31 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Update to 1.7.4
+  * Fixed testing of installed version of pywbem
+  * Added Python 3.13
+  * Fixed safety issues & dependencies
+  * Cython support for Python 3.13
+- Drop support-new-testfixtures.patch, fixed upstream
+- Convert to libalternatives on SLE-16-based and newer systems
+
 -------------------------------------------------------------------
 Thu Sep 26 06:02:23 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
 

python-pywbem.spec

@@ -16,55 +16,57 @@
 #
 
 
-# cythonized pywbem produces yacc parser errors
-%bcond_with cythonize
+%if 0%{?suse_version} > 1500
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
 Name:           python-pywbem
-Version:        1.7.2
+Version:        1.8.1
 Release:        0
 Summary:        Python module for making CIM operation calls using the WBEM protocol
 License:        LGPL-2.1-or-later
 Group:          System/Management
 URL:            https://pywbem.github.io/
-Source0:        https://github.com/pywbem/pywbem/archive/%{version}.tar.gz#/pywbem-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM Based on gh#pywbem/pywbem#3217
-Patch0:         support-new-testfixtures.patch
-BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module setuptools >= 38.4.1}
-BuildRequires:  %{python_module wheel}
-%if %{with cythonize}
-BuildRequires:  %{python_module Cython}
-BuildRequires:  %{python_module devel}
-%endif
+Source0:        https://files.pythonhosted.org/packages/source/p/pywbem/pywbem-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#pywbem/pywbem#3350
+Patch0:         support-pytest-9.patch
 BuildRequires:  %{python_module FormEncode >= 2.0.0}
-BuildRequires:  %{python_module PyYAML > 5.3.1}
-BuildRequires:  %{python_module certifi >= 2019.11.28}
-BuildRequires:  %{python_module httpretty}
+BuildRequires:  %{python_module PyYAML >= 6.0.2}
+BuildRequires:  %{python_module certifi >= 2024.07.04}
+BuildRequires:  %{python_module idna >= 3.7}
 BuildRequires:  %{python_module lxml >= 4.6.4}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module ply >= 3.10}
-BuildRequires:  %{python_module pytest >= 6.2.5}
+BuildRequires:  %{python_module pytest >= 7.0.0}
 BuildRequires:  %{python_module pytz}
-BuildRequires:  %{python_module requests >= 2.25.0}
+BuildRequires:  %{python_module requests >= 2.32.4}
 BuildRequires:  %{python_module requests-mock}
-BuildRequires:  %{python_module six >= 1.16.0}
+BuildRequires:  %{python_module setuptools >= 70.0.0}
+BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module testfixtures}
 BuildRequires:  %{python_module urllib3 >= 1.26.5}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  %{python_module yamlloader >= 0.5.5}
 BuildRequires:  fdupes
 BuildRequires:  libxml2-tools
 BuildRequires:  python-rpm-macros
-Requires:       python-PyYAML >= 5.3.1
-Requires:       python-certifi >= 2019.11.28
+Requires:       python-PyYAML >= 6.0.2
+Requires:       python-certifi >= 2024.07.04
+Requires:       python-idna >= 3.7
 Requires:       python-ply >= 3.10
-Requires:       python-requests >= 2.25.0
-Requires:       python-six >= 1.16.0
-Requires:       python-urllib3 >= 1.26.5
+Requires:       python-requests >= 2.32.4
+Requires:       python-urllib3 >= 2.5.0
 Requires:       python-yamlloader >= 0.5.5
+Recommends:     python-pywebmtools
+%if %{with libalternatives}
+BuildRequires:  alts
+Requires:       alts
+%else
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-Recommends:     python-pywebmtools
-%if ! %{with cythonize}
-BuildArch:      noarch
 %endif
+BuildArch:      noarch
 %python_subpackages
 
 %description
@@ -75,7 +77,7 @@ protocol to query and update managed objects.
 %autosetup -p1 -n pywbem-%{version}
 
 %build
-%pyproject_wheel %{?_with_cythonize:--config-settings "--build-option=--cythonized" .}
+%pyproject_wheel
 
 %install
 %pyproject_install
@@ -84,11 +86,7 @@ rm %{buildroot}%{_bindir}/*.bat
 %python_clone -a %{buildroot}%{_bindir}/mof_compiler
 
 %check
-%if %{with cythonize}
-%pytest_arch -k "not (skipnothingbydefault ${$python_donttest})" tests/unittest tests/functiontest
-%else
 %pytest -k "not (skipnothingbydefault ${$python_donttest})" tests/unittest tests/functiontest
-%endif
 
 %post
 %python_install_alternative mof_compiler
@@ -96,6 +94,9 @@ rm %{buildroot}%{_bindir}/*.bat
 %postun
 %python_uninstall_alternative mof_compiler
 
+%pre
+%python_libalternatives_reset_alternative mof_compiler
+
 %files %{python_files}
 %doc README.md
 %license LICENSE.txt

pywbem-1.8.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fefec34f724a551e42ca389d082d029fed03b4ff14acc8ef5c7cb92fdda135b
+size 2648940

support-new-testfixtures.patch

@@ -1,55 +0,0 @@
-From f6acfc45af0c8b5b592890a3ff222708902f2ae7 Mon Sep 17 00:00:00 2001
-From: Andreas Maier <andreas.r.maier@gmx.de>
-Date: Mon, 19 Aug 2024 18:29:10 +0200
-Subject: [PATCH] Test: In test_recorder.py avoid a new AssertionError by
- testfixtures 8.3.0
-
-Details:
-
-* The setup_method() in BaseLogOperationRecorderTests had called
-  logging.shutdown() which triggered a new AssertionError raised by
-  testfixtures 8.3.0 that complains about LogCapture handlers being closed
-  but still installed.
-
-  Uninstalling the LogCapture handlers via LogCapture.uninstall_all()
-  introduced the new problem that logging was not performed correctly
-  anymore.
-
-  The solution seems to be to not call logging.shutdown() in setup_method(),
-  which is also understandable given that it is only supposed to be used
-  before exiting the program.
-
-  Note that we still call it in teardown_method().
-
-Fixed steps to start new version; removed types from _version.py
-
-Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>
----
- docs/changes.rst                       | 4 ++--
- test-requirements.txt                  | 7 +------
- tests/unittest/pywbem/test_recorder.py | 9 ++++-----
- 3 files changed, 7 insertions(+), 13 deletions(-)
-
-ddiff --git a/tests/unittest/pywbem/test_recorder.py b/tests/unittest/pywbem/test_recorder.py
-index be618fe15..f7eb1797a 100755
---- a/tests/unittest/pywbem/test_recorder.py
-+++ b/tests/unittest/pywbem/test_recorder.py
-@@ -1620,14 +1620,13 @@ def setup_method(self):
-         """
-         Setup that is run before each test method.
-         """
--        # Shut down any existing logger and reset WBEMConnection and
--        # reset WBEMConnection class attributes
--        # pylint: disable=protected-access
--        WBEMConnection._reset_logging_config()
--        logging.shutdown()
-+        # Reset WBEMConnection logging.
-         # NOTE We do not clean up handlers or logger names already defined.
-         #      That should not affect the tests.
- 
-+        # pylint: disable=protected-access
-+        WBEMConnection._reset_logging_config()
-+
-     def recorder_setup(self, detail_level=None):
-         """
-         Setup the recorder for a defined max output size

support-pytest-9.patch

@@ -0,0 +1,51 @@
+From 757a4903276169088fa0010fe03c823b94ecc30a Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Wed, 26 Nov 2025 15:21:46 +1100
+Subject: [PATCH] Update pytest_collect_file hook
+
+pytest_collect_file from pytest 7 on has deprecated the py.path
+arguments and replaced them with pathlib equivalents, bump the minimum
+version of pytest installed and use the new argument.
+---
+ test-requirements.txt          | 2 +-
+ tests/functiontest/conftest.py | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 088ab84da..43b013a16 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -23,7 +23,7 @@ packaging>=24.1
+ # Max pytest version < 8.0 because of issue with Deprecated warnings in pytest 8.0.x.
+ # pytest-cov 4.0.0 depends on pytest>=4.6
+ pytest>=4.6.0,!=6.0,<8.0; python_version <= '3.9'
+-pytest>=6.2.5,<8.0; python_version >= '3.10'
++pytest>=7.0.0,<10.0; python_version >= '3.10'
+ testfixtures>=6.9.0
+ # pylint>=2.15 requires colorama>=0.4.5
+ colorama>=0.4.5
+diff --git a/tests/functiontest/conftest.py b/tests/functiontest/conftest.py
+index 79481361c..ea39cd462 100644
+--- a/tests/functiontest/conftest.py
++++ b/tests/functiontest/conftest.py
+@@ -205,17 +205,17 @@ def patched_makefile(self, mode='r', bufsize=-1):
+     return self.fd
+ 
+ 
+-def pytest_collect_file(parent, path):
++def pytest_collect_file(parent, file_path):
+     """
+     py.test hook that is called for a directory to collect its test files.
+ 
+     For an example very similar to what we do here, see
+     https://docs.pytest.org/en/latest/example/nonpython.html
+     """
+-    if path.ext == ".yaml":
++    if file_path.suffix == ".yaml":
+         if hasattr(YamlFile, 'from_parent'):
+             # pylint: disable=no-member
+-            return YamlFile.from_parent(fspath=path, parent=parent)
++            return YamlFile.from_parent(path=file_path, parent=parent)
+         # Direct creation has been deprecated in pytest, but
+         # from_parent() was introduced only in pytest 6.0.0 and we
+         # have to pin to lower pytest versions on py27/py34/py35.