Upgrade python-testtools and python-fixtures (microsoft#14678)

Author: jykanase

SPECS-EXTENDED/python-fixtures/python-fixtures.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "fixtures-3.0.0.tar.gz": "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"
+  "fixtures-4.0.1.tar.gz": "d2758826400d095b79666cf93a32a84f50ff8cd179831927efb48cd1e3ca7466"
  }
 }

SPECS-EXTENDED/python-fixtures/python-fixtures.spec

@@ -2,76 +2,171 @@ Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 %global pypi_name fixtures
 
+# fixtures has a circular dependency with testtools
+%bcond_with bootstrap
 %bcond_without tests
 
 Name:           python-%{pypi_name}
-Version:        3.0.0
-Release:        18%{?dist}
+Version:        4.0.1
+Release:        11%{?dist}
 Summary:        Fixtures, reusable state for writing clean tests and more
 
-License:        ASL 2.0 or BSD
-URL:            https://launchpad.net/python-fixtures
-Source0:        http://pypi.python.org/packages/source/f/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+License:        Apache-2.0 OR BSD-3-Clause
+URL:            https://github.com/testing-cabal/fixtures
+Source:         https://files.pythonhosted.org/packages/3c/3d/f106b3278ba50067e9cd397f836d33d141aa790853152dbb3512aaee19f3/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  python3-pip
+BuildRequires:  python3dist(wheel)
+BuildRequires:  python3-pbr
 
+%if %{with tests}
+BuildRequires:  python3-tox
+BuildRequires:  python3-pluggy
+BuildRequires:  python3-py 
+BuildRequires:  python3-filelock
+BuildRequires:  python3-toml
+BuildRequires:  python3-six 
+BuildRequires:  python3-colorama
+BuildRequires:  python3-chardet
+BuildRequires:  python3-platformdirs
+BuildRequires:  python3-testtools
+BuildRequires:  python3-tox-current-env
+%endif
 
-%global _description\
-Fixtures defines a Python contract for reusable state / support logic,\
-primarily for unit testing. Helper and adaption logic is included to\
-make it easy to write your own fixtures using the fixtures contract.\
-Glue code is provided that makes using fixtures that meet the Fixtures\
-contract in unit test compatible test cases easy and straight forward.
+%global _description %{expand:
+Fixtures defines a Python contract for reusable state / support logic,
+primarily for unit testing.  Helper and adaption logic is included to make it
+easy to write your own fixtures using the fixtures contract.  Glue code is
+provided that makes using fixtures that meet the Fixtures contract in unittest
+compatible test cases easy and straight forward.}
 
-%description %_description
+%description %{_description}
 
 
-%package -n python3-%{pypi_name}
-Summary:        Fixtures, reusable state for writing clean tests and more
-BuildArch:      noarch
+%package -n python%{python3_pkgversion}-%{pypi_name}
+Summary:        %{summary}
+BuildRequires:  python%{python3_pkgversion}-devel
 
-BuildRequires:  python3-devel
-BuildRequires:  python3-pbr >= 0.11
+%description -n python%{python3_pkgversion}-%{pypi_name} %{_description}
 
-%if %{with tests}
-BuildRequires:  python3-mock
-BuildRequires:  python3-testtools >= 0.9.22
+%if %{without bootstrap}
+%pyproject_extras_subpkg -n python%{python3_pkgversion}-%{pypi_name} streams
 %endif
 
-Requires:       python3-testtools >= 0.9.22
-Requires:       python3-six
-%{?python_provide:%python_provide python3-%{pypi_name}}
 
-%description -n python3-%{pypi_name}
-Fixtures defines a Python contract for reusable state / support logic,
-primarily for unit testing. Helper and adaption logic is included to
-make it easy to write your own fixtures using the fixtures contract.
-Glue code is provided that makes using fixtures that meet the Fixtures
-contract in unit test compatible test cases easy and straight forward.
+%prep
+%autosetup -p1 -n %{pypi_name}-%{version}
 
