commit: 98fd627291edca88fa55a89a1029d4fa77c54b67 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue May 20 17:15:31 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue May 20 17:17:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fd6272
dev-python/pytest: Workaround the PyPy OrderedDict.move_to_end bug Bug: https://github.com/pytest-dev/pytest/issues/13312 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pytest/files/pytest-8.3.5-pypy.patch | 17 ++++ dev-python/pytest/pytest-8.3.5-r1.ebuild | 129 ++++++++++++++++++++++++ 2 files changed, 146 insertions(+) diff --git a/dev-python/pytest/files/pytest-8.3.5-pypy.patch b/dev-python/pytest/files/pytest-8.3.5-pypy.patch new file mode 100644 index 000000000000..eb665396b6b4 --- /dev/null +++ b/dev-python/pytest/files/pytest-8.3.5-pypy.patch @@ -0,0 +1,17 @@ +diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py +index 6b882fa35..985e45ce3 100644 +--- a/src/_pytest/fixtures.py ++++ b/src/_pytest/fixtures.py +@@ -278,6 +278,12 @@ def reorder_items_atscope( + for other_scope in HIGH_SCOPES: + other_scoped_items_by_argkey = items_by_argkey[other_scope] + for argkey in argkeys_by_item[other_scope].get(i, ()): ++ if hasattr(sys, "pypy_version_info"): ++ # Gentoo workaround for https://github.com/pytest-dev/pytest/issues/13312 ++ del other_scoped_items_by_argkey[argkey][i] ++ new_dict = OrderedDict({i: None}) ++ new_dict.update(other_scoped_items_by_argkey[argkey]) ++ continue + other_scoped_items_by_argkey[argkey][i] = None + other_scoped_items_by_argkey[argkey].move_to_end( + i, last=False diff --git a/dev-python/pytest/pytest-8.3.5-r1.ebuild b/dev-python/pytest/pytest-8.3.5-r1.ebuild new file mode 100644 index 000000000000..9586f6b6a98e --- /dev/null +++ b/dev-python/pytest/pytest-8.3.5-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_TESTED=( python3_{11..14} pypy3_11 ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_{13,14}t ) + +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 ~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-2[${PYTHON_USEDEP}] + >=dev-python/pluggy-1.5.0[${PYTHON_USEDEP}] +" +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/13291 + "${FILESDIR}/${P}-test.patch" + # workaround https://github.com/pytest-dev/pytest/issues/13312 + "${FILESDIR}/${P}-pypy.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 + + # does not like verbosity + testing/test_assertrewrite.py::TestAssertionRewrite::test_len + + # 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 + ) + ;; + python3.14*) + EPYTEST_DESELECT+=( + # still broken on main, as of 2025-05-14 + testing/test_unraisableexception.py::test_unraisable + testing/test_unraisableexception.py::test_unraisable_in_setup + testing/test_unraisableexception.py::test_unraisable_in_teardown + testing/test_debugging.py::test_raises_bdbquit_with_eoferror + ) + ;; + esac + + local EPYTEST_XDIST=1 + epytest +}
