From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-python/pytest-cov/Manifest | 9 +++- .../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.3.1.ebuild | 1 + dev-python/pytest-cov/pytest-cov-2.6.1.ebuild | 1 + dev-python/pytest-cov/pytest-cov-2.8.1.ebuild | 51 +++++++++++++++++++++ 7 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch create mode 100644 dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch create mode 100644 dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch create mode 100644 dev-python/pytest-cov/pytest-cov-2.8.1.ebuild (limited to 'dev-python/pytest-cov') diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest index faeec92d23cc..71f6e502d03b 100644 --- a/dev-python/pytest-cov/Manifest +++ b/dev-python/pytest-cov/Manifest @@ -1,7 +1,12 @@ AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105fc46c03d66b65ad359e84d63780fdff36342b50a5465c4ebcfe1a94d277301de49e5f4822856411e54d939d85d7043a1f094 SHA512 3f20f6ef0514d676259e6bfd5c10c1877c4237a4a87161352adeda355dac693a6a43b8be3b29848feca433a9ead3e96967d8e255b62e3b60d816127eb17c4cae AUX pytest-cov-2.6.1-disable-broken-tests.patch 870 BLAKE2B 8e9c6c236765922ec0758402491718817401ab931dea5c888de1457a6d07b5053417ddb881bc186389ad612afe1798ab803dabf6551bffa3125f1db2ff8483a2 SHA512 4a1a6625824990499fffa76cd2c57fbe7050bf2d4305c81ca862cab2d5aad6ac094bf3597b15d928ff0c5f9f7671b209a394d538dbe50ecc3efc14d72b19137d +AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619f22cf485d2161d3ddda7740eea7f1516b5fee6e70bc597b1ca5ac79514be06eeccbd22a458381282622404152e7a41def6af3c3b15a4 SHA512 fc301e116072b7d77864f51a973b20274034569015c198fa8c05efa09d5863bbe9534d1ee1d2170a41485f914f4006cc6818332df76292aecb7e229cd61c7a63 +AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a +AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271 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 -EBUILD pytest-cov-2.3.1.ebuild 1478 BLAKE2B a769eff365dd54a53bb2b657c6c4753f79d526c551858377ab61622ea4be76862f0e60dabdef28cd6930992e8df0d4754609386f7c88d07003ced8b8bd474a0c SHA512 1d0b0a88a282066db864abf7c8522597158d1c5d000159c8d514976c01b27e8795419ccf0358c08302fb0b64ab3bc2132f847390021e05a327f970abc8577b7e -EBUILD pytest-cov-2.6.1.ebuild 1433 BLAKE2B eadfa0c6b1a759b797668d10a30536a43f09a7e1c852b7bc143253e998ea5d8345f0fa6f33e2b807f13e39f23668b8529934149d7acf5739010ae474ddafdf4f SHA512 c13eafe9d861992725f45a9dda979bdbd1f29ed99396de23073fbf6b37c5e2eb860d646eb1b00726448bdcef7f6bdb5bd1f75e1e8d7ede870a56dfac3b64b022 +DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec +EBUILD pytest-cov-2.3.1.ebuild 1505 BLAKE2B dd103531a5baf5ce42f1cfb90f91384bc9036a4b8ff79996d721ffc8880e1e8dd142c3f85b73c4b996702d93c399260f748e6bc21883194be9a0e1b708733703 SHA512 96454933994134ba6989ffd540e54485ec5ba587624173367fe92ba368ecc04db61d16e46152e35a48fc0fceabe8739310667578785ed1f2be1a5fef8491cd0b +EBUILD pytest-cov-2.6.1.ebuild 1460 BLAKE2B a2c2afae259530ddd882ae0fc5e1974c887270629e5114bf4f9e90ea727820520a81e737574e88da707515235ca7f2e4112cc944c9825da8cecdc91d0700fa89 SHA512 76abf489143d6d33b5ec63be8362a2dfd0e7ec65f2b0ae99c50ec1a8cc1cb3bd4d5ed5cdaa7f10299c40f80831419cb581c46f1c95d4930c101fa90b53423c36 +EBUILD pytest-cov-2.8.1.ebuild 1400 BLAKE2B 9256f74e83645e8e499e94fbbbcc993de074b1bdaae60c3a0a730cdcb27f7fe77f1543ca8258afb951549e0ee250b296bfef33de8e6a6ab4d424c1fab5f90147 SHA512 61c40cc9e61cd8d2265ad0e648927934500284eaa037f4f4f0d410475c6ae17748f515773f28b1b775061aa9714844dddc3d931dd068e24f270e719fb536b43d MISC metadata.xml 451 BLAKE2B 61b39473b8b03a8096c5e63b8b59098cf1cb07bd5c5ab875e6d12af03b9113c2e0ecc8d16b395e73ea70378a568efcc3ae18d1970004aca5bb4c8a45bb266c67 SHA512 097e5da22a24c3eb0636095b4385bc7102f45968a489121f296547cd29cf9d416264f44b7b0766bb8206d6364ed40408e016790e755f139728d36954cdf5312c 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 000000000000..660db5e59431 --- /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/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 000000000000..8a9618c3fd98 --- /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 000000000000..6292672b6191 --- /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.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild index 14976f71122d..314b91f54867 100644 --- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild +++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild @@ -15,6 +15,7 @@ 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}] diff --git a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild index 561079a4ff46..7eee71a66189 100644 --- a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild +++ b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild @@ -15,6 +15,7 @@ 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}] 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 000000000000..ac1732bd7f24 --- /dev/null +++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild @@ -0,0 +1,51 @@ +# 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,8}} 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="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=" + 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}] + ) +" + +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}" +} -- cgit v1.2.3