+# The code supports falling back to the standard library mock, but some tests
+# intentionally only test with the pypi mock.
+sed -e '/mock/d' -i setup.cfg
+sed -e 's/import mock/import unittest.mock as mock/' -i fixtures/tests/_fixtures/test_mockpatch.py
 
-%prep
-%autosetup -n %{pypi_name}-%{version}
+%generate_buildrequires
+%pyproject_buildrequires %{!?with_bootstrap:-t -x streams}
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files %{pypi_name}
 
 %if %{with tests}
+# Note: Tests are executed using the '%tox' macro rather than the direct
+# '%{__python3} -m testtools.run fixtures.test_suite' invocation, for better
+# compatibility with Python build environments.
 %check
-%{__python3} -m testtools.run fixtures.test_suite
-%endif # if with tests
-
+%if %{without bootstrap}
+%tox
+%endif
+%endif
 
-%files -n python3-%{pypi_name}
-%doc README GOALS NEWS Apache-2.0 BSD COPYING
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files}
+%license Apache-2.0 BSD
+%doc README.rst GOALS NEWS
 
 %changelog
-* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 3.0.0-18
-- Initial CBL-Mariner import from Fedora 32 (license: MIT).
+* Thu Feb 20 2025 Akarsh Chaudhary <[email protected]> - 4.0.1-11
+- Initial CBL-Mariner import from Fedora 41 (license: MIT).
+- License verified.
+
+* Fri Jul 19 2024 Fedora Release Engineering <[email protected]> - 4.0.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 07 2024 Python Maint <[email protected]> - 4.0.1-9
+- Rebuilt for Python 3.13
+
+* Fri Jan 26 2024 Fedora Release Engineering <[email protected]> - 4.0.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <[email protected]> - 4.0.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 17 2023 Zane Bitter <[email protected]> - 4.0.1-6
+- Add streams extra
+
+* Fri Jul 21 2023 Fedora Release Engineering <[email protected]> - 4.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 16 2023 Python Maint <[email protected]> - 4.0.1-4
+- Rebuilt for Python 3.12
+
+* Tue Jun 13 2023 Python Maint <[email protected]> - 4.0.1-3
+- Bootstrap for Python 3.12
+
+* Wed Jun 07 2023 Jan Friesse <[email protected]> - 4.0.1-2
+- migrated to SPDX license
+
+* Mon Feb 06 2023 Joel Capitao <[email protected]> - 4.0.1-1
+- Update to latest upstream (#2078479)
+
+* Fri Jan 20 2023 Fedora Release Engineering <[email protected]> - 3.0.0-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <[email protected]> - 3.0.0-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 15 2022 Python Maint <[email protected]> - 3.0.0-30
+- Rebuilt for Python 3.11
+
+* Wed Jun 15 2022 Python Maint <[email protected]> - 3.0.0-29
+- Bootstrap for Python 3.11
+
+* Fri Apr 29 2022 Carl George <[email protected]> - 3.0.0-28
+- Convert to pyproject macros
+
+* Wed Feb 23 2022 Alfredo Moralejo <[email protected]> - 3.0.0-27
+- Added python3-extras as runtime requirement
+
+* Fri Jan 21 2022 Fedora Release Engineering <[email protected]> - 3.0.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <[email protected]> - 3.0.0-25
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 02 2021 Python Maint <[email protected]> - 3.0.0-24
+- Rebuilt for Python 3.10
+
+* Wed Jun 02 2021 Python Maint <[email protected]> - 3.0.0-23
+- Bootstrap for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <[email protected]> - 3.0.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Oct 01 2020 Javier Peña <[email protected]> - 3.0.0-21
+- Skip unit tests failing in Python 3.0 (bz#1787753)
+
+* Sat Aug 01 2020 Fedora Release Engineering <[email protected]> - 3.0.0-20
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <[email protected]> - 3.0.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 22 2020 Miro Hrončok <[email protected]> - 3.0.0-18
+- Bootstrap for Python 3.9
 
 * Thu Jan 30 2020 Fedora Release Engineering <[email protected]> - 3.0.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild