Sync from SUSE:SLFO:Main python-testtools revision 9ec4a8ee62291255c6e514a4edca1514

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>

python-testtools.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Mon Sep 23 14:06:48 UTC 2024 - Markéta Machová <mmachova@suse.com>
+
+- Update to 2.7.2
+  * Treat methodName="runTest" similar to unittest.TestCase,
+    fixes compatibility with pytest 8.3. (Natanael Copa, #372)
+  * Use ruff for linting. (Jelmer Vernooij)
+  * Fix compatibility with Python 3.12.1. (Matthew Treinish)
+  * Deprecate SkippedTest exception. (Stephen Finucane)
+  * Drop support for Python 3.7. (Jelmer Vernooij)
+- Drop merged pytest82.patch
+- Add upstream twisted.patch to fix tests with new Twisted
+
+-------------------------------------------------------------------
+Fri May 17 14:07:33 UTC 2024 - Markéta Machová <mmachova@suse.com>
+
+- Add pytest82.patch to fix functionality with the new pytest.
+
+-------------------------------------------------------------------
+Wed May  8 06:42:24 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Drop the now unneeded rpmlintrc.
+- Clean up BuildRequires and Requires to match reality.
+- Add missing _multibuild file.
+
+-------------------------------------------------------------------
+Sat Dec 30 20:31:27 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.7.1:
+  * Remove various unused imports.
+  * Fix build backend. This should prevent version from being set
+    when building wheels.
+  * Fix compatibility with Python 3.12.
+  * Add typing in various modules (still lacking full coverage).
+  * Drop the 'test' command for distutils. This has been
+    deprecated since 2.6.0. (Jelmer Vernooij)
+  * Drop support for Python 3.6.
+
 -------------------------------------------------------------------
 Thu May  4 21:18:15 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-testtools.rpmlintrc

@@ -1 +0,0 @@
-addFilter("E: python-tests-in-package.*/usr/lib/.*/site-packages/testtools/tests")

python-testtools.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package python-testtools
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,26 +26,29 @@
 %endif
 %{?sle15_python_module_pythons}
 Name:           python-testtools%{psuffix}
-Version:        2.6.0
+Version:        2.7.2
 Release:        0
 Summary:        Extensions to the Python Standard Library Unit Testing Framework
 License:        MIT
-Group:          Development/Languages/Python
 URL:            https://github.com/testing-cabal/testtools
 Source0:        https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz
-Source99:       python-testtools.rpmlintrc
+# PATCH-FIX-UPSTREAM https://github.com/testing-cabal/testtools/commit/5b8cb6497c7159f593e68de6a13e15f7e78e56e3 Prepare tests for upcoming twisted version
-BuildRequires:  %{python_module pbr}
+Patch0:         twisted.patch
-BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module hatch_vcs}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-pbr >= 0.11
+Requires:       python-Twisted
-Requires:       python-python-mimeparse
+%if %python_version_nodots > 311
-Requires:       python-traceback2
+Requires:       python-setuptools
+%endif
 BuildArch:      noarch
 %if %{with test}
-BuildRequires:  %{python_module python-mimeparse}
+BuildRequires:  %{python_module fixtures}
+BuildRequires:  %{python_module testresources}
 BuildRequires:  %{python_module testscenarios}
-BuildRequires:  %{python_module traceback2}
+BuildRequires:  %{python_module testtools = %{version}}
 %endif
 Recommends:     python-fixtures >= 2.0
 %python_subpackages
@@ -57,16 +60,16 @@ with unit tests in Python and come from many different sources. testtools
 also ports recent unittest changes all the way back to Python 2.4.
 
 %prep
-%setup -q -n testtools-%{version}
+%autosetup -p1 -n testtools-%{version}
 
 %if !%{with test}
 %build
-%python_build
+%pyproject_wheel
 %endif
 
 %if !%{with test}
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %endif
 
@@ -80,7 +83,7 @@ also ports recent unittest changes all the way back to Python 2.4.
 %license LICENSE
 %doc NEWS README.rst
 %{python_sitelib}/testtools
-%{python_sitelib}/testtools-%{version}-py*.egg-info
+%{python_sitelib}/testtools-%{version}.dist-info
 %endif
 
 %changelog

twisted.patch

@@ -0,0 +1,46 @@
+From 5b8cb6497c7159f593e68de6a13e15f7e78e56e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Mon, 1 Jul 2024 10:00:05 +0200
+Subject: [PATCH] Prepare tests for upcoming twisted version
+
+Twisted recently changed behavior of logger on failures [1]. It newly
+logs the `Main loop terminated.` even on exceptions, which breaks two
+test in twistedsupport test suite. This hack attempts to address the
+upcoming issue.
+
+[1] https://github.com/twisted/twisted/pull/12207
+---
+ testtools/tests/twistedsupport/test_runtest.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testtools/tests/twistedsupport/test_runtest.py b/testtools/tests/twistedsupport/test_runtest.py
+index 4b46cc64..f8faf7c6 100644
+--- a/testtools/tests/twistedsupport/test_runtest.py
++++ b/testtools/tests/twistedsupport/test_runtest.py
+@@ -16,7 +16,6 @@
+     Contains,
+     ContainsAll,
+     ContainsDict,
+-    EndsWith,
+     Equals,
+     Is,
+     KeysEqual,
+@@ -749,7 +748,7 @@ def test_something(self):
+                     test,
+                     {
+                         "traceback": Not(Is(None)),
+-                        "twisted-log": AsText(EndsWith(" foo\n")),
++                        "twisted-log": AsText(Contains(" foo\n")),
+                     },
+                 ),
+                 ("stopTest", test),
+@@ -790,7 +789,8 @@ def test_something(self):
+         result = self.make_result()
+         runner.run(result)
+         self.assertThat(
+-            messages, MatchesListwise([ContainsDict({"message": Equals(("foo",))})])
++            messages[0:1],
++            MatchesListwise([ContainsDict({"message": Equals(("foo",))})]),
+         )
+ 
+     def test_restore_observers(self):