commit: adb78041a0fd49478ce8514da9ab251fe4d2165e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Mar 16 07:55:13 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Mar 16 07:55:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb78041
dev-python/pytest: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pytest/Manifest | 2 - dev-python/pytest/files/pytest-6.2.5-py310.patch | 81 ------------------------ dev-python/pytest/pytest-6.2.5-r2.ebuild | 77 ---------------------- dev-python/pytest/pytest-6.2.5-r3.ebuild | 80 ----------------------- dev-python/pytest/pytest-7.0.0.ebuild | 77 ---------------------- 5 files changed, 317 deletions(-) diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 764480a08baa..a8123617ad28 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -1,3 +1 @@ -DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9 -DIST pytest-7.0.0.tar.gz 1247853 BLAKE2B 3af132da903252323086b21eb052d35973f1e81189972d7f1880a22c5dd8a2b779bf2450f394ef9b1e156b780bcf6f677a0b043db204bcb6038a9a85c7f393e6 SHA512 9e876575d89ee60eccc873b2551464cc8eb7f9abfc6d73b33913efef79906830bdbe08b182ae436f981950cc6384f494935aa6ecb0d63b82e3c9ded77f9655b9 DIST pytest-7.0.1.tar.gz 1249154 BLAKE2B fcaef6afc6e98f6716a80f6451671b2abbf9ad676330a6e66e917a73e018eef966de8e7ef7ab48a1213167476eef1eb37cc5e84ec2bd9e5eab4ec6f1a8071c87 SHA512 21493717159a64fe6467bd096b578b127d81438d04f5b03ba2f4047237054f865a1f50a4e291b9d95b1a144f59bc7a8b3a00008493f4fb4f14bff7fb65c5edc2 diff --git a/dev-python/pytest/files/pytest-6.2.5-py310.patch b/dev-python/pytest/files/pytest-6.2.5-py310.patch deleted file mode 100644 index 89ca41954273..000000000000 --- a/dev-python/pytest/files/pytest-6.2.5-py310.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 5082686349185ef35f64d1a998a3062ee5a48771 Mon Sep 17 00:00:00 2001 -From: Ran Benita <[email protected]> -Date: Thu, 13 May 2021 17:27:43 +0300 -Subject: [PATCH 1/2] Merge pull request #8664 from - hroncok/test_unittest-ignore_DeprecationWarning-from-twisted - -Ignore DeprecationWarnings in test_trial_error - -(cherry picked from commit 850a8447792f89c7d38c72b2f542536655ab0354) ---- - testing/test_unittest.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/testing/test_unittest.py b/testing/test_unittest.py -index 8b00cb826..de8fc5c55 100644 ---- a/testing/test_unittest.py -+++ b/testing/test_unittest.py -@@ -533,7 +533,9 @@ class TestTrialUnittest: - # will crash both at test time and at teardown - """ - ) -- result = testdir.runpytest("-vv", "-oconsole_output_style=classic") -+ result = testdir.runpytest( -+ "-vv", "-oconsole_output_style=classic", "-W", "ignore::DeprecationWarning" -+ ) - result.stdout.fnmatch_lines( - [ - "test_trial_error.py::TC::test_four FAILED", --- -2.35.0 - -From 932792c22a300fc7794f966851df2b996f4a79bc Mon Sep 17 00:00:00 2001 -From: Bruno Oliveira <[email protected]> -Date: Thu, 16 Dec 2021 10:37:52 -0300 -Subject: [PATCH 2/2] Merge pull request #9417 from - nicoddemus/fix-py3.10.1-9413 - -(cherry picked from commit 47df71d23ff13bd083b21ffcf839bd11169b42fc) ---- - .github/workflows/main.yml | 4 ++-- - testing/test_skipping.py | 2 -- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml -index 5a9435357..a8a6406c6 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -75,7 +75,7 @@ jobs: - os: windows-latest - tox_env: "py39-xdist" - - name: "windows-py310" -- python: "3.10-dev" -+ python: "3.10.1" - os: windows-latest - tox_env: "py310-xdist" - -@@ -105,7 +105,7 @@ jobs: - os: ubuntu-latest - tox_env: "py39-xdist" - - name: "ubuntu-py310" -- python: "3.10-dev" -+ python: "3.10.1" - os: ubuntu-latest - tox_env: "py310-xdist" - - name: "ubuntu-pypy3" -diff --git a/testing/test_skipping.py b/testing/test_skipping.py -index 3cb8bdff2..487793645 100644 ---- a/testing/test_skipping.py -+++ b/testing/test_skipping.py -@@ -1126,8 +1126,6 @@ def test_errors_in_xfail_skip_expressions(pytester: Pytester) -> None: - pypy_version_info = getattr(sys, "pypy_version_info", None) - if pypy_version_info is not None and pypy_version_info < (6,): - markline = markline[5:] -- elif sys.version_info[:2] >= (3, 10): -- markline = markline[11:] - elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"): - markline = markline[4:] - --- -2.35.0 - diff --git a/dev-python/pytest/pytest-6.2.5-r2.ebuild b/dev-python/pytest/pytest-6.2.5-r2.ebuild deleted file mode 100644 index 6679e63a6906..000000000000 --- a/dev-python/pytest/pytest-6.2.5-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 multiprocessing - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE="https://pytest.org/"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - dev-python/iniconfig[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] - >=dev-python/py-1.8.2[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/argcomplete[${PYTHON_USEDEP}] - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/xmlschema[${PYTHON_USEDEP}] - )" - -PATCHES=( - # backport fixes for py3.10 test regressions - "${FILESDIR}"/${P}-py310.patch -) - -src_test() { - # workaround new readline defaults - echo "set enable-bracketed-paste off" > "${T}"/inputrc || die - local -x INPUTRC="${T}"/inputrc - distutils-r1_src_test -} - -python_test() { - distutils_install_for_testing --via-root - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - - local EPYTEST_DESELECT=( - # broken by epytest args - testing/test_warnings.py::test_works_with_filterwarnings - - # tend to be broken by random pytest plugins - # (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out) - testing/test_helpconfig.py::test_version_less_verbose - testing/test_helpconfig.py::test_version_verbose - testing/test_junitxml.py::test_random_report_log_xdist - testing/test_junitxml.py::test_runs_twice_xdist - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose - testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal - testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info - testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info - ) - - epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" -} diff --git a/dev-python/pytest/pytest-6.2.5-r3.ebuild b/dev-python/pytest/pytest-6.2.5-r3.ebuild deleted file mode 100644 index 888dfd1c2010..000000000000 --- a/dev-python/pytest/pytest-6.2.5-r3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 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 ) - -inherit distutils-r1 multiprocessing - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE="https://pytest.org/"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - dev-python/iniconfig[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] - >=dev-python/py-1.8.2[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/argcomplete[${PYTHON_USEDEP}] - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/xmlschema[${PYTHON_USEDEP}] - )" - -PATCHES=( - # backport fixes for py3.10 test regressions - "${FILESDIR}"/${P}-py310.patch -) - -src_test() { - # workaround new readline defaults - echo "set enable-bracketed-paste off" > "${T}"/inputrc || die - local -x INPUTRC="${T}"/inputrc - distutils-r1_src_test -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - - local EPYTEST_DESELECT=( - # broken by epytest args - testing/test_warnings.py::test_works_with_filterwarnings - - # tend to be broken by random pytest plugins - # (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out) - testing/test_helpconfig.py::test_version_less_verbose - testing/test_helpconfig.py::test_version_verbose - testing/test_junitxml.py::test_random_report_log_xdist - testing/test_junitxml.py::test_runs_twice_xdist - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose - testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal - testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info - testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info - - # unstable with xdist - testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist - ) - - epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" -} diff --git a/dev-python/pytest/pytest-7.0.0.ebuild b/dev-python/pytest/pytest-7.0.0.ebuild deleted file mode 100644 index fe5e5f664831..000000000000 --- a/dev-python/pytest/pytest-7.0.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 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 ) - -inherit distutils-r1 multiprocessing - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE="https://pytest.org/"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - dev-python/iniconfig[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] - >=dev-python/py-1.8.2[${PYTHON_USEDEP}] - >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/argcomplete[${PYTHON_USEDEP}] - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/pygments-2.7.2[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/xmlschema[${PYTHON_USEDEP}] - )" - -src_test() { - # workaround new readline defaults - echo "set enable-bracketed-paste off" > "${T}"/inputrc || die - local -x INPUTRC="${T}"/inputrc - distutils-r1_src_test -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x COLUMNS=80 - - local EPYTEST_DESELECT=( - # broken by epytest args - testing/test_warnings.py::test_works_with_filterwarnings - - # tend to be broken by random pytest plugins - # (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out) - testing/test_helpconfig.py::test_version_less_verbose - testing/test_helpconfig.py::test_version_verbose - testing/test_junitxml.py::test_random_report_log_xdist - testing/test_junitxml.py::test_runs_twice_xdist - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count - testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose - testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal - testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info - testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info - - # unstable with xdist - testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist - ) - - epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" -}
