From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Mar 2021 14:27:17 +0000 Subject: gentoo resync : 20.03.2021 --- dev-python/pytest-xdist/Manifest | 7 +-- .../files/pytest-xdist-1.34.0-pytest4.patch | 50 ---------------------- .../pytest-xdist/pytest-xdist-1.34.0-r1.ebuild | 43 ------------------- .../pytest-xdist/pytest-xdist-2.2.0-r1.ebuild | 37 ---------------- dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild | 2 +- 5 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch delete mode 100644 dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild delete mode 100644 dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild (limited to 'dev-python/pytest-xdist') diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest index b259dc487b7a..c89204d19ffc 100644 --- a/dev-python/pytest-xdist/Manifest +++ b/dev-python/pytest-xdist/Manifest @@ -1,9 +1,4 @@ -AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02 -DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24 -DIST pytest-xdist-2.2.0.tar.gz 64781 BLAKE2B 17287c28f31c42c6a8fe3622d4ba920a530e0ced3bc99cffd8f9de91c3498cc2a3b654cc32bd5b09ee8ec6c1f64226aec736acafd73397be2eb34bd3d192bb46 SHA512 2027f8512fbd6cb68ab36eb774b9d8b7e855c181733b884f394d0e84994926b4fe6158dbd55808328b262497036f101e71cb86553340eba0031d654f34541689 DIST pytest-xdist-2.2.1.tar.gz 64956 BLAKE2B 7ea18b0e7893000ed9d8718506a7b0f7cf45444196a23e3defec34639c2159b52c7a533ddbc0e0a9b3c3f1e0a867ad5c85e3549167e9b7049ce718646ed50717 SHA512 0732f5ffb56eead3d1aeecd37381c2d9c6ed22398e8e51e9358b562765d737ebde48ecb6fe9f90d9a46902dba1422721cb2c7bfc9fc13918aa2c3b8e6a5e48c4 -EBUILD pytest-xdist-1.34.0-r1.ebuild 1034 BLAKE2B e2573dce203013c0000e8192e72e3df62f055824c94b89ce085a820aeffb186ed7f6c57759c74487678d88912fe58b218498b57a3f388e7525c07fb7866c5771 SHA512 ec4462b37f30387f804e11857f081fc5cba69b271a566659853f2d5bec3321cdc90a316a4e1f884a3623462744775718d6a3d4849202a73a29ff9f4da41b0011 -EBUILD pytest-xdist-2.2.0-r1.ebuild 917 BLAKE2B ba82a931b850881ebb8bdc71223b8301c3b00e59767fb76bec17e5a4ba86aa569dbd906e139bcf878011471fd3c99a5053a7c760e53b20dac3cdacf7d22080b6 SHA512 1922065b4754c83f19739e10e378462d57af202d6fc99241340ee34b4de89c5d39ee0c3ab5da146cd3db2ba992ab0a25341a63ee62df1f19a2263cb198cfb61a -EBUILD pytest-xdist-2.2.1.ebuild 932 BLAKE2B a0b0594a3cd1cb199c76089eec90e18e50123b50879b71c8d697c2cac925c02db7c8fd75ab0704e281b9eb59f23cda45654d6ff0c78fc4c3452514859d0fc2c6 SHA512 fcaacb88dca7e1912004d37dcdffec8478eba13f1f2ee2ff3cb5a6b7ed519d6ad7a272a0462226db0987a29f22f45ca684e8f83d10e0d323193ce5ea019704a2 +EBUILD pytest-xdist-2.2.1.ebuild 924 BLAKE2B 396f5c4a171b3eabe016d21318d2e2a8c38693cd6848385434b4e4b34e1f8216ce181a7eee22ac56f93b3e988b8201c78b0d3d5be866abab39a38eda15a387e8 SHA512 f29bb5739260b82249e2e4ea3449719ab2743c294cb1c18efaeaf71d3239748aab4034135a6d79a9a2e2d7c2e18588a2d6822b41fbe07752e63d2cfa33182e45 MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060 diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch deleted file mode 100644 index 8595480c01f0..000000000000 --- a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bd4e91d12bf6e20538d9b3acfe69536b3badcde5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 31 Jul 2020 20:13:24 +0200 -Subject: [PATCH 1/3] Fix test_config_initialization condition for pytest<5 - -Fix test_config_initialization to be correctly skipped on pytest<5, -by explicitly checking pytest version (idea copied from -test_looponfail_removed_test). The current conditions are insufficient --- the outer check wrongly assumes pytest>=5 will always be used -on Python 3 (which is not true if you need the same version to support -both Python 2 and Python 3), and the inner condition apparently -wrongly assuming that invocation_params attribute is not present -in pytest-4. ---- - testing/acceptance_test.py | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py -index 7f9a551..29c5d9a 100644 ---- a/testing/acceptance_test.py -+++ b/testing/acceptance_test.py -@@ -2,6 +2,7 @@ import os - import re - import sys - import textwrap -+from pkg_resources import parse_version - - import py - import pytest -@@ -594,15 +595,11 @@ def test_fixture_teardown_failure(testdir): - - - @pytest.mark.skipif( -- sys.version_info[:2] == (2, 7), -- reason="Only available in pytest 5.0+ (Python 3 only)", -+ parse_version(pytest.__version__) < parse_version("5"), -+ reason="Only available in pytest 5.0+", - ) - def test_config_initialization(testdir, monkeypatch, pytestconfig): - """Ensure workers and master are initialized consistently. Integration test for #445""" -- if not hasattr(pytestconfig, "invocation_params"): -- pytest.skip( -- "requires pytest >=5.1 (config has no attribute 'invocation_params')" -- ) - testdir.makepyfile( - **{ - "dir_a/test_foo.py": """ --- -2.28.0 - diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild deleted file mode 100644 index 5969b49e86cd..000000000000 --- a/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Distributed testing and loop-on-failing modes" -HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement -RDEPEND=" - dev-python/execnet[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-pytest4.patch -) - -python_test() { - distutils_install_for_testing - pytest -vv testing || die "Tests failed under ${EPYTHON}" -} diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild deleted file mode 100644 index 324d6470fb73..000000000000 --- a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Distributed testing and loop-on-failing modes" -HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -# pytest-xdist >= 2 fails with pytest < 6 -RDEPEND=" - dev-python/execnet[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] -" - -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - dev-python/filelock[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-services-conflict.patch -) - -distutils_enable_tests --install pytest diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild index d27d1d1c78ab..b0684c4521a2 100644 --- a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild +++ b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" # pytest-xdist >= 2 fails with pytest < 6 RDEPEND=" -- cgit v1.2.3