[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[Virgil Dupras]

commit:     f6865fd5a614dcf9346addf503cbc0b8b446acbf
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 13:34:56 2019 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 13:34:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6865fd5

dev-python/pytest-cov: bump to 2.6.1

Also, fix broken tests.

Bug: https://bugs.gentoo.org/597708
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-python/pytest-cov/Manifest                     |  1 +
 .../pytest-cov-2.6.1-disable-broken-tests.patch    | 22 +++++++++
 dev-python/pytest-cov/pytest-cov-2.6.1.ebuild      | 57 ++++++++++++++++++++++
 3 files changed, 80 insertions(+)

diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index a65fe623704..d656767ad11 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
+DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch b/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
new file mode 100644
index 00000000000..1d8e36b451b
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index 2896ac9..5f753e8 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -699,7 +699,7 @@ parallel = true
+     assert result.ret == 0
+ 
+ 
+-def test_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
++def xtest_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
+     stuff = testdir.mkdir('stuff')
+     parent_script = stuff.join('parent_script.py')
+     parent_script.write(SCRIPT_PARENT_CHANGE_CWD_IMPORT_CHILD)
+@@ -829,7 +829,7 @@ def test_invalid_coverage_source(testdir):
+ 
+ 
+ @pytest.mark.skipif("'dev' in pytest.__version__")
+-def test_dist_missing_data(testdir):
++def xtest_dist_missing_data(testdir):
+     venv_path = os.path.join(str(testdir.tmpdir), 'venv')
+     virtualenv.create_environment(venv_path)
+     if sys.platform == 'win32':

diff --git a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
new file mode 100644
index 00000000000..7af2f09e338
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Bug 597708
+	"${FILESDIR}/${PN}-2.6.1-disable-broken-tests.patch"
+)
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		pytest -vv || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[Patrick McLean]

commit:     acaca9f5de2b346664ea6715e5b8724f5c545093
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Nov 22 03:12:16 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 03:15:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acaca9f5

dev-python/pytest-cov: Version bump to 2.8.1

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-python/pytest-cov/Manifest                     |  1 +
 .../pytest-cov-2.8.1-disable-broken-tests.patch    | 20 +++++++
 dev-python/pytest-cov/pytest-cov-2.8.1.ebuild      | 67 ++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index a6c3db6454a..80209ad865e 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa
+DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch
new file mode 100644
index 00000000000..660db5e5943
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index e79e9aa..e5ef2c1 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -820,6 +820,7 @@ parallel = true
+     assert result.ret == 0
+ 
+ 
++@pytest.mark.skip(reason="test is broken")
+ def test_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
+     stuff = testdir.mkdir('stuff')
+     parent_script = stuff.join('parent_script.py')
+@@ -951,6 +952,7 @@ def test_invalid_coverage_source(testdir):
+     assert not matching_lines
+ 
+ 
++@pytest.mark.skip(reason="test is broken")
+ @pytest.mark.skipif("'dev' in pytest.__version__")
+ @pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
+ def test_dist_missing_data(testdir):

diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
new file mode 100644
index 00000000000..10e7f1f4e01
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]')
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Bug 597708
+	"${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
+)
+
+python_check_deps() {
+	use doc || return 0
+	local dep
+	for dep in dev-python/sphinx dev-python/sphinx-py3doc-enhanced-theme; do
+		has_version ${dep}[${PYTHON_USEDEP}] || return ${?}
+	done
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		pytest -vv || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[Patrick McLean]

commit:     4480ad059cf7edb93dee4f70790c940951bde781
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Dec  6 04:36:52 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 04:36:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4480ad05

dev-python/pytest-cov-2.8.1: Add py38

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/pytest-cov-2.8.1-latest-setuptools.patch | 40 +++++++++++++++++
 .../files/pytest-cov-2.8.1-python38.patch          | 52 ++++++++++++++++++++++
 dev-python/pytest-cov/pytest-cov-2.8.1.ebuild      |  5 ++-
 3 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch
new file mode 100644
index 00000000000..8a9618c3fd9
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch
@@ -0,0 +1,40 @@
+diff --git a/setup.py b/setup.py
+index 1305b23..3a5803e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -29,7 +29,7 @@ def read(*names, **kwargs):
+ 
+ 
+ class BuildWithPTH(build):
+-    def run(self):
++    def run(self, **kwargs):
+         build.run(self)
+         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
+         dest = join(self.build_lib, basename(path))
+@@ -37,7 +37,7 @@ class BuildWithPTH(build):
+ 
+ 
+ class EasyInstallWithPTH(easy_install):
+-    def run(self):
++    def run(self, **kwargs):
+         easy_install.run(self)
+         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
+         dest = join(self.install_dir, basename(path))
+@@ -45,7 +45,7 @@ class EasyInstallWithPTH(easy_install):
+ 
+ 
+ class InstallLibWithPTH(install_lib):
+-    def run(self):
++    def run(self, **kwargs):
+         install_lib.run(self)
+         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
+         dest = join(self.install_dir, basename(path))
+@@ -57,7 +57,7 @@ class InstallLibWithPTH(install_lib):
+ 
+ 
+ class DevelopWithPTH(develop):
+-    def run(self):
++    def run(self, **kwargs):
+         develop.run(self)
+         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
+         dest = join(self.install_dir, basename(path))

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch
new file mode 100644
index 00000000000..6292672b619
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch
@@ -0,0 +1,52 @@
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index e79e9aa..198478b 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -662,6 +662,7 @@ def test_fail(p):
+     ])
+ 
+ 
++@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="Seems buggy on python3.8")
+ @pytest.mark.skipif('sys.platform == "win32" or platform.python_implementation() == "PyPy"')
+ def test_dist_combine_racecondition(testdir):
+     script = testdir.makepyfile("""
+@@ -1018,6 +1019,7 @@ def test_funcarg_not_active(testdir):
+     assert result.ret == 0
+ 
+ 
++@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
+ @pytest.mark.skipif("sys.version_info[0] < 3", reason="no context manager api on Python 2")
+ @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
+ @pytest.mark.skipif('platform.python_implementation() == "PyPy"', reason="often deadlocks on PyPy")
+@@ -1059,6 +1061,7 @@ def test_run_target():
+     assert result.ret == 0
+ 
+ 
++@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
+ @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
+ @pytest.mark.skipif('platform.python_implementation() == "PyPy"', reason="often deadlocks on PyPy")
+ def test_multiprocessing_pool_terminate(testdir):
+@@ -1141,6 +1144,7 @@ def test_run_target():
+     assert result.ret == 0
+ 
+ 
++@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
+ @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
+ def test_multiprocessing_process(testdir):
+     pytest.importorskip('multiprocessing.util')
+@@ -1171,6 +1175,7 @@ def test_run_target():
+     assert result.ret == 0
+ 
+ 
++@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
+ @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
+ def test_multiprocessing_process_no_source(testdir):
+     pytest.importorskip('multiprocessing.util')
+@@ -1201,6 +1206,7 @@ def test_run_target():
+     assert result.ret == 0
+ 
+ 
++@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
+ @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
+ def test_multiprocessing_process_with_terminate(testdir):
+     pytest.importorskip('multiprocessing.util')

diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
index 45ad4ec70c7..ac1732bd7f2 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
 
 inherit distutils-r1
 
@@ -35,6 +35,9 @@ DEPEND="
 PATCHES=(
 	# Bug 597708
 	"${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
+	"${FILESDIR}/${PN}-2.8.1-latest-setuptools.patch"
+	# https://github.com/pytest-dev/pytest-cov/issues/365
+	"${FILESDIR}/pytest-cov-2.8.1-python38.patch"
 )
 
 distutils_enable_sphinx docs \

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[Michał Górny]

commit:     84c5be23e827cd487c484f647308f1d521e86382
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 18:32:39 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 18:48:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c5be23

dev-python/pytest-cov: Remove redundant versions

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pytest-cov/Manifest                     |  2 -
 .../files/fix-for-deprecation-warnings.patch       | 16 ------
 .../pytest-cov-2.6.1-disable-broken-tests.patch    | 22 --------
 dev-python/pytest-cov/pytest-cov-2.3.1.ebuild      | 60 ----------------------
 dev-python/pytest-cov/pytest-cov-2.6.1.ebuild      | 58 ---------------------
 5 files changed, 158 deletions(-)

diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 80209ad865e..89a5464f923 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,3 +1 @@
-DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
-DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec

diff --git a/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch b/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
deleted file mode 100644
index a555ca53fc9..00000000000
--- a/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index 6cbf341..614e53c 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -337,7 +337,10 @@ def test_central_nonspecific(testdir):
-     ])
- 
-     # multi-module coverage report
--    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
-+    # Fix test failure due to pytest deprecation warnings being
-+    # added to the expected output.  Look in entire output lines instead.
-+    # assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
-+    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-10:])
- 
-     assert result.ret == 0
- 

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch b/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
deleted file mode 100644
index 1d8e36b451b..00000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index 2896ac9..5f753e8 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -699,7 +699,7 @@ parallel = true
-     assert result.ret == 0
- 
- 
--def test_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
-+def xtest_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
-     stuff = testdir.mkdir('stuff')
-     parent_script = stuff.join('parent_script.py')
-     parent_script.write(SCRIPT_PARENT_CHANGE_CWD_IMPORT_CHILD)
-@@ -829,7 +829,7 @@ def test_invalid_coverage_source(testdir):
- 
- 
- @pytest.mark.skipif("'dev' in pytest.__version__")
--def test_dist_missing_data(testdir):
-+def xtest_dist_missing_data(testdir):
-     venv_path = os.path.join(str(testdir.tmpdir), 'venv')
-     virtualenv.create_environment(venv_path)
-     if sys.platform == 'win32':

diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
deleted file mode 100644
index f3edac31813..00000000000
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-			dev-python/pytest-cache[${PYTHON_USEDEP}]
-		)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/fix-for-deprecation-warnings.patch"
-)
-
-python_compile_all() {
-	use doc && sphinx-build -b html docs _build/html
-}
-
-python_test() {
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( _build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
deleted file mode 100644
index 2afc94aafe0..00000000000
--- a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Bug 597708
-	"${FILESDIR}/${PN}-2.6.1-disable-broken-tests.patch"
-)
-
-python_compile_all() {
-	use doc && sphinx-build -b html docs _build/html
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		pytest -vv || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( _build/html/. )
-	distutils-r1_python_install_all
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[Michał Górny]

commit:     40ce7e923ae7e606a5347c30db8a3295dd171fe9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 20:13:40 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 21:00:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ce7e92

dev-python/pytest-cov: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pytest-cov/Manifest                     |  1 -
 .../pytest-cov-2.8.1-disable-broken-tests.patch    | 20 ---------
 .../files/pytest-cov-2.8.1-latest-setuptools.patch | 40 -----------------
 .../files/pytest-cov-2.8.1-python38.patch          | 52 ----------------------
 dev-python/pytest-cov/pytest-cov-2.8.1.ebuild      | 51 ---------------------
 5 files changed, 164 deletions(-)

diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 59e6aad0125..7328fa1a0df 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-cov-2.10.1.tar.gz 56822 BLAKE2B 45eba205a2c6687882445d3554cedc04ad556854f5eac8eb0fab7fda84cdf2736b034dfdceb664293d1add153a5271403eb94585a863676ccfef9ab09727d165 SHA512 2dd575141754a417f34b414ba7e07291c273abdc63a6b7dc72d317c6ec10076b83c2ad78eeefdda7cee1fd6f56932d838602da4dd760a1c0d12095be94c22568
 DIST pytest-cov-2.11.0.tar.gz 59018 BLAKE2B f2ecaff439e701c3b7d029e4c51cb019d5222a083815ae5771341b0fa0f1b658f921a6eab75c0b568b630cc7ca75887f25ae7fb6fcaa9c2e8dc419397c4c799a SHA512 001f4975d7ad1a573354074366f983887ec9035bcc29afe9bd1ae2654fab520b8f479c5037936e6131749e5205077e937304e73d366cb43460db1f24a58b02be
 DIST pytest-cov-2.11.1.tar.gz 59143 BLAKE2B 21aeffbc9ccbe6a7c69a08fe3f0013204eb039c6dc9ddbb364a74ad10764e16ce7be0154e27beaab2c8f9b2a972131c4c2421c4aa4557efc18318556056a421b SHA512 19c465f5972ee0ee3b9a2f1a656fdf5457622cb449f73a6f707d377a617807dadda997a6875f0c081bc4c4f7039559c6e7ce820b818db42dfd053c016e1c3b4e
-DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch
deleted file mode 100644
index 660db5e5943..00000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index e79e9aa..e5ef2c1 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -820,6 +820,7 @@ parallel = true
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skip(reason="test is broken")
- def test_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
-     stuff = testdir.mkdir('stuff')
-     parent_script = stuff.join('parent_script.py')
-@@ -951,6 +952,7 @@ def test_invalid_coverage_source(testdir):
-     assert not matching_lines
- 
- 
-+@pytest.mark.skip(reason="test is broken")
- @pytest.mark.skipif("'dev' in pytest.__version__")
- @pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
- def test_dist_missing_data(testdir):

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch
deleted file mode 100644
index 8a9618c3fd9..00000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1305b23..3a5803e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@ def read(*names, **kwargs):
- 
- 
- class BuildWithPTH(build):
--    def run(self):
-+    def run(self, **kwargs):
-         build.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.build_lib, basename(path))
-@@ -37,7 +37,7 @@ class BuildWithPTH(build):
- 
- 
- class EasyInstallWithPTH(easy_install):
--    def run(self):
-+    def run(self, **kwargs):
-         easy_install.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.install_dir, basename(path))
-@@ -45,7 +45,7 @@ class EasyInstallWithPTH(easy_install):
- 
- 
- class InstallLibWithPTH(install_lib):
--    def run(self):
-+    def run(self, **kwargs):
-         install_lib.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.install_dir, basename(path))
-@@ -57,7 +57,7 @@ class InstallLibWithPTH(install_lib):
- 
- 
- class DevelopWithPTH(develop):
--    def run(self):
-+    def run(self, **kwargs):
-         develop.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.install_dir, basename(path))

diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch
deleted file mode 100644
index 6292672b619..00000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index e79e9aa..198478b 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -662,6 +662,7 @@ def test_fail(p):
-     ])
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="Seems buggy on python3.8")
- @pytest.mark.skipif('sys.platform == "win32" or platform.python_implementation() == "PyPy"')
- def test_dist_combine_racecondition(testdir):
-     script = testdir.makepyfile("""
-@@ -1018,6 +1019,7 @@ def test_funcarg_not_active(testdir):
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif("sys.version_info[0] < 3", reason="no context manager api on Python 2")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- @pytest.mark.skipif('platform.python_implementation() == "PyPy"', reason="often deadlocks on PyPy")
-@@ -1059,6 +1061,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- @pytest.mark.skipif('platform.python_implementation() == "PyPy"', reason="often deadlocks on PyPy")
- def test_multiprocessing_pool_terminate(testdir):
-@@ -1141,6 +1144,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- def test_multiprocessing_process(testdir):
-     pytest.importorskip('multiprocessing.util')
-@@ -1171,6 +1175,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- def test_multiprocessing_process_no_source(testdir):
-     pytest.importorskip('multiprocessing.util')
-@@ -1201,6 +1206,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- def test_multiprocessing_process_with_terminate(testdir):
-     pytest.importorskip('multiprocessing.util')

diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
deleted file mode 100644
index 960f0686259..00000000000
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Bug 597708
-	"${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
-	"${FILESDIR}/${PN}-2.8.1-latest-setuptools.patch"
-	# https://github.com/pytest-dev/pytest-cov/issues/365
-	"${FILESDIR}/pytest-cov-2.8.1-python38.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-py3doc-enhanced-theme
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		pytest -vv || die "Tests failed under ${EPYTHON}"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[Michał Górny]

commit:     68ac981a6ec2ad91072cd4aba96492c680b33e7c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 14:07:40 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 14:56:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ac981a

dev-python/pytest-cov: Backport test fix for coverage-6.2

Closes: https://bugs.gentoo.org/823766
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/pytest-cov-3.0.0-coverage-6.2.patch      | 30 ++++++++++++++++++++++
 dev-python/pytest-cov/pytest-cov-3.0.0.ebuild      |  7 ++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch b/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch
new file mode 100644
index 000000000000..b44326d8b60d
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch
@@ -0,0 +1,30 @@
+From 6d06678a76d9275beb48917d7653ea6a610c7717 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 23 Jan 2022 15:03:35 +0100
+Subject: [PATCH] Update test_invalid_coverage_source for coverage-6.2
+
+Update test_invalid_coverage_source to make the "No data was collected"
+less strict, as the output has changed in coverage-6.2.  This solution
+was suggested by Tom Callaway (@spotrh) on the linked bug.
+
+Fixes #509
+---
+ tests/test_pytest_cov.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index f93d352..6d97949 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -981,7 +981,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.',
+-- 
+2.34.1
+

diff --git a/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild b/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
index 4d424eac1bdd..db4782be9764 100644
--- a/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,11 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx-py3doc-enhanced-theme
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/pytest-dev/pytest-cov/pull/518
+	"${FILESDIR}"/${P}-coverage-6.2.patch
+)
+
 EPYTEST_DESELECT=(
 	# attempts to install packages via pip (network)
 	tests/test_pytest_cov.py::test_dist_missing_data

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/

[Sam James]

commit:     f67cb41cea030242bb1193cd4b6dc3abb4335fd9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 20:02:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 20:03:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f67cb41c

dev-python/pytest-cov: enable py3.11

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/pytest-cov-4.0.0-pytest-xdist-2.5.0.patch | 21 +++++++++++++++++++++
 dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild    |  8 ++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/dev-python/pytest-cov/files/pytest-cov-4.0.0-pytest-xdist-2.5.0.patch b/dev-python/pytest-cov/files/pytest-cov-4.0.0-pytest-xdist-2.5.0.patch
new file mode 100644
index 000000000000..6ed3456597cf
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-4.0.0-pytest-xdist-2.5.0.patch
@@ -0,0 +1,21 @@
+https://github.com/pytest-dev/pytest-cov/issues/566
+https://github.com/pytest-dev/pytest-cov/pull/565
+
+From 97483386bde4febe7ff48726f887cc6423d308b9 Mon Sep 17 00:00:00 2001
+From: Chedi <chedi.toueiti@gmail.com>
+Date: Tue, 15 Nov 2022 11:18:31 +0100
+Subject: [PATCH] disabling boxed test if version xdist newer than 2.5.0
+
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -1555,7 +1555,8 @@ def test_foo():
+ 
+ SCRIPT_SIMPLE_RESULT = '4 * 100%'
+ 
+-
++@pytest.mark.skipif('tuple(map(int, xdist.__version__.split("."))) >= (2, 5, 0)',
++                    reason="--boxed option was removed in version 2.5.0")
+ @pytest.mark.skipif('sys.platform == "win32"')
+ def test_dist_boxed(testdir):
+     script = testdir.makepyfile(SCRIPT_SIMPLE)
+

diff --git a/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild b/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
index 61bbc23db863..50a1d98287f1 100644
--- a/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0-pytest-xdist-2.5.0.patch
+)
+
 distutils_enable_sphinx docs \
 	dev-python/sphinx-py3doc-enhanced-theme
 distutils_enable_tests pytest