From 34fba3814c821c2fe5078a1632595a52233eb7b3 Mon Sep 17 00:00:00 2001 From: David Fan Date: Tue, 18 Jun 2024 13:31:50 +0000 Subject: [PATCH] python-pytest-mock package is retired on branch c10s for CS-2275 --- .gitignore | 27 ---- 0001-Update-expected-message.patch | 37 ----- dead.package | 1 + python-pytest-mock.spec | 242 ----------------------------- sources | 1 - 5 files changed, 1 insertion(+), 307 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Update-expected-message.patch create mode 100644 dead.package delete mode 100644 python-pytest-mock.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ccd001f..0000000 --- a/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -/pytest-mock-1.1.zip -/pytest-mock-1.2.zip -/pytest-mock-1.6.0.tar.gz -/pytest-mock-1.6.2.tar.gz -/pytest-mock-1.6.3.tar.gz -/pytest-mock-1.7.0.tar.gz -/pytest-mock-1.7.1.tar.gz -/pytest-mock-1.9.0.tar.gz -/pytest-mock-1.10.0.tar.gz -/pytest-mock-1.10.1.tar.gz -/pytest-mock-1.10.2.tar.gz -/pytest-mock-1.10.3.tar.gz -/pytest-mock-1.10.4.tar.gz -/pytest-mock-3.2.0.tar.gz -/pytest-mock-3.3.0.tar.gz -/pytest-mock-3.3.1.tar.gz -/pytest-mock-3.4.0.tar.gz -/pytest-mock-3.5.0.tar.gz -/pytest-mock-3.5.1.tar.gz -/pytest-mock-3.6.1.tar.gz -/pytest-mock-3.7.0.tar.gz -/pytest-mock-3.8.1.tar.gz -/pytest-mock-3.8.2.tar.gz -/pytest-mock-3.9.0.tar.gz -/pytest-mock-3.10.0.tar.gz -/pytest-mock-3.11.1.tar.gz -/pytest-mock-3.12.0.tar.gz diff --git a/0001-Update-expected-message.patch b/0001-Update-expected-message.patch deleted file mode 100644 index af27b8c..0000000 --- a/0001-Update-expected-message.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6da5b0506d6378a8dbe5ae314d5134e6868aeabd Mon Sep 17 00:00:00 2001 -From: danigm -Date: Wed, 20 Dec 2023 16:02:13 +0100 -Subject: [PATCH] Update expected message to match python 3.11.7 (#404) - -https://github.com/python/cpython/issues/111019 - -Fixes #401. -Closes #403. ---- - tests/test_pytest_mock.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py -index c185f2a..01534a4 100644 ---- a/tests/test_pytest_mock.py -+++ b/tests/test_pytest_mock.py -@@ -25,6 +25,8 @@ - - # Python 3.8 changed the output formatting (bpo-35500), which has been ported to mock 3.0 - NEW_FORMATTING = sys.version_info >= (3, 8) -+# Python 3.11.7 changed the output formatting, https://github.com/python/cpython/issues/111019 -+NEWEST_FORMATTING = sys.version_info >= (3, 11, 7) - - if sys.version_info[:2] >= (3, 8): - from unittest.mock import AsyncMock -@@ -240,7 +242,9 @@ def test_repr_with_name(self, mocker: MockerFixture) -> None: - - def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: - expected_name = kwargs.get("name") or "mock" -- if NEW_FORMATTING: -+ if NEWEST_FORMATTING: -+ msg = "expected call not found.\nExpected: {0}()\n Actual: not called." -+ elif NEW_FORMATTING: - msg = "expected call not found.\nExpected: {0}()\nActual: not called." - else: - msg = "Expected call: {0}()\nNot called" diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..79f3e24 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +python-pytest-mock package is retired on branch c10s for CS-2275 \ No newline at end of file diff --git a/python-pytest-mock.spec b/python-pytest-mock.spec deleted file mode 100644 index c131e3f..0000000 --- a/python-pytest-mock.spec +++ /dev/null @@ -1,242 +0,0 @@ -%global pypi_name pytest-mock -%global file_name pytest_mock - -Name: python-%{pypi_name} -Version: 3.12.0 -Release: 4%{?dist} -Summary: Thin-wrapper around the mock package for easier use with py.test - -License: MIT -URL: https://github.com/pytest-dev/pytest-mock/ -Source0: %{pypi_source} -# https://github.com/pytest-dev/pytest-mock/pull/404 -Patch0: 0001-Update-expected-message.patch - -BuildArch: noarch - -%description -This plugin installs a mocker fixture which is a thin-wrapper around the -patching API provided by the mock package, but with the benefit of not having -to worry about undoing patches at the end of a test. - -%package -n python3-%{pypi_name} -Summary: %{summary} - -BuildRequires: python3-devel -BuildRequires: %py3_dist setuptools -BuildRequires: %py3_dist pytest -BuildRequires: %py3_dist setuptools_scm -%if %{undefined rhel} -BuildRequires: %py3_dist pytest-asyncio -%endif -%{?python_provide:%python_provide python3-%{pypi_name}} - -%description -n python3-%{pypi_name} -This plugin installs a mocker fixture which is a thin-wrapper around the -patching API provided by the mock package, but with the benefit of not having -to worry about undoing patches at the end of a test. - -%prep -%autosetup -n %{pypi_name}-%{version} -p1 -rm -rf *.egg-info -# Correct end of line encoding for README -sed -i 's/\r$//' README.rst - -%build -%py3_build - -%install -%py3_install - -%check -%pytest -v tests \ - -k "not test_standalone_mock and not test_detailed_introspection and not test_detailed_introspection \ - and not test_assert_called_args_with_introspection and not test_assert_called_kwargs_with_introspection \ - and not test_plain_stopall and not test_used_with_class_scope and not est_used_with_module_scope \ - and not test_used_with_package_scope and not test_used_with_session_scope \ - %{?rhel:and not test_instance_async_method_spy}" - -%files -n python3-%{pypi_name} -%doc CHANGELOG.rst README.rst -%license LICENSE -%{python3_sitelib}/%{file_name}/ -%{python3_sitelib}/%{file_name}-%{version}-py%{python3_version}.egg-info/ - -%changelog -* Thu Feb 08 2024 Julien Enselme - 3.12.0-4 -- Bump version after adding patch to fix tests. - -* Fri Jan 26 2024 Fedora Release Engineering - 3.12.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 3.12.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Oct 21 2023 Julien Enselme - 3.12.0-1 -- Update to 3.12.0 - -* Fri Jul 21 2023 Fedora Release Engineering - 3.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 04 2023 Python Maint - 3.11.1-2 -- Rebuilt for Python 3.12 - -* Tue Jul 04 2023 Julien Enselme - 3.11.1 -- Update to 3.11.1 - -* Tue Jun 13 2023 Python Maint - 3.10.0-3 -- Rebuilt for Python 3.12 - -* Fri Jan 20 2023 Fedora Release Engineering - 3.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Nov 01 2022 Lumír Balhar - 3.10.0-1 -- Update to 3.10.0 -Resolves: rhbz#2132453 - -* Wed Sep 28 2022 Fabian Affolter - 3.9.0-1 -- Update to latest upstream release 3.9.0 (closes rhbz#2130519) - -* Fri Jul 22 2022 Fedora Release Engineering - 3.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 06 2022 Julien Enselme - 3.8.2-1 -- Update to 3.8.2 - -* Wed Jun 29 2022 Julien Enselme - 3.8.1-1 -- Update to 3.8.1 - -* Mon Jun 13 2022 Python Maint - 3.7.0-2 -- Rebuilt for Python 3.11 - -* Wed Feb 23 2022 Fabian Affolter - 3.7.0-1 -- Update to latest upstream release 3.7.0 (closes rhbz#2047739) - -* Fri Jan 21 2022 Fedora Release Engineering - 3.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Jul 26 2021 Carl George - 3.6.1-1 -- Latest upstream -- Resolves: rhbz#1953232 - -* Fri Jul 23 2021 Fedora Release Engineering - 3.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 03 2021 Python Maint - 3.5.1-3 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 11 2021 Fabian Affolter - 3.5.1-1 -- Update to new upstream release 3.5.1 (#1912592) - -* Tue Jan 05 2021 Fabian Affolter - 3.5.0-1 -- Update to new upstream release 3.5.0 (#1912592) - -* Wed Dec 16 2020 Fabian Affolter - 3.4.0-1 -- Update macros -- Update to new upstream release 3.4.0 (#1907878) - -* Fri Aug 21 2020 Fabian Affolter - 3.3.0-1 -- Update to latest upstream release 3.3.0 (rhbz#1871290) - -* Fri Aug 21 2020 Fabian Affolter - 3.2.0-1 -- Update to latest upstream release 3.2.0 (rhbz#1756646) - -* Wed Jul 29 2020 Fedora Release Engineering - 1.10.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri May 29 2020 Miro Hrončok - 1.10.4-9 -- Drop manual requires on python3-pytest to support usage with pytest4 compat package - -* Sun May 24 2020 Miro Hrončok - 1.10.4-8 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.10.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Oct 01 2019 Miro Hrončok - 1.10.4-6 -- Subpackage python2-pytest-mock has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Sat Aug 17 2019 Miro Hrončok - 1.10.4-5 -- Rebuilt for Python 3.8 - -* Thu Aug 01 2019 Julien Enselme - 1.10.4-4 -- Fix build issues with python 3.8 and mock 3.0 - -* Tue Jul 30 2019 Julien Enselme - 1.10.4-3 -- Fix build issues with pytest 4.6.3 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.10.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jul 13 2019 Julien Enselme - 1.10.4-1 -- Update to 1.10.4 - -* Thu Apr 04 2019 Miro Hrončok - 1.10.3-1 -- Update to 1.10.3 - -* Sat Feb 23 2019 Julien Enselme - 1.10.1-1 -- Update to 1.10.1 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.10.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 18 2018 Miro Hrončok - 1.10.0-2 -- Rebuilt for Python 3.7 - -* Mon May 07 2018 Julien Enselme - 1.10.0-1 -- Update to 1.10.0 - -* Sun Apr 15 2018 Julien Enselme - 1.9.0-1 -- Update to 1.9.0 - -* Thu Mar 01 2018 Julien Enselme - 1.7.1-1 -- Update to 1.7.1 - -* Mon Feb 19 2018 Julien Enselme - 1.7.0-1 -- Update to 1.7.0 - -* Fri Feb 09 2018 Fedora Release Engineering - 1.6.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Sep 16 2017 Julien Enselme - 1.6.3-1 -- Update to 1.6.3 - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jul 23 2017 Julien Enselme - 1.6.2-1 -- Update to 1.6.2 - -* Wed Apr 05 2017 Julien Enselme - 1.6.0-2 -- Add missing BR - -* Wed Apr 05 2017 Julien Enselme - 1.6.0-1 -- Update to 1.6.0 - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.2-3 -- Rebuild for Python 3.6 - -* Sat Oct 01 2016 Julien Enselme - 1.2-2 -- Add patch to fix tests with pytest3 - -* Sun Sep 18 2016 Julien Enselme - 1.2-1 -- Update to 1.2 - -* Wed Aug 31 2016 Julien Enselme - 1.1-3 -- Use %%summary instead of custom %%sum macro - -* Mon Aug 29 2016 Julien Enselme - 1.1-2 -- Add python2-mock to BR so %%check passes correctly. - -* Tue Jul 26 2016 Julien Enselme - 1.1-1 -- Inital package diff --git a/sources b/sources deleted file mode 100644 index 9a226cb..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (pytest-mock-3.12.0.tar.gz) = 6da429e646a4e3a825f699969dbc87033136918bd9aa111ff334fac324e5ac89ef6516e82ffeeb20cb6a857fbbe904d8ee985acefba2d2b7bd0ffe4b9227ad82