From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jun 2024 00:11:31 +0100 Subject: gentoo auto-resync : 23:06:2024 - 00:11:30 --- dev-python/pytest/Manifest | 8 +- dev-python/pytest/files/pytest-8.2.0-py313.patch | 182 ----------------------- dev-python/pytest/pytest-8.2.0-r1.ebuild | 121 --------------- dev-python/pytest/pytest-8.2.0.ebuild | 141 ------------------ dev-python/pytest/pytest-8.2.1.ebuild | 116 --------------- dev-python/pytest/pytest-8.2.2.ebuild | 2 +- 6 files changed, 2 insertions(+), 568 deletions(-) delete mode 100644 dev-python/pytest/files/pytest-8.2.0-py313.patch delete mode 100644 dev-python/pytest/pytest-8.2.0-r1.ebuild delete mode 100644 dev-python/pytest/pytest-8.2.0.ebuild delete mode 100644 dev-python/pytest/pytest-8.2.1.ebuild (limited to 'dev-python/pytest') diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 9ad76f4684d3..7cb2dd50b792 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -1,16 +1,10 @@ AUX pytest-7.4.3-no-color.patch 1293 BLAKE2B 85ae23dc612eb7825f4c3ba2d727a6115540118269ae2748fcb4b39b958180078f0c171562a84879f7b18da16149fb40d06be36e782abf41133ae6d510414490 SHA512 7550397bb42f08c886dd72674a4bfd53dbe449e30c1fe51358b77eb055d3626c053167a27cc2b0883151a4651b6133be222dcf78cab8675b980c79836f72ae57 -AUX pytest-8.2.0-py313.patch 7120 BLAKE2B 30a5fb396eeb75e50f8b31d21dbf11657a4890105165d94c254cc12e275df56ffafe5926818bce6482e3ac1b13bf69724a005d738ad3b48ea33584db67780a62 SHA512 9508a0bc6659cb63f9b836cb7025672bbfe732be79e539df027a8f2704fd3700faf1d08bbb3d99c7a0c9a65a83cf474c7654c769464e9d4496fdd989a94913be DIST pytest-7.4.4.tar.gz 1357116 BLAKE2B 0bf281b3d4b7b2eb7805423a75c8c2befa820cc230318511e5a2d5ea35321a78a2603d5dbc033414ed73171525371efa9d9f54083d5638fc752c1c218e6d53aa SHA512 28a259dac6739683c131993409d508e10fbfee461291b8fc7697dd83f30725a3c60e681ba00b5669a215af6a5e683f07a329485d780acc9ad0372a6552f783a1 DIST pytest-8.0.2.tar.gz 1396924 BLAKE2B ad95d246f5592cfe54faea6c96e38cb60d3e2713070d1ff7cab6c42aea312883c5d97c99a930dbcbd8493e966c4b8351320f6494b4ab904afbf21d7e1dd004a7 SHA512 c495943baad05e09b467d23c7afadb3edff7ae93ee96290d6db9e64739236888148b63dff7e8e25b331b11bd48c55fb0ca8901cf823d69b1a922e94915bab2f1 DIST pytest-8.1.2.tar.gz 1410060 BLAKE2B 1379047c5ba434e98a383756c53a9cf31dc3bd3abcc49820f872b9110ec70906ca14080ce17ed2770b71195fbd79627a0eb16ee00429e165368144b20153a02b SHA512 a6ffae29da98ee4c357ebb03f00c4bc1a33f093ef867ad118841695548468c7f229eaa2c029a2ce3b158bbb0a65be5014e91555a223d04c1c72e614cb1d00546 -DIST pytest-8.2.0.tar.gz 1422883 BLAKE2B 91f39aa14bfc56f7f98789ef9eeed80d1aa81c864f56181bf1e819b73543043eda307fec53151bf5dbcf8e63abd8dd8ad1290dd245c387cb68583d2160981cf2 SHA512 1a74a2269010804101fc4b8efc370c5d8d484eb145eb4e181feeb1a17046457b97071d2de925c3e8bbd4c6090cd00ca532d69286cb9e10ea023e59a99cd51088 -DIST pytest-8.2.1.tar.gz 1424649 BLAKE2B 56c63526b7bb2c7eb6b260197bb1b52945b92598a9697bc99c053540caf4fcc7432cf70cfa1455da668b38ddf81a7abbac1b91a5e58688640519a16e4155ad6d SHA512 c837b2031c2b198345ce090cc5fcbebd2640a521131a60b882250b70825dc85e5072403a80e9a73f62e429156b57dce405d8400255457c55b14d4a2f700c5331 DIST pytest-8.2.2.tar.gz 1427980 BLAKE2B 7f343e5ff05e4d26f816595ad1c52ee2b79d38029e75e3641ed0bbb7477e0a47e5ae48ebc3058a8e9f374cd1a391d360d9eda73eca2e41d8b533eda7948aedcb SHA512 896192f0d41f3fef49915dfea6ae33dbb939f6bbe54de27861bf1554bf87f910702169293e923af9bc40466e7f806aa19ca54cbe41a848c233f70b52bb86a63c EBUILD pytest-7.4.4.ebuild 3796 BLAKE2B 1bee0d6df20d013802a7de4abc2937af9e3bfe99215d07a9ba888538f8526b6a14f1e4c41554f9a847d47867bb3dea34d8678e9a61a1e6b8fded8f336e21d4da SHA512 74823f180543e26b51739781b369db414ecbd0784d9cd8883ddc053831922001ec120247d7adac275830e5fe836972f7b6dd7c05c018f0ff122c4248b6c1fa3e EBUILD pytest-8.0.2.ebuild 3768 BLAKE2B 504e70b6671111e8d2f7ee0505d56c9dd3da36addfcb27093155c4d83708a36934acddb40d62c770e8fdfe53a59a58181d4ab706d9560bb70217787340c6b99e SHA512 8ec6ec4f723f00eef59966a3c4f5cc57b9eae51f5cb50aa20416741199d6c3dbf7b8f361d17d5bccdc983ff822d0b7432a1993e19eeda066a9fdb0e25d4b03ae EBUILD pytest-8.1.2.ebuild 3749 BLAKE2B 27968ad5f5ead2630694233c690e5df7ef8866a3a6a50a009bda1d3923cf6a10f1372fa24fa9bdc0760bfa7abe1512a9fbd6fb85fd62e0782a9b575d54a58761 SHA512 cacd0f1909ee1cf40d444c628d76921722c4d28ba3a864ccb19909e763a7e66ce8b77cc682fe8333fa97944d8ca9be1c06a94ae7fb1123a0f2c3ed0fc1dd5826 -EBUILD pytest-8.2.0-r1.ebuild 3809 BLAKE2B 8805f0d37486096f6cac4cbf0abfd14e1ba3b1e2fca3e95e2bfa12e6e58281d0551e57fe2b3c87f8b88a0575d0bf317aeb965cb18777bd3ba8e542cb50388682 SHA512 998ed3377518bc5fa38ae553a3c018c6bbf9778df0b6af6506ccef0571a4a551b1d448637ca89e2b95aef31b5a12a4883e653cc1c045e8f43791c1570b4e8456 -EBUILD pytest-8.2.0.ebuild 5038 BLAKE2B 0913b435e5664b207a8f39ba797ebe26c8fe485ba57bae694126898ca4511e142268a65c490ae080bcbe0074a320df7f6e3e759c2f20ca15469b576d2b60c975 SHA512 30c920b2754bdbc99316a73aed5fcc80e6101140c36ccaa148683ae34d9056d39d3408178ef590ce044c20c9b498657f3ae43fa7461c7fbb3ed6a00158ee4d54 -EBUILD pytest-8.2.1.ebuild 3713 BLAKE2B 4ee4d1bd29667578c688f0a73f0deced876fff31bd0ee2e3f401c499f9c1c6c764b05312d6c0c3795296e33d1a2005cda673363beff4650e428b06d5af230cf0 SHA512 e5ad570d2b58d82bf1562a2f2e034186b8b980f4081d18565ec6d87b1d1ff485468f176a7a38ac8e046d72aadff1ba9b2c04554abc18775db913102b52c1aaa7 -EBUILD pytest-8.2.2.ebuild 3713 BLAKE2B 4ee4d1bd29667578c688f0a73f0deced876fff31bd0ee2e3f401c499f9c1c6c764b05312d6c0c3795296e33d1a2005cda673363beff4650e428b06d5af230cf0 SHA512 e5ad570d2b58d82bf1562a2f2e034186b8b980f4081d18565ec6d87b1d1ff485468f176a7a38ac8e046d72aadff1ba9b2c04554abc18775db913102b52c1aaa7 +EBUILD pytest-8.2.2.ebuild 3705 BLAKE2B 14770adebd7894a5d649fb45edf27c52d1f84748614eb78d3965bd96c920e0266e30f0701f309c069f1e223a5e29adbb4a6eeb9df4736c828f61801512501a3c SHA512 b6346fe715168390cc0bd46e49d6b6f9270c84b7d736faf8e9733382c1eca1cb62c51f25301a5fc6c61041fbdf0d11c886b0205a7de50940c9a6b93133940d44 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425 diff --git a/dev-python/pytest/files/pytest-8.2.0-py313.patch b/dev-python/pytest/files/pytest-8.2.0-py313.patch deleted file mode 100644 index 196fb9a7422f..000000000000 --- a/dev-python/pytest/files/pytest-8.2.0-py313.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py -index b80d53ca5f..cfa226bb74 100644 ---- a/src/_pytest/_code/code.py -+++ b/src/_pytest/_code/code.py -@@ -424,15 +424,14 @@ def recursionindex(self) -> Optional[int]: - # which generates code objects that have hash/value equality - # XXX needs a test - key = entry.frame.code.path, id(entry.frame.code.raw), entry.lineno -- # print "checking for recursion at", key - values = cache.setdefault(key, []) -+ # Since Python 3.13 f_locals is a proxy, freeze it. -+ loc = dict(entry.frame.f_locals) - if values: -- f = entry.frame -- loc = f.f_locals - for otherloc in values: - if otherloc == loc: - return i -- values.append(entry.frame.f_locals) -+ values.append(loc) - return None - - -diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py -index 31c6de7819..f9ab007a4d 100644 ---- a/src/_pytest/pytester.py -+++ b/src/_pytest/pytester.py -@@ -289,7 +289,8 @@ def assert_contains(self, entries: Sequence[Tuple[str, str]]) -> None: - __tracebackhide__ = True - i = 0 - entries = list(entries) -- backlocals = sys._getframe(1).f_locals -+ # Since Python 3.13, f_locals is not a dict, but eval requires a dict. -+ backlocals = dict(sys._getframe(1).f_locals) - while entries: - name, check = entries.pop(0) - for ind, call in enumerate(self.calls[i:]): -@@ -760,6 +761,9 @@ def _makefile( - ) -> Path: - items = list(files.items()) - -+ if ext is None: -+ raise TypeError("ext must not be None") -+ - if ext and not ext.startswith("."): - raise ValueError( - f"pytester.makefile expects a file extension, try .{ext} instead of {ext}" -diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py -index 86e30dc483..b547451298 100644 ---- a/testing/code/test_excinfo.py -+++ b/testing/code/test_excinfo.py -@@ -1,6 +1,7 @@ - # mypy: allow-untyped-defs - from __future__ import annotations - -+import fnmatch - import importlib - import io - import operator -@@ -237,7 +238,7 @@ def f(n): - n += 1 - f(n) - -- excinfo = pytest.raises(RuntimeError, f, 8) -+ excinfo = pytest.raises(RecursionError, f, 8) - traceback = excinfo.traceback - recindex = traceback.recursionindex() - assert recindex == 3 -@@ -373,7 +374,10 @@ def test_excinfo_no_sourcecode(): - except ValueError: - excinfo = _pytest._code.ExceptionInfo.from_current() - s = str(excinfo.traceback[-1]) -- assert s == " File '':1 in \n ???\n" -+ # TODO: Since Python 3.13b1 under pytest-xdist, the * is `import -+ # sys;exec(eval(sys.stdin.readline()))` (execnet bootstrap code) -+ # instead of `???` like before. Is this OK? -+ fnmatch.fnmatch(s, " File '':1 in \n *\n") - - - def test_excinfo_no_python_sourcecode(tmp_path: Path) -> None: -diff --git a/testing/code/test_source.py b/testing/code/test_source.py -index 2fa8520579..a00259976c 100644 ---- a/testing/code/test_source.py -+++ b/testing/code/test_source.py -@@ -370,7 +370,11 @@ class B: - pass - - B.__name__ = B.__qualname__ = "B2" -- assert getfslineno(B)[1] == -1 -+ # Since Python 3.13 this started working. -+ if sys.version_info >= (3, 13): -+ assert getfslineno(B)[1] != -1 -+ else: -+ assert getfslineno(B)[1] == -1 - - - def test_code_of_object_instance_with_call() -> None: -diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py -index d7815f77b9..8728ae84fd 100644 ---- a/testing/test_cacheprovider.py -+++ b/testing/test_cacheprovider.py -@@ -194,7 +194,7 @@ def test_custom_cache_dir_with_env_var( - assert pytester.path.joinpath("custom_cache_dir").is_dir() - - --@pytest.mark.parametrize("env", ((), ("TOX_ENV_DIR", "/tox_env_dir"))) -+@pytest.mark.parametrize("env", ((), ("TOX_ENV_DIR", "mydir/tox-env"))) - def test_cache_reportheader( - env: Sequence[str], pytester: Pytester, monkeypatch: MonkeyPatch - ) -> None: -diff --git a/testing/test_doctest.py b/testing/test_doctest.py -index d731121795..9b33d641a1 100644 ---- a/testing/test_doctest.py -+++ b/testing/test_doctest.py -@@ -224,11 +224,7 @@ def test_doctest_unexpected_exception(self, pytester: Pytester): - "Traceback (most recent call last):", - ' File "*/doctest.py", line *, in __run', - " *", -- *( -- (" *^^^^*",) -- if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11) -- else () -- ), -+ *((" *^^^^*", " *", " *") if sys.version_info >= (3, 13) else ()), - ' File "", line 1, in ', - "ZeroDivisionError: division by zero", - "*/test_doctest_unexpected_exception.txt:2: UnexpectedException", -@@ -385,7 +381,7 @@ def some_property(self): - "*= FAILURES =*", - "*_ [[]doctest[]] test_doctest_linedata_on_property.Sample.some_property _*", - "004 ", -- "005 >>> Sample().some_property", -+ "005 *>>> Sample().some_property", - "Expected:", - " 'another thing'", - "Got:", -diff --git a/testing/test_main.py b/testing/test_main.py -index 345aa1e62c..6294f66b36 100644 ---- a/testing/test_main.py -+++ b/testing/test_main.py -@@ -3,7 +3,6 @@ - import os - from pathlib import Path - import re --import sys - from typing import Optional - - from _pytest.config import ExitCode -@@ -45,32 +44,18 @@ def pytest_internalerror(excrepr, excinfo): - assert result.ret == ExitCode.INTERNAL_ERROR - assert result.stdout.lines[0] == "INTERNALERROR> Traceback (most recent call last):" - -- end_lines = ( -- result.stdout.lines[-4:] -- if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11) -- else result.stdout.lines[-3:] -- ) -+ end_lines = result.stdout.lines[-3:] - - if exc == SystemExit: - assert end_lines == [ - f'INTERNALERROR> File "{c1}", line 4, in pytest_sessionstart', - 'INTERNALERROR> raise SystemExit("boom")', -- *( -- ("INTERNALERROR> ^^^^^^^^^^^^^^^^^^^^^^^^",) -- if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11) -- else () -- ), - "INTERNALERROR> SystemExit: boom", - ] - else: - assert end_lines == [ - f'INTERNALERROR> File "{c1}", line 4, in pytest_sessionstart', - 'INTERNALERROR> raise ValueError("boom")', -- *( -- ("INTERNALERROR> ^^^^^^^^^^^^^^^^^^^^^^^^",) -- if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11) -- else () -- ), - "INTERNALERROR> ValueError: boom", - ] - if returncode is False: diff --git a/dev-python/pytest/pytest-8.2.0-r1.ebuild b/dev-python/pytest/pytest-8.2.0-r1.ebuild deleted file mode 100644 index a50c705d49bb..000000000000 --- a/dev-python/pytest/pytest-8.2.0-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..13} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -inherit distutils-r1 pypi - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE=" - https://pytest.org/ - https://github.com/pytest-dev/pytest/ - https://pypi.org/project/pytest/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/iniconfig[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - =dev-python/pluggy-1.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}] - >=dev-python/tomli-1[${PYTHON_USEDEP}] - ' 3.10) - !!<=dev-python/flaky-3.7.0-r5 -" -BDEPEND=" - >=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - $(python_gen_cond_dep ' - dev-python/argcomplete[${PYTHON_USEDEP}] - >=dev-python/attrs-19.2[${PYTHON_USEDEP}] - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/mock[${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}] - ' "${PYTHON_TESTED[@]}") - ) -" - -PATCHES=( - # https://github.com/pytest-dev/pytest/pull/12334 - "${FILESDIR}/${P}-py313.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() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping tests on ${EPYTHON}" - return - fi - - 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 - - # TODO (XPASS) - testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered - testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple - testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice - testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug - testing/test_debugging.py::test_pdb_suspends_fixture_capturing - - # setuptools warnings - testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package - - # PDB tests seem quite flaky (they time out often) - testing/test_debugging.py::TestPDB - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # regressions on pypy3.9 - # https://github.com/pytest-dev/pytest/issues/9787 - testing/test_skipping.py::test_errors_in_xfail_skip_expressions - testing/test_unraisableexception.py - ) - ;; - esac - - local EPYTEST_XDIST=1 - epytest -} diff --git a/dev-python/pytest/pytest-8.2.0.ebuild b/dev-python/pytest/pytest-8.2.0.ebuild deleted file mode 100644 index 54e62aabbc4d..000000000000 --- a/dev-python/pytest/pytest-8.2.0.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..13} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -inherit distutils-r1 pypi - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE=" - https://pytest.org/ - https://github.com/pytest-dev/pytest/ - https://pypi.org/project/pytest/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/iniconfig[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - =dev-python/pluggy-1.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}] - >=dev-python/tomli-1[${PYTHON_USEDEP}] - ' 3.10) - !!<=dev-python/flaky-3.7.0-r5 -" -BDEPEND=" - >=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - $(python_gen_cond_dep ' - dev-python/argcomplete[${PYTHON_USEDEP}] - >=dev-python/attrs-19.2[${PYTHON_USEDEP}] - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/mock[${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}] - ' "${PYTHON_TESTED[@]}") - ) -" - -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() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping tests on ${EPYTHON}" - return - fi - - 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 - - # TODO (XPASS) - testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered - testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple - testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice - testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug - testing/test_debugging.py::test_pdb_suspends_fixture_capturing - - # setuptools warnings - testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package - - # times out - testing/test_debugging.py::TestPDB::test_pdb_interaction_exception - testing/test_debugging.py::TestPDB::test_pdb_with_caplog_on_pdb_invocation - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # regressions on pypy3.9 - # https://github.com/pytest-dev/pytest/issues/9787 - testing/test_skipping.py::test_errors_in_xfail_skip_expressions - testing/test_unraisableexception.py - ) - ;; - python3.13) - EPYTEST_DESELECT+=( - # regressions reproduced via `tox -e py313` - # https://github.com/pytest-dev/pytest/issues/12323 - testing/code/test_excinfo.py::TestFormattedExcinfo::test_repr_traceback_recursion - testing/code/test_excinfo.py::TestTraceback_f_g_h::test_traceback_recursion_index - testing/code/test_excinfo.py::test_exception_repr_extraction_error_on_recursion - testing/code/test_source.py::test_getfslineno - testing/test_collection.py::TestSession::test_collect_custom_nodes_multi_id - testing/test_collection.py::TestSession::test_collect_protocol_single_function - testing/test_collection.py::TestSession::test_collect_subdir_event_ordering - testing/test_collection.py::TestSession::test_collect_two_commandline_args - testing/test_doctest.py::TestDoctests::test_doctest_linedata_on_property - testing/test_doctest.py::TestDoctests::test_doctest_unexpected_exception - testing/test_legacypath.py::test_testdir_makefile_ext_none_raises_type_error - - # TODO? - testing/code/test_excinfo.py::test_excinfo_no_sourcecode - - # more weird timeouts - testing/test_debugging.py::TestPDB::test_pdb_used_outside_test - testing/test_debugging.py::TestPDB::test_pdb_used_in_generate_tests - ) - ;; - esac - - local EPYTEST_XDIST=1 - epytest -} diff --git a/dev-python/pytest/pytest-8.2.1.ebuild b/dev-python/pytest/pytest-8.2.1.ebuild deleted file mode 100644 index a6ff2735eb2d..000000000000 --- a/dev-python/pytest/pytest-8.2.1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..13} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -inherit distutils-r1 pypi - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE=" - https://pytest.org/ - https://github.com/pytest-dev/pytest/ - https://pypi.org/project/pytest/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/iniconfig[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - =dev-python/pluggy-1.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}] - >=dev-python/tomli-1[${PYTHON_USEDEP}] - ' 3.10) - !!<=dev-python/flaky-3.7.0-r5 -" -BDEPEND=" - >=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - $(python_gen_cond_dep ' - dev-python/argcomplete[${PYTHON_USEDEP}] - >=dev-python/attrs-19.2[${PYTHON_USEDEP}] - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/mock[${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}] - ' "${PYTHON_TESTED[@]}") - ) -" - -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() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping tests on ${EPYTHON}" - return - fi - - 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 - - # TODO (XPASS) - testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered - testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple - testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice - testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug - testing/test_debugging.py::test_pdb_suspends_fixture_capturing - - # setuptools warnings - testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package - - # PDB tests seem quite flaky (they time out often) - testing/test_debugging.py::TestPDB - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # regressions on pypy3.9 - # https://github.com/pytest-dev/pytest/issues/9787 - testing/test_skipping.py::test_errors_in_xfail_skip_expressions - testing/test_unraisableexception.py - ) - ;; - esac - - local EPYTEST_XDIST=1 - epytest -} diff --git a/dev-python/pytest/pytest-8.2.2.ebuild b/dev-python/pytest/pytest-8.2.2.ebuild index a6ff2735eb2d..b5226eac655b 100644 --- a/dev-python/pytest/pytest-8.2.2.ebuild +++ b/dev-python/pytest/pytest-8.2.2.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" -- cgit v1.2.3