diff --git a/pytest-cov-4.1.0.tar.gz b/pytest-cov-4.1.0.tar.gz deleted file mode 100644 index 07815ea..0000000 --- a/pytest-cov-4.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6 -size 63245 diff --git a/pytest-cov-5.0.0.tar.gz b/pytest-cov-5.0.0.tar.gz new file mode 100644 index 0000000..f329bc8 --- /dev/null +++ b/pytest-cov-5.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857 +size 63042 diff --git a/python-pytest-cov.changes b/python-pytest-cov.changes index df6f5fb..1d5dfc3 100644 --- a/python-pytest-cov.changes +++ b/python-pytest-cov.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed May 15 04:22:31 UTC 2024 - Steve Kowalik + +- Switch to pytest macro. +- Add patch support-coverage-75.patch: + * Support changes in coverage 7.5. + +------------------------------------------------------------------- +Mon Mar 25 15:17:56 UTC 2024 - Dirk Müller + +- update to 5.0.0: + * Removed support for xdist rsync (now deprecated). + * Switched docs theme to Furo. + * Various legacy Python cleanup and CI improvements. + Contributed by Christian Clauss and Hugo van Kemenade in + #630, #631, #632 and #633. + * Added a pyproject.toml example in the docs. Contributed by + Dawn James in #626. + * Modernized project's pre-commit hooks to use ruff. Initial + POC contributed by Christian Clauss in #584. + ------------------------------------------------------------------- Thu Jun 1 08:51:00 UTC 2023 - Dirk Müller @@ -75,7 +96,7 @@ Sun Jul 17 20:14:59 UTC 2022 - Ben Greiner Mon Dec 20 01:21:53 UTC 2021 - Steve Kowalik - Add support-coverage-62.patch: - * Support coverage >= 6.2 + * Support coverage >= 6.2 ------------------------------------------------------------------- Wed Nov 10 13:05:15 UTC 2021 - Ondřej Súkup @@ -87,7 +108,7 @@ Wed Nov 10 13:05:15 UTC 2021 - Ondřej Súkup ------------------------------------------------------------------- Tue Sep 14 08:45:47 UTC 2021 - Steve Kowalik -- Inject multibuild to avoid build cycles. +- Inject multibuild to avoid build cycles. ------------------------------------------------------------------- Thu Feb 4 09:58:52 UTC 2021 - Ben Greiner @@ -145,7 +166,7 @@ Wed Jan 15 12:50:24 UTC 2020 - Tomáš Chvátal ------------------------------------------------------------------- Thu Dec 5 04:06:23 UTC 2019 - Steve Kowalik -- Skip 6 test cases that are causing problems with Python 3.8 +- Skip 6 test cases that are causing problems with Python 3.8 ------------------------------------------------------------------- Wed Nov 6 13:25:11 CET 2019 - Matej Cepl @@ -194,7 +215,7 @@ Fri Oct 26 13:25:08 UTC 2018 - Ondřej Súkup * Added a no_cover marker and fixture. * Fixed broken no_cover check when running doctests. * Fixed various issues with path normalization in reports - (when combining coverage data from parallel mode). + (when combining coverage data from parallel mode). * Report generation failures don't raise exceptions anymore. A warning will be logged instead. @@ -237,29 +258,29 @@ Thu Oct 22 13:53:36 UTC 2015 - toddrme2178@gmail.com * Fixed broken handling for --cov-report=annotate. - Update to version 2.1.0 * Added support for coverage 4.0b2. - * Added the --cov-append command line options. + * Added the --cov-append command line options. Contributed by Christian Ledermann in PR#80. - Update to version 2.0.0 * Added --cov-fail-under, akin to the new fail_under option in - coverage-4.0 (automatically activated if there’s a + coverage-4.0 (automatically activated if there’s a [report] fail_under = ... in .coveragerc). - * Changed --cov-report=term to automatically upgrade to - --cov-report=term-missing if there’s + * Changed --cov-report=term to automatically upgrade to + --cov-report=term-missing if there’s [run] show_missing = True in .coveragerc. - * Changed --cov so it can be used with no path argument - (in wich case the source settings from .coveragerc will + * Changed --cov so it can be used with no path argument + (in wich case the source settings from .coveragerc will be used instead). - * Fixed .pth installation to work in all cases + * Fixed .pth installation to work in all cases (install, easy_install, wheels, develop etc). * Fixed .pth uninstallation to work for wheel installs. * Support for coverage 4.0. - * Data file suffixing changed to use coverage’s + * Data file suffixing changed to use coverage’s data_suffix=True option (instead of the custom suffixing). - * Avoid warning about missing coverage data + * Avoid warning about missing coverage data (just like coverage.control.process_startup). - * Fixed a race condition when running with xdist - (all the workers tried to combine the files). - It’s possible that this issue is not present in + * Fixed a race condition when running with xdist + (all the workers tried to combine the files). + It’s possible that this issue is not present in pytest-cov 1.8.X. ------------------------------------------------------------------- diff --git a/python-pytest-cov.spec b/python-pytest-cov.spec index dfbac0a..2968f88 100644 --- a/python-pytest-cov.spec +++ b/python-pytest-cov.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-pytest-cov # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,16 +24,19 @@ %bcond_with test %define psuffix %{nil} %endif -%define skip_python2 1 %{?sle15_python_module_pythons} Name: python-pytest-cov%{psuffix} -Version: 4.1.0 +Version: 5.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#643 +Patch0: support-coverage-75.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} %if %{with test} BuildRequires: %{python_module coverage >= 5.2.1} BuildRequires: %{python_module fields} @@ -61,17 +64,16 @@ through pytest-cov or through coverage's config file. %autosetup -p1 -n pytest-cov-%{version} %build -%python_build +%pyproject_wheel %install %if ! %{with test} -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib}/ %endif %check %if %{with test} -export PYTHONDONTWRITEBYTECODE=1 echo "import site;site.addsitedir(\"$(pwd)/src\")" > tests/sitecustomize.py # 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 @@ -81,7 +83,7 @@ donttest="test_dist_missing_data or test_central_subprocess_change_cwd_with_pyth donttest+=" or test_contexts" # gh#pytest-dev/pytest-cov#565 donttest+=" or test_dist_boxed" -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:$PWD/tests py.test-%{$python_bin_suffix} -v -k "not (${donttest})" +%pytest -v -k "not (${donttest})" %endif %if ! %{with test} @@ -90,7 +92,7 @@ donttest+=" or test_dist_boxed" %doc AUTHORS.rst CHANGELOG.rst README.rst %{python_sitelib}/pytest-cov.pth %{python_sitelib}/pytest_cov -%{python_sitelib}/pytest_cov-%{version}-py%{python_version}.egg-info +%{python_sitelib}/pytest_cov-%{version}.dist-info %endif %changelog diff --git a/support-coverage-75.patch b/support-coverage-75.patch new file mode 100644 index 0000000..adb98c1 --- /dev/null +++ b/support-coverage-75.patch @@ -0,0 +1,29 @@ +From 89bd477d5d176666e2d4f3e38983bb69a055a457 Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +Date: Wed, 15 May 2024 14:08:51 +1000 +Subject: [PATCH] Support Coverage 7.5's HTML report changes + +Coverage 7.5 now writes out two other files when generating a HTML +report -- class_index and function_index. We check explicitly for which +files have been written, so add those two in if coverage is >= 7.5. +--- + tests/test_pytest_cov.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py +index bd9df38..114d34b 100644 +--- a/tests/test_pytest_cov.py ++++ b/tests/test_pytest_cov.py +@@ -292,7 +292,11 @@ def test_term_report_does_not_interact_with_html_output(testdir): + ) + dest_dir = testdir.tmpdir.join(DEST_DIR) + assert dest_dir.check(dir=True) +- assert sorted(dest_dir.visit('**/*.html')) == [dest_dir.join('index.html'), dest_dir.join('test_funcarg_py.html')] ++ expected = [dest_dir.join('index.html'), dest_dir.join('test_funcarg_py.html')] ++ if coverage.version_info >= (7, 5): ++ expected.insert(0, dest_dir.join('function_index.html')) ++ expected.insert(0, dest_dir.join('class_index.html')) ++ assert sorted(dest_dir.visit('**/*.html')) == expected + assert dest_dir.join('index.html').check() + assert result.ret == 0 +