From 048a7222084696961865dab2f327aac36d8619ba Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Wed, 03 Apr 2024 18:38:28 +0200
Subject: [PATCH] python/pytest-cov: update to 5.0.0
---
components/python/pytest-cov/test/results-all.master | 7 ++++---
components/python/pytest-cov/pytest-cov-PYVER.p5m | 13 ++++++-------
components/python/pytest-cov/patches/02-test-PYTHONPATH.patch | 6 +++---
components/python/pytest-cov/patches/01-no-hunter.patch | 8 ++++----
components/python/pytest-cov/manifests/sample-manifest.p5m | 13 ++++++-------
components/python/pytest-cov/Makefile | 10 +++++-----
components/python/pytest-cov/pkg5 | 2 ++
7 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/components/python/pytest-cov/Makefile b/components/python/pytest-cov/Makefile
index a05638b..559133f 100644
--- a/components/python/pytest-cov/Makefile
+++ b/components/python/pytest-cov/Makefile
@@ -14,17 +14,16 @@
# $WS_TOOLS/python-integrate-project pytest-cov
#
-BUILD_STYLE = setup.py
+BUILD_STYLE = pyproject
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = pytest-cov
-HUMAN_VERSION = 4.1.0
-COMPONENT_REVISION = 1
+HUMAN_VERSION = 5.0.0
COMPONENT_SUMMARY = pytest-cov - Pytest plugin for measuring coverage.
COMPONENT_PROJECT_URL = https://github.com/pytest-dev/pytest-cov
COMPONENT_ARCHIVE_HASH = \
- sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6
+ sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
@@ -40,12 +39,13 @@
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/coverage
PYTHON_REQUIRED_PACKAGES += library/python/pytest
+PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/tomli
+PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/coverage
TEST_REQUIRED_PACKAGES.python += library/python/fields
TEST_REQUIRED_PACKAGES.python += library/python/process-tests
TEST_REQUIRED_PACKAGES.python += library/python/pytest
TEST_REQUIRED_PACKAGES.python += library/python/pytest-xdist
-TEST_REQUIRED_PACKAGES.python += library/python/six
TEST_REQUIRED_PACKAGES.python += library/python/virtualenv
diff --git a/components/python/pytest-cov/manifests/sample-manifest.p5m b/components/python/pytest-cov/manifests/sample-manifest.p5m
index bec2f5f..6d380a7 100644
--- a/components/python/pytest-cov/manifests/sample-manifest.p5m
+++ b/components/python/pytest-cov/manifests/sample-manifest.p5m
@@ -24,13 +24,12 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/lib/python$(PYVER)/vendor-packages/pytest-cov.pth
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/not-zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/AUTHORS.rst
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/LICENSE
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/METADATA
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/WHEEL
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov/compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov/embed.py
diff --git a/components/python/pytest-cov/patches/01-no-hunter.patch b/components/python/pytest-cov/patches/01-no-hunter.patch
index 0e28aaf..e5aa79e 100644
--- a/components/python/pytest-cov/patches/01-no-hunter.patch
+++ b/components/python/pytest-cov/patches/01-no-hunter.patch
@@ -1,12 +1,12 @@
hunter is not needed to run tests
---- pytest-cov-4.1.0/setup.py.orig
-+++ pytest-cov-4.1.0/setup.py
-@@ -136,7 +136,6 @@
+--- pytest-cov-5.0.0/setup.py.orig
++++ pytest-cov-5.0.0/setup.py
+@@ -132,7 +132,6 @@
extras_require={
'testing': [
'fields',
- 'hunter',
'process-tests',
- 'six',
'pytest-xdist',
+ 'virtualenv',
diff --git a/components/python/pytest-cov/patches/02-test-PYTHONPATH.patch b/components/python/pytest-cov/patches/02-test-PYTHONPATH.patch
index 42516c6..df71d1b 100644
--- a/components/python/pytest-cov/patches/02-test-PYTHONPATH.patch
+++ b/components/python/pytest-cov/patches/02-test-PYTHONPATH.patch
@@ -1,6 +1,6 @@
---- pytest-cov-4.1.0/tests/test_pytest_cov.py.orig
-+++ pytest-cov-4.1.0/tests/test_pytest_cov.py
-@@ -912,6 +912,7 @@
+--- pytest-cov-5.0.0/tests/test_pytest_cov.py.orig
++++ pytest-cov-5.0.0/tests/test_pytest_cov.py
+@@ -864,6 +864,7 @@
assert result.ret == 0
diff --git a/components/python/pytest-cov/pkg5 b/components/python/pytest-cov/pkg5
index be07617..f235199 100644
--- a/components/python/pytest-cov/pkg5
+++ b/components/python/pytest-cov/pkg5
@@ -2,7 +2,9 @@
"dependencies": [
"library/python/coverage-39",
"library/python/pytest-39",
+ "library/python/setuptools-39",
"library/python/tomli-39",
+ "library/python/wheel-39",
"runtime/python-39"
],
"fmris": [
diff --git a/components/python/pytest-cov/pytest-cov-PYVER.p5m b/components/python/pytest-cov/pytest-cov-PYVER.p5m
index 483caae..98cdfc2 100644
--- a/components/python/pytest-cov/pytest-cov-PYVER.p5m
+++ b/components/python/pytest-cov/pytest-cov-PYVER.p5m
@@ -24,13 +24,12 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/lib/python$(PYVER)/vendor-packages/pytest-cov.pth
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/not-zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/AUTHORS.rst
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/LICENSE
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/METADATA
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/WHEEL
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov/compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov/embed.py
diff --git a/components/python/pytest-cov/test/results-all.master b/components/python/pytest-cov/test/results-all.master
index aa2f893..7c3ba9e 100644
--- a/components/python/pytest-cov/test/results-all.master
+++ b/components/python/pytest-cov/test/results-all.master
@@ -4,9 +4,9 @@
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON)
cachedir: .tox/py$(PYV)/.pytest_cache
rootdir: $(@D)
-configfile: setup.cfg
+configfile: pytest.ini
testpaths: tests
-collecting ... collected 129 items
+collecting ... collected 130 items
coverage.version_info > (6, 4))
coverage.version_info > (6, 4))
@@ -128,6 +128,7 @@
tests/test_pytest_cov.py::test_no_cover_marker PASSED
tests/test_pytest_cov.py::test_not_started_plugin_does_not_fail PASSED
tests/test_pytest_cov.py::test_pth_failure PASSED
+tests/test_pytest_cov.py::test_pyproject_toml PASSED
tests/test_pytest_cov.py::test_show_missing_coveragerc[branch1a] PASSED
tests/test_pytest_cov.py::test_show_missing_coveragerc[branch1c] PASSED
tests/test_pytest_cov.py::test_show_missing_coveragerc[branch2x] PASSED
@@ -144,6 +145,6 @@
xdist 2.3.0 the parent sys.path is copied in the child process)
=========================== short test summary info ============================
-======== 119 passed, 10 skipped ========
+======== 120 passed, 10 skipped ========
py$(PYV): OK
congratulations :)
--
Gitblit v1.9.3