0001-Skip-tests-failing-in-Python-3.9.patch

@@ -1,45 +0,0 @@
-From 2c87c998801c6ad3259a468ed815f72b2a11e508 Mon Sep 17 00:00:00 2001
-From: Javier Pena <jpena@redhat.com>
-Date: Thu, 1 Oct 2020 10:59:41 +0200
-Subject: [PATCH] Skip tests failing in Python 3.9
-
-Two monkeypatch-related tests are failing in Python 3.9 [1]. While
-the cause for the error is figured out, let's skip those two tests
-if running in Python 3.9.
-
-[1] - https://github.com/testing-cabal/fixtures/issues/44
----
- fixtures/tests/_fixtures/test_monkeypatch.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
-index 6f11fab..8e89b7a 100644
---- a/fixtures/tests/_fixtures/test_monkeypatch.py
-+++ b/fixtures/tests/_fixtures/test_monkeypatch.py
-@@ -14,6 +14,7 @@
- # limitations under that license.
- 
- import functools
-+import sys
- 
- import testtools
- from testtools.matchers import Is
-@@ -181,6 +182,7 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
-         self._check_restored_static_or_class_method(oldmethod, oldmethod_inst,
-                 C, 'foo_cls')
- 
-+    @testtools.skipIf(sys.version_info > (3, 8), "Fails with Python 3.9")
-     def test_patch_classmethod_with_classmethod(self):
-         oldmethod = C.foo_cls
-         oldmethod_inst = C().foo_cls
-@@ -212,6 +214,7 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
-         self._check_restored_static_or_class_method(oldmethod, oldmethod_inst,
-                 C, 'foo_cls')
- 
-+    @testtools.skipIf(sys.version_info > (3, 8), "Fails with Python 3.9")
-     def test_patch_classmethod_with_boundmethod(self):
-         oldmethod = C.foo_cls
-         oldmethod_inst = C().foo_cls
--- 
-2.26.2
-

python-fixtures.spec

@@ -1,18 +1,28 @@
 Name:           python-fixtures
 Version:        3.0.0
-Release:        16
+Release:        12
 Summary:        A python contract for writing reusable state / support logic tests
 License:        ASL 2.0 or BSD
 URL:            https://launchpad.net/python-fixtures
-Source0:        https://pypi.python.org/packages/source/f/fixtures/fixtures-%{version}.tar.gz
-Patch0001:      0001-Skip-tests-failing-in-Python-3.9.patch
+Source0:        http://pypi.python.org/packages/source/f/fixtures/fixtures-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  python2-devel python2-pbr >= 0.11 python2-mock python2-testtools >= 0.9.22
 
 %description
 Fixtures is a python contract that provides reusable state / support logic
 for unit testing. It includes some helper and adaptation logic to write your
 own fixtures using the fixtures contract.
 
+%package -n python2-fixtures
+Summary:        A python2 contract for reusable state / support logic
+Requires:       python2-testtools >= 0.9.22 python2-six
+%{?python_provide:%python_provide python2-fixtures}
+
+%description -n python2-fixtures
+Fixtures is a python2 contract that provides reusable state / support logic
+for unit testing. It includes some helper and adaptation logic to write your
+own fixtures using the fixtures contract.
+
 %package -n python3-fixtures
 Summary:        A python3 contract for reusable state / support logic
 BuildArch:      noarch
@@ -26,34 +36,27 @@ for unit testing. It includes some helper and adaptation logic to write your
 own fixtures using the fixtures contract.
 
 %prep
-%autosetup -n fixtures-%{version} -p1
-
+%autosetup -n fixtures-%{version}
 %build
+%py2_build
 %py3_build
-
 %install
+%py2_install
 %py3_install
-
 %check
+%{__python2} -m testtools.run fixtures.test_suite
 %{__python3} -m testtools.run fixtures.test_suite
 
+%files -n python2-fixtures
+%doc README GOALS NEWS Apache-2.0 BSD COPYING
+%{python2_sitelib}/fixtures
+%{python2_sitelib}/fixtures-%{version}-py?.?.egg-info
+
 %files -n python3-fixtures
 %doc README GOALS NEWS Apache-2.0 BSD COPYING
 %{python3_sitelib}/fixtures
 %{python3_sitelib}/fixtures-%{version}-py?.?.egg-info
 
 %changelog
-* Sat Dec 24 2022 wanglimin <wanglimin@xfusion.com> - 3.0.0-16
-- Fix date error
-
-* Mon Jan 10 2022 xigaoxinyan <xigaoxinyan@huawei.com> - 3.0.0-15
-- add patch for Skip tests failing in Python 3.9
-
-* Tue Sep 29 2020 liuweibo <liuweibo10@huawei.com> - 3.0.0-14
-- Fix Source0
-
-* Mon Aug 10 2020 lingsheng <lingsheng@huawei.com> - 3.0.0-13
-- Remove python2-fixtures subpackage
-
 * Mon Nov 25 2019 Ling Yang <lingyang2@huawei.com> - 3.0.0-12
 - Package init

python-fixtures.yaml

@@ -1,4 +0,0 @@
-version_control: pypi
-src_repo: fixtures
-tag_prefix: "^v"
-seperator: "."