From d9e970930b3b9fc1ec383cf01b6a2c5b7f408421 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 28 Dec 2024 15:05:12 +0300 Subject: [PATCH] import python-pytest-cov-4.0.0-13.el10 --- .gitignore | 20 +- .python-pytest-cov.metadata | 1 + SOURCES/0001_disabling_boxed_xdist_test.patch | 14 ++ SOURCES/python-pytest-cov-coverage-6.5.patch | 12 + SPECS/python-pytest-cov.spec | 231 ++++++++++++++++++ pytest-cov-3.0.0-coverage-6.2.patch | 12 - python-pytest-cov.spec | 81 ------ sources | 1 - 8 files changed, 259 insertions(+), 113 deletions(-) create mode 100644 .python-pytest-cov.metadata create mode 100644 SOURCES/0001_disabling_boxed_xdist_test.patch create mode 100644 SOURCES/python-pytest-cov-coverage-6.5.patch create mode 100644 SPECS/python-pytest-cov.spec delete mode 100644 pytest-cov-3.0.0-coverage-6.2.patch delete mode 100644 python-pytest-cov.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore index b783849..b2f1882 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1 @@ -/pytest-cov-1.6.tar.gz -/pytest-cov-2.1.0.tar.gz -/pytest-cov-2.2.0.tar.gz -/pytest-cov-2.2.1.tar.gz -/pytest-cov-2.3.0.tar.gz -/pytest-cov-2.4.0.tar.gz -/pytest-cov-2.5.0.tar.gz -/pytest-cov-2.5.1.tar.gz -/pytest-cov-2.6.0.tar.gz -/pytest-cov-2.6.1.tar.gz -/pytest-cov-2.7.1.tar.gz -/pytest-cov-2.8.0.tar.gz -/pytest-cov-2.8.1.tar.gz -/pytest-cov-2.10.0.tar.gz -/pytest-cov-2.10.1.tar.gz -/pytest-cov-2.11.1.tar.gz -/pytest-cov-2.12.1.tar.gz -/pytest-cov-3.0.0.tar.gz -/pytest-cov-4.0.0.tar.gz +SOURCES/pytest-cov-4.0.0.tar.gz diff --git a/.python-pytest-cov.metadata b/.python-pytest-cov.metadata new file mode 100644 index 0000000..47240e3 --- /dev/null +++ b/.python-pytest-cov.metadata @@ -0,0 +1 @@ +e077203b376dc922fd5dfd0da79cd68304624b16 SOURCES/pytest-cov-4.0.0.tar.gz diff --git a/SOURCES/0001_disabling_boxed_xdist_test.patch b/SOURCES/0001_disabling_boxed_xdist_test.patch new file mode 100644 index 0000000..e8903d3 --- /dev/null +++ b/SOURCES/0001_disabling_boxed_xdist_test.patch @@ -0,0 +1,14 @@ +--- a/tests/test_pytest_cov.py 2022-11-11 21:00:59.063033789 +0100 ++++ b/tests/test_pytest_cov.py 2022-11-11 21:22:22.097947660 +0100 +@@ -1554,8 +1554,9 @@ + ''' + + SCRIPT_SIMPLE_RESULT = '4 * 100%' +- +- ++ ++@pytest.mark.skipif('tuple(map(int, xdist.__version__.split("."))) >= (2, 5, 0)', ++ reason="--boxed option was removed in version 2.5.0") + @pytest.mark.skipif('sys.platform == "win32"') + def test_dist_boxed(testdir): + script = testdir.makepyfile(SCRIPT_SIMPLE) diff --git a/SOURCES/python-pytest-cov-coverage-6.5.patch b/SOURCES/python-pytest-cov-coverage-6.5.patch new file mode 100644 index 0000000..6c5aef4 --- /dev/null +++ b/SOURCES/python-pytest-cov-coverage-6.5.patch @@ -0,0 +1,12 @@ +diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py +index 23153ee..5fc0ea1 100644 +--- a/tests/test_pytest_cov.py ++++ b/tests/test_pytest_cov.py +@@ -1917,6 +1917,7 @@ EXPECTED_CONTEXTS = { + + + @pytest.mark.skipif("coverage.version_info < (5, 0)") ++@pytest.mark.skipif("coverage.version_info > (6, 4)") + @xdist_params + def test_contexts(pytester, testdir, opts): + with open(os.path.join(os.path.dirname(__file__), "contextful.py")) as f: diff --git a/SPECS/python-pytest-cov.spec b/SPECS/python-pytest-cov.spec new file mode 100644 index 0000000..ed47cc2 --- /dev/null +++ b/SPECS/python-pytest-cov.spec @@ -0,0 +1,231 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 13; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%global srcname pytest-cov +%global slugname pytest_cov +%global forgeurl https://github.com/pytest-dev/%{srcname} + +%global common_description %{expand: +This plugin produces coverage reports. Compared to just using coverage run this +plugin does some extras: + + • Subprocess support: you can fork or run stuff in a subprocess and will get + covered without any fuss. + • Xdist support: you can use all of pytest-xdist’s features and still get + coverage. + • Consistent pytest behavior. If you run coverage run -m pytest you will have + slightly different sys.path (CWD will be in it, unlike when running + pytest). + +All features offered by the coverage package should work, either through +pytest-cov’s command line options or through coverage’s config file. +} + +# During python mass rebuild we need to build python-pytest-cov without +# tests because some dependencies are not yet available +%bcond_without tests + +Name: python-%{srcname} +Version: 4.0.0 +%forgemeta +Release: %autorelease +Summary: Coverage plugin for pytest +License: MIT +URL: %{forgeurl} +Source: %{forgesource} +Patch: 0001_disabling_boxed_xdist_test.patch +# Fix test with coverage >= 6.5 +# Based on https://github.com/pytest-dev/pytest-cov/commit/d9789afd5916176a38cc2acebbaadee805064e22 +Patch: python-pytest-cov-coverage-6.5.patch +BuildArch: noarch +BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros + +%description %{common_description} + +%package -n python3-%{srcname} +Summary: %{summary} +%description -n python3-%{srcname} %{common_description} + +%prep +%forgeautosetup -p1 +# The “hunter” testing dependency (https://github.com/ionelmc/python-hunter) is +# not packaged, but it also does not seem to be used. +sed -r -i '/^[[:blank:]]*.hunter.,[[:blank:]]*$/d' setup.py + +%generate_buildrequires +%pyproject_buildrequires -r %{?with_tests:-x testing} + +%build +%pyproject_wheel + +%install +%pyproject_install +%pyproject_save_files %{slugname} + +%if %{with tests} +%check +k="$(awk 'NR>1 {pre=" and " } { printf "%snot %s", pre, $0 }' < - 4.0.0-13 +- Rebuilt for MSVSphere 10 + +## START: Generated by rpmautospec +* Fri Jul 19 2024 Fedora Release Engineering - 4.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 4.0.0-12 +- Rebuilt for Python 3.13 + +* Fri Jun 07 2024 Python Maint - 4.0.0-11 +- Bootstrap for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 4.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 4.0.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 4.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Python Maint - 4.0.0-7 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 4.0.0-6 +- Bootstrap for Python 3.12 + +* Fri May 05 2023 Orion Poplawski - 4.0.0-5 +- Drop -S git + +* Fri May 05 2023 Orion Poplawski - 4.0.0-4 +- Add upstream patch to skip failing test with coverage > 6.4 (Fixes FTBFS + bz#2171685) + +* Fri Jan 20 2023 Fedora Release Engineering - 4.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Nov 11 2022 chedi toueiti - 4.0.0-2 +- fixing a pytest-xdist failing test due to the deprecation of the boxed + parameter (#2142008) + +* Thu Sep 29 2022 chedi toueiti - 4.0.0-1 +- Update to version 4.0.0 (#2130722) + +* Fri Jul 22 2022 Fedora Release Engineering - 3.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 chedi toueiti - 3.0.0-10 +- minor formating update + +* Tue Jun 14 2022 Python Maint - 3.0.0-9 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 3.0.0-8 +- Bootstrap for Python 3.11 + +* Wed May 25 2022 Orion Poplawski - 3.0.0-7 +- Re-enable tests + +* Thu May 19 2022 Tomáš Hrnčiar - 3.0.0-6 +- Add bcond to disable tests + +* Fri Jan 21 2022 Fedora Release Engineering - 3.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 09 2021 Tom spot Callaway - 3.0.0-4 +- Fix issue with test code where it expected too specific of a string, that + string changed slightly with coverage 6.2, fix adjusts string check to be + more permissive and work with both old and new coverage + +* Wed Dec 08 2021 chedi - 3.0.0-3 +- bumping release to force f36 rebuild + +* Wed Oct 13 2021 chedi - 3.0.0-2 +- reverting to auto generated dependencies + +* Mon Oct 04 2021 chedi - 3.0.0-1 +- Update to version 3.0.0 (#2010140) + +* Mon Aug 02 2021 Benjamin A. Beasley - 2.12.1-1 +- Update to 2.12.1 (closes RHBZ#1960609) + +* Wed Jul 28 2021 Benjamin A. Beasley - 2.11.1-6 +- Drop obsolete macros +- Update description and summary from upstream +- Use “forge” macros to reference source +- Use pyproject-rpm-macros + +* Fri Jul 23 2021 Fedora Release Engineering - 2.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 02 2021 Python Maint - 2.11.1-4 +- Rebuilt for Python 3.10 + +* Fri Jan 29 2021 Chedi Toueiti - 2.11.1-3 +- Fix for failing tests with coverage 5.4 (#1922301) + +* Wed Jan 27 2021 Fedora Release Engineering - 2.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Chedi Toueiti - 2.11.1-1 +- Update to 2.11.1 (#1917248) + +* Fri Aug 14 2020 Chedi Toueiti - 2.10.1-1 +- Update to 2.10.1 (#1868968) + +* Wed Jul 29 2020 Fedora Release Engineering - 2.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 9 2020 Chedi Toueiti - 2.10.0 +- Update to 2.10.0 + +* Sun May 24 2020 Miro Hrončok - 2.8.1-6 +- Rebuilt for Python 3.9 + +* Mon Mar 2 2020 Chedi Toueiti - 2.8.1-5 +- Forcing current pytest-cov version usage during checks + +* Thu Jan 30 2020 Fedora Release Engineering - 2.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 19 2020 Lumír Balhar - 2.8.1-3 +- Unskip tests which are working with the newest coverage + +* Sun Nov 3 2019 Orion Poplawski - 2.8.1-2 +- Drop python 2 for F32+ (bz#1767517) + +* Sat Oct 5 2019 Orion Poplawski - 2.8.1-1 +- Update to 2.8.1 + +* Fri Oct 4 2019 Orion Poplawski - 2.8.0-1 +- Update to 2.8.0 + +* Thu Oct 03 2019 Miro Hrončok - 2.7.1-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +## END: Generated by rpmautospec diff --git a/pytest-cov-3.0.0-coverage-6.2.patch b/pytest-cov-3.0.0-coverage-6.2.patch deleted file mode 100644 index c7c1a55..0000000 --- a/pytest-cov-3.0.0-coverage-6.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up pytest-cov-3.0.0/tests/test_pytest_cov.py.cov62 pytest-cov-3.0.0/tests/test_pytest_cov.py ---- pytest-cov-3.0.0/tests/test_pytest_cov.py.cov62 2021-12-09 13:54:38.736407865 -0500 -+++ pytest-cov-3.0.0/tests/test_pytest_cov.py 2021-12-09 13:54:41.432423997 -0500 -@@ -968,7 +968,7 @@ def test_invalid_coverage_source(testdir - '*10 passed*' - ]) - result.stderr.fnmatch_lines([ -- 'Coverage.py warning: No data was collected.*' -+ '*No data was collected.*' - ]) - result.stdout.fnmatch_lines([ - '*Failed to generate report: No data to report.', diff --git a/python-pytest-cov.spec b/python-pytest-cov.spec deleted file mode 100644 index eee196c..0000000 --- a/python-pytest-cov.spec +++ /dev/null @@ -1,81 +0,0 @@ -%global srcname pytest-cov -%global slugname pytest_cov -%global forgeurl https://github.com/pytest-dev/%{srcname} - -%global common_description %{expand: -This plugin produces coverage reports. Compared to just using coverage run this -plugin does some extras: - - • Subprocess support: you can fork or run stuff in a subprocess and will get - covered without any fuss. - • Xdist support: you can use all of pytest-xdist’s features and still get - coverage. - • Consistent pytest behavior. If you run coverage run -m pytest you will have - slightly different sys.path (CWD will be in it, unlike when running - pytest). - -All features offered by the coverage package should work, either through -pytest-cov’s command line options or through coverage’s config file. -} - -# During python mass rebuild we need to build python-pytest-cov without -# tests because some dependencies are not yet available -%bcond_without tests - -Name: python-%{srcname} -Version: 4.0.0 -%forgemeta -Release: %autorelease -Summary: Coverage plugin for pytest -License: MIT -URL: %{forgeurl} -Source: %{forgesource} -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: pyproject-rpm-macros - -%description %{common_description} - -%package -n python3-%{srcname} -Summary: %{summary} -%description -n python3-%{srcname} %{common_description} - -%prep -%forgeautosetup -p1 -# The “hunter” testing dependency (https://github.com/ionelmc/python-hunter) is -# not packaged, but it also does not seem to be used. -sed -r -i '/^[[:blank:]]*.hunter.,[[:blank:]]*$/d' setup.py - -%generate_buildrequires -%pyproject_buildrequires -r %{?with_tests:-x testing} - -%build -%pyproject_wheel - -%install -%pyproject_install -%pyproject_save_files %{slugname} - - -%if %{with tests} -%check -k="$(awk 'NR>1 {pre=" and " } { printf "%snot %s", pre, $0 }' <