diff --git a/pytest-cov-3.0.0.tar.gz b/pytest-cov-3.0.0.tar.gz deleted file mode 100644 index 9d3f7eb..0000000 --- a/pytest-cov-3.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470 -size 61440 diff --git a/pytest-cov-4.0.0.tar.gz b/pytest-cov-4.0.0.tar.gz new file mode 100644 index 0000000..2f60ea0 --- /dev/null +++ b/pytest-cov-4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470 +size 62013 diff --git a/python-pytest-cov.changes b/python-pytest-cov.changes index c7c2ef0..b5997fa 100644 --- a/python-pytest-cov.changes +++ b/python-pytest-cov.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Nov 28 09:31:24 UTC 2022 - Daniel Garcia + +- Disable failing tests (test_contexts) that fails because of the new version + of python-coverage, gh#pytest-dev/pytest-cov#570 + +------------------------------------------------------------------- +Fri Nov 25 11:55:18 UTC 2022 - Daniel Garcia + +- Remove support-coverage-62.patch +- Remove support-setuptools60.patch +- Update to 4.0.0: + * --cov-fail-under no longer causes pytest --collect-only to fail Contributed + by Zac Hatfield-Dodds in #511. + * Dropped support for multiprocessing (mostly because issue 82408). This + feature was mostly working but very broken in certain scenarios and made + the test suite very flaky and slow. + * There is builtin multiprocessing support in coverage and you can migrate to + that. All you need is this in your .coveragerc: + + [run] + concurrency = multiprocessing + parallel = true + sigterm = true + + * Fixed deprecation in setup.py by trying to import setuptools before + distutils. Contributed by Ben Greiner in #545. + * Removed undesirable new lines that were displayed while reporting was + disabled. Contributed by Delgan in #540. + * Documentation fixes. Contributed by Andre Brisco in #543 and Colin O'Dell + in #525. + * Added support for LCOV output format via --cov-report=lcov. Only works with + coverage 6.3+. Contributed by Christian Fetzer in #536. + * Modernized pytest hook implementation. Contributed by Bruno Oliveira in + #549 and Ronny Pfannschmidt in #550. + ------------------------------------------------------------------- Sun Jul 17 20:14:59 UTC 2022 - Ben Greiner diff --git a/python-pytest-cov.spec b/python-pytest-cov.spec index ce8dbe8..c0071b0 100644 --- a/python-pytest-cov.spec +++ b/python-pytest-cov.spec @@ -16,7 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %bcond_without test @@ -27,16 +26,12 @@ %endif %define skip_python2 1 Name: python-pytest-cov%{psuffix} -Version: 3.0.0 +Version: 4.0.0 Release: 0 Summary: Pytest plugin for coverage reporting License: MIT URL: https://github.com/pytest-dev/pytest-cov Source: https://files.pythonhosted.org/packages/source/p/pytest-cov/pytest-cov-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#pytest-dev/pytest-cov#509 -Patch0: support-coverage-62.patch -# PATCH-FIX-UPSTREAM gh#pytest-dev/pytest-cov#545 -Patch1: support-setuptools60.patch BuildRequires: %{python_module setuptools} %if %{with test} BuildRequires: %{python_module coverage >= 5.2.1} @@ -76,11 +71,15 @@ through pytest-cov or through coverage's config file. %check %if %{with test} -# test_dist_missing_data - needs internet access -# test_central_subprocess_change_cwd_with_pythonpath - needs pytest cov in venv which is not doable in OBS build export PYTHONDONTWRITEBYTECODE=1 echo "import site;site.addsitedir(\"$(pwd)/src\")" > tests/sitecustomize.py -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:$PWD/tests py.test-%{$python_bin_suffix} -v -k 'not (test_dist_missing_data or test_central_subprocess_change_cwd_with_pythonpath)' +# test_dist_missing_data - needs internet access +# test_central_subprocess_change_cwd_with_pythonpath - needs pytest cov in venv which is not doable in OBS build +donttest="test_dist_missing_data or test_central_subprocess_change_cwd_with_pythonpath" +# Tests broken with the latest version of python-coverage (6.5.0) +# gh#pytest-dev/pytest-cov#570 +donttest+=" or test_contexts" +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:$PWD/tests py.test-%{$python_bin_suffix} -v -k "not (${donttest})" %endif %if ! %{with test} diff --git a/support-coverage-62.patch b/support-coverage-62.patch deleted file mode 100644 index ca8b817..0000000 --- a/support-coverage-62.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pytest-cov-3.0.0/tests/test_pytest_cov.py -=================================================================== ---- pytest-cov-3.0.0.orig/tests/test_pytest_cov.py -+++ pytest-cov-3.0.0/tests/test_pytest_cov.py -@@ -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/support-setuptools60.patch b/support-setuptools60.patch deleted file mode 100644 index 832205c..0000000 --- a/support-setuptools60.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: pytest-cov-3.0.0/setup.py -=================================================================== ---- pytest-cov-3.0.0.orig/setup.py -+++ pytest-cov-3.0.0/setup.py -@@ -1,7 +1,6 @@ - #!/usr/bin/env python - - import re --from distutils.command.build import build - from glob import glob - from itertools import chain - from os.path import basename -@@ -12,6 +11,11 @@ from os.path import splitext - from setuptools import Command - from setuptools import find_packages - from setuptools import setup -+try: -+ # https://setuptools.pypa.io/en/latest/deprecated/distutils-legacy.html -+ from setuptools.command.build import build -+except ImportError: -+ from distutils.command.build import build - from setuptools.command.develop import develop - from setuptools.command.easy_install import easy_install - from setuptools.command.install_lib import install_lib