From 71cea77ef434670b03cee4c3513d7044c54fb115 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 4 Jan 2025 17:17:51 +0300 Subject: [PATCH] import python-zope-testing-5.0.1-7.el10 --- .gitignore | 2 +- .python-zope-testing.metadata | 2 +- ...Fix-doctest-failure-with-Python-3.11.patch | 39 ++++++ SPECS/python-zope-testing.spec | 131 ++++++++++-------- 4 files changed, 117 insertions(+), 57 deletions(-) create mode 100644 SOURCES/0001-Fix-doctest-failure-with-Python-3.11.patch diff --git a/.gitignore b/.gitignore index 447d1ae..66caa18 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zope.testing-4.6.1.tar.gz +SOURCES/zope.testing-5.0.1.tar.gz diff --git a/.python-zope-testing.metadata b/.python-zope-testing.metadata index 0dbc56e..80c6618 100644 --- a/.python-zope-testing.metadata +++ b/.python-zope-testing.metadata @@ -1 +1 @@ -7a7516db8cd9c21eeca428ecb099aa6d455a099b SOURCES/zope.testing-4.6.1.tar.gz +b23b6edce697ef708d297bf2dceedd01730ee8ab SOURCES/zope.testing-5.0.1.tar.gz diff --git a/SOURCES/0001-Fix-doctest-failure-with-Python-3.11.patch b/SOURCES/0001-Fix-doctest-failure-with-Python-3.11.patch new file mode 100644 index 0000000..4039701 --- /dev/null +++ b/SOURCES/0001-Fix-doctest-failure-with-Python-3.11.patch @@ -0,0 +1,39 @@ +diff --git a/src/zope/testing/doctestcase.txt b/src/zope/testing/doctestcase.txt +index a8c673b..82c24d6 100644 +--- a/src/zope/testing/doctestcase.txt ++++ b/src/zope/testing/doctestcase.txt +@@ -87,15 +87,15 @@ Here are some examples:: + >>> sys.stdout.writeln = lambda s: sys.stdout.write(s+'\n') + >>> suite = loader.loadTestsFromTestCase(MyTest) + >>> result = suite.run(unittest.TextTestResult(sys.stdout, True, 3)) +- test1 (tests.MyTest) ... ok +- test2 (tests.MyTest) ... ok +- test3 (tests.MyTest) ... ok +- test4 (tests.MyTest) ... ok ++ test1 (tests.MyTest.test1) ... ok ++ test2 (tests.MyTest.test2) ... ok ++ test3 (tests.MyTest.test3) ... ok ++ test4 (tests.MyTest.test4) ... ok + + >>> suite = loader.loadTestsFromTestCase(MoreTests) + >>> result = suite.run(unittest.TextTestResult(sys.stdout, True, 3)) +- test_loggingsupport (tests.MoreTests) ... ok +- test_renormalizing (tests.MoreTests) ... ok ++ test_loggingsupport (tests.MoreTests.test_loggingsupport) ... ok ++ test_renormalizing (tests.MoreTests.test_renormalizing) ... ok + + >>> for _, e in result.errors: + ... print(e); print +@@ -320,9 +320,9 @@ whereas the unittest and py.test test runners use class dictionary keys. + + >>> suite = loader.loadTestsFromTestCase(MyTest) + >>> result = suite.run(unittest.TextTestResult(sys.stdout, True, 2)) +- test2 (tests.MyTest) ... ok +- test3 (tests.MyTest) ... ok +- test4 (tests.MyTest) ... ok ++ test2 (tests.MyTest.test2) ... ok ++ test3 (tests.MyTest.test3) ... ok ++ test4 (tests.MyTest.test4) ... ok + + .. test __name__ variations + diff --git a/SPECS/python-zope-testing.spec b/SPECS/python-zope-testing.spec index 4be98eb..8a720e5 100644 --- a/SPECS/python-zope-testing.spec +++ b/SPECS/python-zope-testing.spec @@ -1,20 +1,15 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - %global modname zope.testing -%bcond_without python3 Name: python-zope-testing -Version: 4.6.1 -Release: 8%{?dist} +Version: 5.0.1 +Release: 7%{?dist} Summary: Zope Testing Framework -License: ZPLv2.1 +License: ZPL-2.1 URL: https://pypi.io/project/%{modname} Source0: https://pypi.io/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz +# Upstream report: https://github.com/zopefoundation/zope.testing/issues/41 +Patch: 0001-Fix-doctest-failure-with-Python-3.11.patch BuildArch: noarch @@ -23,84 +18,110 @@ This package provides a number of testing frameworks. It includes a flexible test runner, and supports both doctest and unittest. -%package -n python2-zope-testing -Summary: Zope Testing Framework -%{?python_provide:%python_provide python2-zope-testing} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-zope-exceptions -BuildRequires: python2-zope-interface -Requires: python2-zope-exceptions -Requires: python2-zope-interface - -%description -n python2-zope-testing -This package provides a number of testing frameworks. It includes a -flexible test runner, and supports both doctest and unittest. - -%if %{with python3} %package -n python%{python3_pkgversion}-zope-testing Summary: Zope Testing Framework %{?python_provide:%python_provide python%{python3_pkgversion}-zope-testing} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-zope-exceptions -BuildRequires: python%{python3_pkgversion}-zope-interface -Requires: python%{python3_pkgversion}-zope-exceptions -Requires: python%{python3_pkgversion}-zope-interface %description -n python%{python3_pkgversion}-zope-testing This package provides a number of testing frameworks. It includes a flexible test runner, and supports both doctest and unittest. -%endif %prep -%setup -q -n %{modname}-%{version} +%autosetup -p1 -n %{modname}-%{version} rm -rf %{modname}.egg-info %build -%{py2_build} -%if %{with python3} %{py3_build} -%endif %install -%{py2_install} -# __init__.py* are not needed since .pth file is used -rm -f %{buildroot}%{python2_sitelib}/zope/__init__.py* -%if %{with python3} %{py3_install} # __init__.py* are not needed since .pth file is used rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py* -%endif %check -%{__python2} setup.py test -%if %{with python3} %{__python3} setup.py test -%endif -%files -n python2-zope-testing -%doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt -%{python2_sitelib}/zope/testing/ -%exclude %{python2_sitelib}/zope/testing/*.txt -%{python2_sitelib}/%{modname}-*.egg-info -%{python2_sitelib}/%{modname}-*-nspkg.pth - -%if %{with python3} %files -n python%{python3_pkgversion}-zope-testing -%doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt +%doc CHANGES.rst README.rst src/zope/testing/*.txt +%license COPYRIGHT.txt LICENSE.txt %{python3_sitelib}/zope/testing/ %exclude %{python3_sitelib}/zope/testing/*.txt %{python3_sitelib}/%{modname}-*.egg-info %{python3_sitelib}/%{modname}-*-nspkg.pth -%endif %changelog -* Wed Jan 24 2024 Sergey Cherevko - 4.6.1-8 -- Rebuilt for MSVSphere 8.9 +* Sat Jan 04 2025 Arkady L. Shane - 5.0.1-7 +- Rebuilt for MSVSphere 10 + +* Sun Apr 14 2024 Miroslav Suchý - 5.0.1-7 +- convert license to SPDX + +* Fri Jan 26 2024 Fedora Release Engineering - 5.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 5.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 5.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 5.0.1-3 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 5.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 29 2022 Dan Radez - 5.0.1-1 +- update to 5.0.1 (rhbz#2155219) + +* Mon Aug 29 2022 Dan Radez - 4.10-1 +- updating to 4.10 (rhbz#1912537) + +* Fri Jul 22 2022 Fedora Release Engineering - 4.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 4.7-8 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 4.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 4.7-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 03 2021 Python Maint - 4.7-5 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 4.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 4.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 4.7-2 +- Rebuilt for Python 3.9 + +* Mon Mar 23 2020 Lumír Balhar - 4.7-1 +- Update to 4.7 (#1460853) +- Removed unnecessary dependencies, fixed license files + +* Thu Jan 30 2020 Fedora Release Engineering - 4.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Sep 20 2019 Miro Hrončok - 4.6.1-11 +- Subpackage python2-zope-testing has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Fri Aug 16 2019 Miro Hrončok - 4.6.1-10 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 4.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Sat Mar 09 2019 Carl George - 4.6.1-8 - EPEL compatibility