Sync from SUSE:SLFO:1.1 python-pytest-cov revision 99c15f6890f62ff714daace6551275a8

python-pytest-cov.changes

@@ -1,24 +1,3 @@
--------------------------------------------------------------------
-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>
-
-- 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 <dmueller@suse.com>
 

python-pytest-cov.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package python-pytest-cov
+# spec file
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,19 +24,16 @@
 %bcond_with test
 %define psuffix %{nil}
 %endif
+%define skip_python2 1
 %{?sle15_python_module_pythons}
 Name:           python-pytest-cov%{psuffix}
-Version:        5.0.0
+Version:        4.1.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}
@@ -64,16 +61,17 @@ through pytest-cov or through coverage's config file.
 %autosetup -p1 -n pytest-cov-%{version}
 
 %build
-%pyproject_wheel
+%python_build
 
 %install
 %if ! %{with test}
-%pyproject_install
+%python_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
@@ -83,7 +81,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"
-%pytest -v -k "not (${donttest})"
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:$PWD/tests py.test-%{$python_bin_suffix} -v -k "not (${donttest})"
 %endif
 
 %if ! %{with test}
@@ -92,7 +90,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}.dist-info
+%{python_sitelib}/pytest_cov-%{version}-py%{python_version}.egg-info
 %endif
 
 %changelog

support-coverage-75.patch

@@ -1,29 +0,0 @@
-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
-