From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/pytest-cov/Manifest | 10 +--- .../files/fix-for-deprecation-warnings.patch | 16 ------ .../pytest-cov-2.6.1-disable-broken-tests.patch | 22 -------- dev-python/pytest-cov/metadata.xml | 1 + dev-python/pytest-cov/pytest-cov-2.3.1.ebuild | 60 ---------------------- dev-python/pytest-cov/pytest-cov-2.6.1.ebuild | 58 --------------------- dev-python/pytest-cov/pytest-cov-2.8.1.ebuild | 4 +- 7 files changed, 5 insertions(+), 166 deletions(-) delete mode 100644 dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch delete mode 100644 dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch delete mode 100644 dev-python/pytest-cov/pytest-cov-2.3.1.ebuild delete mode 100644 dev-python/pytest-cov/pytest-cov-2.6.1.ebuild (limited to 'dev-python/pytest-cov') diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest index 70f3bfd7c910..792fb5c52e29 100644 --- a/dev-python/pytest-cov/Manifest +++ b/dev-python/pytest-cov/Manifest @@ -1,12 +1,6 @@ -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 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec -EBUILD pytest-cov-2.3.1.ebuild 1499 BLAKE2B 6e4eeeae7b983107d8a193e84ab4d25b753fb2e712e0885ce83a924a7639c9b1425a7f880ae09d85771acefbd73ddd373aa6199c357a2bc2b26095ecb23e4f54 SHA512 3698708bc4a72dce9af380c8db3bb1ee17ef626356927259cf067cad9cbfacc95a0c934c6adc5911b9725b3c2d52fca63ea438682384414df2c49c7e956056d3 -EBUILD pytest-cov-2.6.1.ebuild 1453 BLAKE2B b8cd06dc858f877e34ff505a25cceab2f2f89c79397c8d23a20195405172bcd524389034404dc1f0597ffe49ddaeaeed4814b09e1a5e300aae51cf1baece98ff SHA512 c6f5c465d983315496f55e0632c678a6013660ffc05fbff6c8c7ba0f4673bac2bf3ebb1204d3e33877a3c8628c87bb673bba8b0ec45d56baa6823b5a3642cb24 -EBUILD pytest-cov-2.8.1.ebuild 1395 BLAKE2B 552aa23139e450f9a3be2b18b1480970fcaaf4de0e8129c77f840ba4d93b5ea95b226101269030ace6d74f3a9a4e16adf03e7d8aa5f06c4cf1640063e8da6921 SHA512 8f0036fa0d289d6ed452e0d313ebe5fe8c020b1b45ef7e0706e0bcfc3b6a0a0f67eaa83d8459cf31ff9dd00535f1b16cff56a8d1258b27528e1dd177f8d17785 -MISC metadata.xml 451 BLAKE2B 61b39473b8b03a8096c5e63b8b59098cf1cb07bd5c5ab875e6d12af03b9113c2e0ecc8d16b395e73ea70378a568efcc3ae18d1970004aca5bb4c8a45bb266c67 SHA512 097e5da22a24c3eb0636095b4385bc7102f45968a489121f296547cd29cf9d416264f44b7b0766bb8206d6364ed40408e016790e755f139728d36954cdf5312c +EBUILD pytest-cov-2.8.1.ebuild 1386 BLAKE2B 95a410b7aff0ac1087971dd51ccbef8c4e2b604a59b8dff5d2ac982e9318c68efecc79503fc5e4e059ff59ef11a6bf0f07371c993137e8daa12e96d1fb8ed9b8 SHA512 3dad902e047cbfd5eed0afeb4bb7b0511fca8314e525543db9ea27fb1f8d8d68da8de4310fcd8eb5be9f58e3b14c92d0c7a130f2eec8216d1ca9c85509a5f816 +MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e 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 a555ca53fc91..000000000000 --- 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 1d8e36b451b2..000000000000 --- 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/metadata.xml b/dev-python/pytest-cov/metadata.xml index 8dbf3c52128a..406193f56966 100644 --- a/dev-python/pytest-cov/metadata.xml +++ b/dev-python/pytest-cov/metadata.xml @@ -5,6 +5,7 @@ python@gentoo.org Python + pytest-cov memedough/pytest-cov 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 f3edac318137..000000000000 --- 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 2afc94aafe0d..000000000000 --- 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 -} 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 2004e0be8ef3..788897781d00 100644 --- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild +++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 ) inherit distutils-r1 @@ -13,7 +14,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" @@ -23,7 +24,6 @@ RDEPEND=" >=dev-python/coverage-4.4[${PYTHON_USEDEP}] " DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/virtualenv[${PYTHON_USEDEP}] dev-python/fields[${PYTHON_USEDEP}] -- cgit v1.2.3