* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2018-07-11 22:11 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2018-07-11 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 523a3d6756d152fe4063c9e6ccc46e225c0aa55d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 17:35:50 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 22:11:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=523a3d67
dev-python/pytest: Add PyPy test fix from Debian
Thanks to sbraz for finding the patch.
.../pytest-3.4.2-pypy-syntaxerror-offset.patch | 27 ++++++++++++++++++++++
dev-python/pytest/pytest-3.4.2.ebuild | 4 ++++
2 files changed, 31 insertions(+)
diff --git a/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch
new file mode 100644
index 00000000000..622be56b4e5
--- /dev/null
+++ b/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch
@@ -0,0 +1,27 @@
+https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch
+
+From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
+Date: Thu, 10 May 2018 11:42:56 +0200
+Subject: [PATCH] Fix PyPy SyntaxError offset in tests
+
+---
+ testing/code/test_source.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/code/test_source.py b/testing/code/test_source.py
+index fcce3fa..22278d8 100644
+--- a/testing/code/test_source.py
++++ b/testing/code/test_source.py
+@@ -117,7 +117,7 @@ def test_source_strip_multiline():
+ def test_syntaxerror_rerepresentation():
+ ex = pytest.raises(SyntaxError, _pytest._code.compile, 'xyz xyz')
+ assert ex.value.lineno == 1
+- assert ex.value.offset in (4, 7) # XXX pypy/jython versus cpython?
++ assert ex.value.offset in (4, 5, 7) # XXX pypy/jython versus cpython?
+ assert ex.value.text.strip(), 'x x'
+
+
+--
+2.18.0
+
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index c543591cc90..9fb19f1d81b 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -45,6 +45,10 @@ RDEPEND="
!<dev-python/logilab-common-1.3.0"
python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/pytest-3.4.2-pypy-syntaxerror-offset.patch
+ )
+
chmod o-w *egg*/* || die
# Disable versioning of py.test script to avoid collision with
# versioning performed by the eclass.
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2019-07-06 8:43 Tim Harder
0 siblings, 0 replies; 10+ messages in thread
From: Tim Harder @ 2019-07-06 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 4818521b420beba9029ed5a595d5060367c8f1ba
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 08:40:45 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 08:43:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4818521b
dev-python/pytest: remove old
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
dev-python/pytest/Manifest | 2 -
.../pytest-3.4.2-pypy-syntaxerror-offset.patch | 27 -------
dev-python/pytest/pytest-3.4.2.ebuild | 87 ----------------------
dev-python/pytest/pytest-4.4.2.ebuild | 63 ----------------
4 files changed, 179 deletions(-)
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index c0a94469f60..607a625f644 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,4 +1,2 @@
DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
-DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
-DIST pytest-4.4.2.tar.gz 932427 BLAKE2B 89734bc49bbfb40de1e613678682e3c5994e1991abfa6c6aac5e9d67c58db874a91c03c05ab15cb1b70680289b409db6546c3540d33a50791a882be0e2621e2c SHA512 14a5a93fef129f58f37686b39ae1bfa3a32bc81f7ee83b6f754e0d7f18e85c0c7f44f12651dc9b3eb2ff62ab4aca5665b33e1c319051c7d8e3d5e004047150ec
DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
diff --git a/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch
deleted file mode 100644
index 622be56b4e5..00000000000
--- a/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch
-
-From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
-Date: Thu, 10 May 2018 11:42:56 +0200
-Subject: [PATCH] Fix PyPy SyntaxError offset in tests
-
----
- testing/code/test_source.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/code/test_source.py b/testing/code/test_source.py
-index fcce3fa..22278d8 100644
---- a/testing/code/test_source.py
-+++ b/testing/code/test_source.py
-@@ -117,7 +117,7 @@ def test_source_strip_multiline():
- def test_syntaxerror_rerepresentation():
- ex = pytest.raises(SyntaxError, _pytest._code.compile, 'xyz xyz')
- assert ex.value.lineno == 1
-- assert ex.value.offset in (4, 7) # XXX pypy/jython versus cpython?
-+ assert ex.value.offset in (4, 5, 7) # XXX pypy/jython versus cpython?
- assert ex.value.text.strip(), 'x x'
-
-
---
-2.18.0
-
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
deleted file mode 100644
index 05a7c58b090..00000000000
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-COMMON_DEPEND="
- >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
- >=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
- <dev-python/pluggy-0.7
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- virtual/python-funcsigs[${PYTHON_USEDEP}]
- doc? (
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${COMMON_DEPEND}
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- >=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- !!dev-python/flaky
- !!dev-python/pytest-capturelog
- )"
-
-RDEPEND="
- ${COMMON_DEPEND}
- !<dev-python/logilab-common-1.3.0"
-
-python_prepare_all() {
- local PATCHES=(
- "${FILESDIR}"/pytest-3.4.2-pypy-syntaxerror-offset.patch
- )
-
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
- # Something in the ebuild environment causes this to hang/error.
- # https://bugs.gentoo.org/598442
- rm testing/test_pdb.py || die
-
- # broken and disabled upstream
- # https://github.com/pytest-dev/pytest/commit/321f66f71148c978c1bf45dace61886b5e263bd4
- sed -i -e 's:test_wrapped_getfuncargnames_patching:_&:' \
- testing/python/integration.py || die
-
- # those tests appear to hang with python3.5+; TODO: investigate why
- sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
- testing/test_terminal.py || die
- sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
- -vv testing || die "tests failed with ${EPYTHON}"
-}
-
-python_compile_all(){
- use doc && emake -C doc/en html
-}
-
-python_install_all() {
- use doc && HTML_DOCS=( doc/en/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-4.4.2.ebuild b/dev-python/pytest/pytest-4.4.2.ebuild
deleted file mode 100644
index 9c6fd6af78f..00000000000
--- a/dev-python/pytest/pytest-4.4.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
- >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
- >=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
- >=dev-python/setuptools-40[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${RDEPEND}
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
- dev-python/requests[${PYTHON_USEDEP}]
- !!dev-python/flaky
- !!<dev-python/pytest-xdist-1.22
- )"
-
-python_prepare_all() {
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
- # Something in the ebuild environment causes this to hang/error.
- # https://bugs.gentoo.org/598442
- rm testing/test_pdb.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # In v4.1.1, pytest started being picky about its own verbosity options.
- # running pytest on itself with -vv made 3 tests fail. This is why we don't
- # have it below.
- "${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
- || die "tests failed with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2019-11-27 13:17 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-11-27 13:17 UTC (permalink / raw
To: gentoo-commits
commit: d6df2aeba6c0a5aa9b88e706a76b2c535832dc46
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 12:31:47 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 13:17:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6df2aeb
dev-python/pytest: Remove redudant version
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest/Manifest | 1 -
.../files/pytest-5.0.1-test_xfail_rmdir.patch | 38 ------------
dev-python/pytest/pytest-5.0.1.ebuild | 68 ----------------------
3 files changed, 107 deletions(-)
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index ae1fac75058..0a0234192f6 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,4 @@
DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
DIST pytest-4.6.6.tar.gz 954899 BLAKE2B d3d76ec1fff18d343cc799f1acd0889489f303cdba72747881dfab8656599bc1865f01b5ad2754f0d05bda04aca4d7edf8c2071f2257fdf41506308d1bc0f623 SHA512 c5b6c21c352787eadce06be7529ecb6f6fd5f5eb193ec29e5a4cfff3d7e305f50c6f07aeac15bddce007d88077a35a8f59633111815321792ed3d9fa1011b684
-DIST pytest-5.0.1.tar.gz 949744 BLAKE2B c949f0fb6bc0d1430ec7c780537f8aee8ca1ebea5f89035d882434236c6af7d431a610774dbafa93552406e38852627a9f949a6f9198a792de9371efadb4f6ff SHA512 92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db
DIST pytest-5.3.0.tar.gz 992537 BLAKE2B 4386d1623bdc168313a75847dfa33413ab1b6a4de9380c67ae866a579dbeb62d8cd18da899bf0476827d6e4a76ddfc5fee7a2fdc652eff0c8848c0bd96045c47 SHA512 285d0b4f6b87b141d6d5dac368dc46eb80dd025d7ed4ad0db937fcc76efc1f8cf251ca9b0786ab1bdadd89c07ad8ddd74f2b3496f97326e9d7fccfd004b98aff
diff --git a/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch b/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch
deleted file mode 100644
index 5c6154cd92c..00000000000
--- a/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ab39502c98f40c03a2956dcf6c6b9daf5ee41a63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Fri, 26 Jul 2019 02:23:14 +0200
-Subject: [PATCH] In test_xfail_handling, only remove __pycache__ if it exists
-
-Previously, the test failed when the directory was not present,
-which could have been caused for example by invoking the tests
-with PYTHONDONTWRITEBYTECODE=1.
-
-Fixes https://github.com/pytest-dev/pytest/issues/5664
----
- changelog/5664.trivial.rst | 2 ++
- testing/test_stepwise.py | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 changelog/5664.trivial.rst
-
-diff --git a/changelog/5664.trivial.rst b/changelog/5664.trivial.rst
-new file mode 100644
-index 000000000..3928454ef
---- /dev/null
-+++ b/changelog/5664.trivial.rst
-@@ -0,0 +1,2 @@
-+When invoking pytest's own testsuite with ``PYTHONDONTWRITEBYTECODE=1``,
-+the ``test_xfail_handling`` test no longer fails.
-diff --git a/testing/test_stepwise.py b/testing/test_stepwise.py
-index 591d67b6c..f61425b6b 100644
---- a/testing/test_stepwise.py
-+++ b/testing/test_stepwise.py
-@@ -207,7 +207,8 @@ def test_d(): pass
-
- # because we are writing to the same file, mtime might not be affected enough to
- # invalidate the cache, making this next run flaky
-- testdir.tmpdir.join("__pycache__").remove()
-+ if testdir.tmpdir.join("__pycache__").exists():
-+ testdir.tmpdir.join("__pycache__").remove()
- testdir.makepyfile(contents.format(assert_value="0", strict="True"))
- result = testdir.runpytest("--sw", "-v")
- result.stdout.fnmatch_lines(
diff --git a/dev-python/pytest/pytest-5.0.1.ebuild b/dev-python/pytest/pytest-5.0.1.ebuild
deleted file mode 100644
index 15641dad00a..00000000000
--- a/dev-python/pytest/pytest-5.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
- >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 )
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
- <dev-python/pluggy-1
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
- virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="${RDEPEND}
- test? (
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- >=dev-python/setuptools-40[${PYTHON_USEDEP}]
- !!dev-python/flaky
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
- "${FILESDIR}/${PN}"-5.0.1-test_xfail_rmdir.patch
-)
-
-python_prepare_all() {
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
- # Something in the ebuild environment causes this to hang/error.
- # https://bugs.gentoo.org/598442
- rm testing/test_pdb.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv --lsof -rfsxX \
- || die "tests failed with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2020-05-27 6:11 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2020-05-27 6:11 UTC (permalink / raw
To: gentoo-commits
commit: dec727090083f7a7e3e3fa1d2dfd26ad8ff5be50
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 06:10:11 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 27 06:10:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec72709
dev-python/pytest: Increase timeouts in 4.6.10 for slower machines
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../pytest/files/pytest-4.6.10-timeout.patch | 35 ++++++++++++++++++++++
dev-python/pytest/pytest-4.6.10.ebuild | 1 +
2 files changed, 36 insertions(+)
diff --git a/dev-python/pytest/files/pytest-4.6.10-timeout.patch b/dev-python/pytest/files/pytest-4.6.10-timeout.patch
new file mode 100644
index 00000000000..5bf9bcdbd8f
--- /dev/null
+++ b/dev-python/pytest/files/pytest-4.6.10-timeout.patch
@@ -0,0 +1,35 @@
+diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
+index f1d739c99..72406b85d 100644
+--- a/src/_pytest/pytester.py
++++ b/src/_pytest/pytester.py
+@@ -1209,7 +1209,7 @@ class Testdir(object):
+ args = self._getpytestargs() + args
+ return self.run(*args, timeout=timeout)
+
+- def spawn_pytest(self, string, expect_timeout=10.0):
++ def spawn_pytest(self, string, expect_timeout=60.0):
+ """Run pytest using pexpect.
+
+ This makes sure to use the right pytest and sets up the temporary
+@@ -1223,7 +1223,7 @@ class Testdir(object):
+ cmd = "%s --basetemp=%s %s" % (invoke, basetemp, string)
+ return self.spawn(cmd, expect_timeout=expect_timeout)
+
+- def spawn(self, cmd, expect_timeout=10.0):
++ def spawn(self, cmd, expect_timeout=60.0):
+ """Run a command using pexpect.
+
+ The pexpect child is returned.
+diff --git a/testing/test_terminal.py b/testing/test_terminal.py
+index 1b2e46c7c..52ba80f46 100644
+--- a/testing/test_terminal.py
++++ b/testing/test_terminal.py
+@@ -138,7 +138,7 @@ class TestTerminal(object):
+ """
+ def test_1():
+ import time
+- time.sleep(20)
++ time.sleep(120)
+ """
+ )
+ child = testdir.spawn_pytest("")
diff --git a/dev-python/pytest/pytest-4.6.10.ebuild b/dev-python/pytest/pytest-4.6.10.ebuild
index 76710136e68..c8234af1fa7 100644
--- a/dev-python/pytest/pytest-4.6.10.ebuild
+++ b/dev-python/pytest/pytest-4.6.10.ebuild
@@ -60,6 +60,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
+ "${FILESDIR}/${P}-timeout.patch"
)
python_prepare_all() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2021-06-02 19:46 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2021-06-02 19:46 UTC (permalink / raw
To: gentoo-commits
commit: e0908b325e223a6a3e19d7e0c82472763ef8e879
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 2 17:31:01 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 2 19:46:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0908b32
dev-python/pytest: Backport additional py3.10 fix
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest/files/pytest-6.2.4-py310.patch | 34 ++++++++++++++++++++++
...{pytest-6.2.4.ebuild => pytest-6.2.4-r1.ebuild} | 4 +++
2 files changed, 38 insertions(+)
diff --git a/dev-python/pytest/files/pytest-6.2.4-py310.patch b/dev-python/pytest/files/pytest-6.2.4-py310.patch
new file mode 100644
index 00000000000..88c8f703f08
--- /dev/null
+++ b/dev-python/pytest/files/pytest-6.2.4-py310.patch
@@ -0,0 +1,34 @@
+From 78fb97105f38dc286353bbc331a243b6e753fe3c Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <encukou@gmail.com>
+Date: Wed, 6 Jan 2021 13:33:33 +0100
+Subject: [PATCH] Make code.FormattedExcinfo.get_source more defensive
+
+When line_index was a large negative number, get_source failed
+on `source.lines[line_index]`.
+Use the same dummy Source as with a large positive line_index.
+---
+ src/_pytest/_code/code.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
+index b85217560..af3bdf056 100644
+--- a/src/_pytest/_code/code.py
++++ b/src/_pytest/_code/code.py
+@@ -721,11 +721,11 @@ class FormattedExcinfo:
+ ) -> List[str]:
+ """Return formatted and marked up source lines."""
+ lines = []
+- if source is None or line_index >= len(source.lines):
++ if source is not None and line_index < 0:
++ line_index += len(source.lines)
++ if source is None or line_index >= len(source.lines) or line_index < 0:
+ source = Source("???")
+ line_index = 0
+- if line_index < 0:
+- line_index += len(source)
+ space_prefix = " "
+ if short:
+ lines.append(space_prefix + source.lines[line_index].strip())
+--
+2.31.1
+
diff --git a/dev-python/pytest/pytest-6.2.4.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild
similarity index 97%
rename from dev-python/pytest/pytest-6.2.4.ebuild
rename to dev-python/pytest/pytest-6.2.4-r1.ebuild
index 267da87475f..ced1fbce5e5 100644
--- a/dev-python/pytest/pytest-6.2.4.ebuild
+++ b/dev-python/pytest/pytest-6.2.4-r1.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
' python3_{7..9} pypy3)
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-py310.patch
+)
+
src_test() {
# workaround new readline defaults
echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2021-10-03 19:24 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2021-10-03 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 77eebc053692f00806261bdd31338ec0c084eb13
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 3 19:24:01 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 3 19:24:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77eebc05
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.4-py310.patch | 34 -------------
dev-python/pytest/pytest-6.1.2.ebuild | 62 -----------------------
dev-python/pytest/pytest-6.2.4-r1.ebuild | 64 ------------------------
4 files changed, 162 deletions(-)
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 2c7f84ba17c..8341a16b4b5 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,4 +1,2 @@
DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
-DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
-DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9
diff --git a/dev-python/pytest/files/pytest-6.2.4-py310.patch b/dev-python/pytest/files/pytest-6.2.4-py310.patch
deleted file mode 100644
index 88c8f703f08..00000000000
--- a/dev-python/pytest/files/pytest-6.2.4-py310.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 78fb97105f38dc286353bbc331a243b6e753fe3c Mon Sep 17 00:00:00 2001
-From: Petr Viktorin <encukou@gmail.com>
-Date: Wed, 6 Jan 2021 13:33:33 +0100
-Subject: [PATCH] Make code.FormattedExcinfo.get_source more defensive
-
-When line_index was a large negative number, get_source failed
-on `source.lines[line_index]`.
-Use the same dummy Source as with a large positive line_index.
----
- src/_pytest/_code/code.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
-index b85217560..af3bdf056 100644
---- a/src/_pytest/_code/code.py
-+++ b/src/_pytest/_code/code.py
-@@ -721,11 +721,11 @@ class FormattedExcinfo:
- ) -> List[str]:
- """Return formatted and marked up source lines."""
- lines = []
-- if source is None or line_index >= len(source.lines):
-+ if source is not None and line_index < 0:
-+ line_index += len(source.lines)
-+ if source is None or line_index >= len(source.lines) or line_index < 0:
- source = Source("???")
- line_index = 0
-- if line_index < 0:
-- line_index += len(source)
- space_prefix = " "
- if short:
- lines.append(space_prefix + source.lines[line_index].strip())
---
-2.31.1
-
diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild
deleted file mode 100644
index 21b4753e5aa..00000000000
--- a/dev-python/pytest/pytest-6.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-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 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' python3_{6,7} pypy3)
- 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/pluggy-1
- >=dev-python/py-1.8.2[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
- dev-python/setuptools_scm[${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/requests[${PYTHON_USEDEP}]
- dev-python/xmlschema[${PYTHON_USEDEP}]
- !!dev-python/flaky
- )"
-
-python_prepare_all() {
- # fragile to warnings from other packages (setuptools)
- # little value for us to run it
- sed -i -e 's:test_no_warnings:_&:' \
- testing/test_meta.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
-
- "${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
- die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.2.4-r1.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild
deleted file mode 100644
index ac093bcc4d5..00000000000
--- a/dev-python/pytest/pytest-6.2.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-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}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' python3_7 pypy3)
- 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/pluggy-1
- >=dev-python/py-1.8.2[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/argcomplete[${PYTHON_USEDEP}]
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/xmlschema[${PYTHON_USEDEP}]
- ' python3_{7..9} pypy3)
- )"
-
-PATCHES=(
- "${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() {
- [[ ${EPYTHON} == python3.10 ]] && return
-
- distutils_install_for_testing --via-root
-
- "${EPYTHON}" -m pytest -vv --lsof -rfsxX -p no:pkgcore -p no:flaky ||
- die "Tests failed with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2022-05-13 12:29 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2022-05-13 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 818f429dfdb68c618435465e4ea7ee122a6172f9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 11:56:31 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 13 12:29:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818f429d
dev-python/pytest: Enable py3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest/files/pytest-7.1.2-py311.patch | 28 ++++++++++++++++++++++++
dev-python/pytest/pytest-7.1.2.ebuild | 9 +++++---
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/dev-python/pytest/files/pytest-7.1.2-py311.patch b/dev-python/pytest/files/pytest-7.1.2-py311.patch
new file mode 100644
index 000000000000..ecae07b9ce24
--- /dev/null
+++ b/dev-python/pytest/files/pytest-7.1.2-py311.patch
@@ -0,0 +1,28 @@
+From 2f8ae29c173ea8335a1e0cc7027a76032429e8f9 Mon Sep 17 00:00:00 2001
+From: "github-actions[bot]"
+ <41898282+github-actions[bot]@users.noreply.github.com>
+Date: Mon, 9 May 2022 13:38:22 +0000
+Subject: [PATCH] [7.1.x] testing: fix Path.rglob("") failures in Python 3.11b1
+ (#9934)
+
+Co-authored-by: Ran Benita <ran@unusedvar.com>
+---
+ testing/test_conftest.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/test_conftest.py b/testing/test_conftest.py
+index 680482045..d2bf860c6 100644
+--- a/testing/test_conftest.py
++++ b/testing/test_conftest.py
+@@ -553,7 +553,7 @@ class TestConftestVisibility:
+ )
+ )
+ print("created directory structure:")
+- for x in pytester.path.rglob(""):
++ for x in pytester.path.glob("**/"):
+ print(" " + str(x.relative_to(pytester.path)))
+
+ return {"runner": runner, "package": package, "swc": swc, "snc": snc}
+--
+2.35.1
+
diff --git a/dev-python/pytest/pytest-7.1.2.ebuild b/dev-python/pytest/pytest-7.1.2.ebuild
index 1143038d9a5b..aba0345dc7b7 100644
--- a/dev-python/pytest/pytest-7.1.2.ebuild
+++ b/dev-python/pytest/pytest-7.1.2.ebuild
@@ -39,15 +39,18 @@ BDEPEND="
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}]
- ' python3_{8..10} pypy3)
+ ' python3_{8..11} pypy3)
)
"
+PATCHES=(
+ "${FILESDIR}/${P}-py311.patch"
+)
+
src_test() {
# workaround new readline defaults
echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
@@ -56,7 +59,7 @@ src_test() {
}
python_test() {
- if ! has "${EPYTHON}" python3.{8..10} pypy3; then
+ if ! has "${EPYTHON}" python3.{8..11} pypy3; then
einfo "Skipping tests on ${EPYTHON}"
return
fi
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2024-05-19 11:47 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2024-05-19 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 76b467a7149b0b5c1d11ea755a2988495f009262
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 07:30:24 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 19 11:47:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b467a7
dev-python/pytest: Backport upstream py3.13 fixes
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pytest/files/pytest-8.2.0-py313.patch | 182 +++++++++++++++++++++++
dev-python/pytest/pytest-8.2.0-r1.ebuild | 121 +++++++++++++++
2 files changed, 303 insertions(+)
diff --git a/dev-python/pytest/files/pytest-8.2.0-py313.patch b/dev-python/pytest/files/pytest-8.2.0-py313.patch
new file mode 100644
index 000000000000..196fb9a7422f
--- /dev/null
+++ b/dev-python/pytest/files/pytest-8.2.0-py313.patch
@@ -0,0 +1,182 @@
+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 '<string>':1 in <module>\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 '<string>':1 in <module>\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 "<doctest test_doctest_unexpected_exception.txt[1]>", line 1, in <module>',
+ "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
new file mode 100644
index 000000000000..a50c705d49bb
--- /dev/null
+++ b/dev-python/pytest/pytest-8.2.0-r1.ebuild
@@ -0,0 +1,121 @@
+# 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-2[${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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2024-06-22 15:01 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2024-06-22 15:01 UTC (permalink / raw
To: gentoo-commits
commit: 5a5c5a4ab31ab75a3123e0203cbaef6570bf30cf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 14:47:38 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 15:00:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5c5a4a
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-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 ---------------
5 files changed, 562 deletions(-)
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index c2797fed66ed..a28b0058ed0c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,6 +1,4 @@
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
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 '<string>':1 in <module>\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 '<string>':1 in <module>\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 "<doctest test_doctest_unexpected_exception.txt[1]>", line 1, in <module>',
- "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-2[${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-2[${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-2[${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
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/
@ 2025-02-18 12:50 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2025-02-18 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 55fc42718e2a6e2a4155b0f3f069646173041aa4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 11:29:35 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 12:49:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55fc4271
dev-python/pytest: Backport a test fix for pygments-2.19
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../pytest/files/pytest-8.3.4-pygments-2.19.patch | 106 +++++++++++++++++++++
dev-python/pytest/pytest-8.3.4.ebuild | 5 +
2 files changed, 111 insertions(+)
diff --git a/dev-python/pytest/files/pytest-8.3.4-pygments-2.19.patch b/dev-python/pytest/files/pytest-8.3.4-pygments-2.19.patch
new file mode 100644
index 000000000000..5674f72ead18
--- /dev/null
+++ b/dev-python/pytest/files/pytest-8.3.4-pygments-2.19.patch
@@ -0,0 +1,106 @@
+From ad4081f63985ff42f54fc52baa7ce0e7b5cffba4 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <me@the-compiler.org>
+Date: Wed, 8 Jan 2025 18:04:15 +0100
+Subject: [PATCH] Merge pull request #13113 from
+ The-Compiler/fix-pygments-whitespace
+
+Fix selftests with Pygments >= 2.19.0
+
+(cherry picked from commit bdfc3a99bd733f385f150446caef6d5843bb6418)
+---
+ changelog/13112.contrib.rst | 1 +
+ testing/conftest.py | 7 +++++++
+ testing/test_terminal.py | 10 +++++-----
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+ create mode 100644 changelog/13112.contrib.rst
+
+diff --git a/changelog/13112.contrib.rst b/changelog/13112.contrib.rst
+new file mode 100644
+index 000000000..5e59a736e
+--- /dev/null
++++ b/changelog/13112.contrib.rst
+@@ -0,0 +1 @@
++Fixed selftest failures in ``test_terminal.py`` with Pygments >= 2.19.0
+diff --git a/testing/conftest.py b/testing/conftest.py
+index 69af03324..194da0f83 100644
+--- a/testing/conftest.py
++++ b/testing/conftest.py
+@@ -2,10 +2,13 @@
+ from __future__ import annotations
+
+ import dataclasses
++import importlib.metadata
+ import re
+ import sys
+ from typing import Generator
+
++from packaging.version import Version
++
+ from _pytest.monkeypatch import MonkeyPatch
+ from _pytest.pytester import Pytester
+ import pytest
+@@ -168,6 +171,9 @@ def color_mapping():
+
+ Used by tests which check the actual colors output by pytest.
+ """
++ # https://github.com/pygments/pygments/commit/d24e272894a56a98b1b718d9ac5fabc20124882a
++ pygments_version = Version(importlib.metadata.version("pygments"))
++ pygments_has_kwspace_hl = pygments_version >= Version("2.19")
+
+ class ColorMapping:
+ COLORS = {
+@@ -180,6 +186,7 @@ def color_mapping():
+ "bold": "\x1b[1m",
+ "reset": "\x1b[0m",
+ "kw": "\x1b[94m",
++ "kwspace": "\x1b[90m \x1b[39;49;00m" if pygments_has_kwspace_hl else " ",
+ "hl-reset": "\x1b[39;49;00m",
+ "function": "\x1b[92m",
+ "number": "\x1b[94m",
+diff --git a/testing/test_terminal.py b/testing/test_terminal.py
+index 14c152d61..cbbe9cbd7 100644
+--- a/testing/test_terminal.py
++++ b/testing/test_terminal.py
+@@ -1299,13 +1299,13 @@ def test_color_yes(pytester: Pytester, color_mapping) -> None:
+ "=*= FAILURES =*=",
+ "{red}{bold}_*_ test_this _*_{reset}",
+ "",
+- " {reset}{kw}def{hl-reset} {function}test_this{hl-reset}():{endline}",
++ " {reset}{kw}def{hl-reset}{kwspace}{function}test_this{hl-reset}():{endline}",
+ "> fail(){endline}",
+ "",
+ "{bold}{red}test_color_yes.py{reset}:5: ",
+ "_ _ * _ _*",
+ "",
+- " {reset}{kw}def{hl-reset} {function}fail{hl-reset}():{endline}",
++ " {reset}{kw}def{hl-reset}{kwspace}{function}fail{hl-reset}():{endline}",
+ "> {kw}assert{hl-reset} {number}0{hl-reset}{endline}",
+ "{bold}{red}E assert 0{reset}",
+ "",
+@@ -2585,7 +2585,7 @@ class TestCodeHighlight:
+ result.stdout.fnmatch_lines(
+ color_mapping.format_for_fnmatch(
+ [
+- " {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
++ " {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
+ "> {kw}assert{hl-reset} {number}1{hl-reset} == {number}10{hl-reset}{endline}",
+ "{bold}{red}E assert 1 == 10{reset}",
+ ]
+@@ -2607,7 +2607,7 @@ class TestCodeHighlight:
+ result.stdout.fnmatch_lines(
+ color_mapping.format_for_fnmatch(
+ [
+- " {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
++ " {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
+ " {print}print{hl-reset}({str}'''{hl-reset}{str}{hl-reset}",
+ "> {str} {hl-reset}{str}'''{hl-reset}); {kw}assert{hl-reset} {number}0{hl-reset}{endline}",
+ "{bold}{red}E assert 0{reset}",
+@@ -2630,7 +2630,7 @@ class TestCodeHighlight:
+ result.stdout.fnmatch_lines(
+ color_mapping.format_for_fnmatch(
+ [
+- " {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
++ " {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
+ "> {kw}assert{hl-reset} {number}1{hl-reset} == {number}10{hl-reset}{endline}",
+ "{bold}{red}E assert 1 == 10{reset}",
+ ]
diff --git a/dev-python/pytest/pytest-8.3.4.ebuild b/dev-python/pytest/pytest-8.3.4.ebuild
index cd59dc91caa9..835e9a6ea2d6 100644
--- a/dev-python/pytest/pytest-8.3.4.ebuild
+++ b/dev-python/pytest/pytest-8.3.4.ebuild
@@ -50,6 +50,11 @@ BDEPEND="
)
"
+PATCHES=(
+ # ad4081f63985ff42f54fc52baa7ce0e7b5cffba4
+ "${FILESDIR}/${P}-pygments-2.19.patch"
+)
+
src_test() {
# workaround new readline defaults
echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2025-02-18 12:50 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-22 15:01 [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/, dev-python/pytest/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2025-02-18 12:50 Michał Górny
2024-05-19 11:47 Michał Górny
2022-05-13 12:29 Michał Górny
2021-10-03 19:24 Michał Górny
2021-06-02 19:46 Michał Górny
2020-05-27 6:11 Michał Górny
2019-11-27 13:17 Michał Górny
2019-07-06 8:43 Tim Harder
2018-07-11 22:11 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox