diff options
author | Michał Górny <mgorny@gentoo.org> | 2021-03-14 23:36:34 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2021-03-14 23:36:34 +0100 |
commit | c39ce973234d98d25be1ac58cf4bf93bd9671e7b (patch) | |
tree | 0abec3e985f9aa7e6662bdce6b2d74b555125f6e /dev-python/pytest-xdist | |
parent | dev-python/cffi: Stabilize 1.14.5 arm64, #776037 (diff) | |
download | gentoo-c39ce973234d98d25be1ac58cf4bf93bd9671e7b.tar.gz gentoo-c39ce973234d98d25be1ac58cf4bf93bd9671e7b.tar.bz2 gentoo-c39ce973234d98d25be1ac58cf4bf93bd9671e7b.zip |
dev-python/pytest-xdist: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/pytest-xdist')
-rw-r--r-- | dev-python/pytest-xdist/Manifest | 2 | ||||
-rw-r--r-- | dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch | 50 | ||||
-rw-r--r-- | dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild | 43 | ||||
-rw-r--r-- | dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild | 37 |
4 files changed, 0 insertions, 132 deletions
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest index aed96c0d4de3..4008b8ef3773 100644 --- a/dev-python/pytest-xdist/Manifest +++ b/dev-python/pytest-xdist/Manifest @@ -1,3 +1 @@ -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 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?= <mgorny@gentoo.org> -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 |