- Switch to pytest macro.

- Add patch support-coverage-75.patch:
  * Support changes in coverage 7.5.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-cov?expand=0&rev=47
This commit is contained in:
Steve Kowalik 2024-05-15 04:23:46 +00:00 committed by Git OBS Bridge
parent 9e9dd6f3a8
commit 5de5a9131c
3 changed files with 39 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 15 04:22:31 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- 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 <dmueller@suse.com>

View File

@ -32,6 +32,8 @@ 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}
@ -72,7 +74,6 @@ through pytest-cov or through coverage's config file.
%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
@ -82,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}

29
support-coverage-75.patch Normal file
View File

@ -0,0 +1,29 @@
From 89bd477d5d176666e2d4f3e38983bb69a055a457 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
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