gentoo resync : 20.03.2022

4 files changed, 27 insertions, 104 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index ed7d6011d734..4da27035c99d 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,5 @@
-AUX pytest-6.2.5-py310.patch 2866 BLAKE2B d7ec82ec4a9ed554021f915ffc4a37e1a19b4e404de0c77650c1b85812196b8254a09be6790cde971df55b7bd54036a9b501e6901e0e56f7f12adb20d053174c SHA512 7c25682829c13651f35e5364ee8d1393ccf338e295a86f6379ad7bf83c38a5399bfa3d48d57813ca520770f9851c1aa00a8d891709fd2c9ec53c21f04bb13803
-DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9
-EBUILD pytest-6.2.5-r2.ebuild 2498 BLAKE2B 87b8669a250a6cd5b0bca5f21be57f335a8498d300c6872e14132fb91f260b38b78255618af1bebe0a9468d6b97e9458a0d38d7d4c6055f65aa46f5200fee7b1 SHA512 b3d1141704e3bfab0873f111bdcdd1eb10e5883f25f86b2689e96f13aee71bd84c4d61b4fda3a9abf9a4eac95e8dff8d3827368e0a146c66832b86a4994ace89
-EBUILD pytest-6.2.5-r3.ebuild 2602 BLAKE2B 8b77b3622e469c9b4fe16ba170fe3bae4bc12b408d593276e1649fd3464f954f891001371906130baf72ddcbf7b79b4d0603f52080b8668df1d814a4bd2a8adb SHA512 5acac61f2a1c951a90df9161779afe9de89e81e169a8b7bc8b24825313a97563f8b7efab409fa77e138fdf54c5b7dce3349bf54d0fdb86b8a6d6a5fe8a55f493
+DIST pytest-7.0.1.tar.gz 1249154 BLAKE2B fcaef6afc6e98f6716a80f6451671b2abbf9ad676330a6e66e917a73e018eef966de8e7ef7ab48a1213167476eef1eb37cc5e84ec2bd9e5eab4ec6f1a8071c87 SHA512 21493717159a64fe6467bd096b578b127d81438d04f5b03ba2f4047237054f865a1f50a4e291b9d95b1a144f59bc7a8b3a00008493f4fb4f14bff7fb65c5edc2
+DIST pytest-7.1.1.tar.gz 1255528 BLAKE2B cc70b61ab863c19db62fc765c1819624d2e330116e4c8561693a895d3157ea6011a9f2db4e96f22cb802b295ae841c81e71a741cec8f64d4b7f70c539356fa7e SHA512 53fd016f030ac0394ac686a3756fad05efca8363d6b93df04f90732efea7643cdbba9501dad6d9055d314fcaec0887674496d56986efeb73915976276bf0a700
+EBUILD pytest-7.0.1.ebuild 2583 BLAKE2B ac9a4bd8516d6e8cc1684b4a53609ed07070560906a7f1509e51c6a91498db1ccb0f126a93a0d82de03dd417cd4bc9fc46629594fd4f0bb828c35d8f196f04da SHA512 1a4807b27cba6ee0294334a5ce2916b1431315cb515b2ec73f625d2ceb1734d169ec9548352408bc3511946b0a612aa89c8c6556852a995acc670cf21fc5590b
+EBUILD pytest-7.1.1.ebuild 2829 BLAKE2B 7ce98c713c87dc63aaefb121e366d0456c3b8880ef3873c38c14aa28b98cb795adc5c602824545d15f5b139603bfee14aebe78a7a8f2a9d064585483e49ad7b6 SHA512 59a54c3b15e9e183c32762ff152e18a59ad294cc55d0239ea8bc8e9526331f541b04787d42e1d4933df0e6bbdbc1a57735a64b1f7712df9fa6bde77380062b0b
 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/files/pytest-6.2.5-py310.patch b/dev-python/pytest/files/pytest-6.2.5-py310.patch
deleted file mode 100644
index 89ca41954273..000000000000
--- a/dev-python/pytest/files/pytest-6.2.5-py310.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5082686349185ef35f64d1a998a3062ee5a48771 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Thu, 13 May 2021 17:27:43 +0300
-Subject: [PATCH 1/2] Merge pull request #8664 from
- hroncok/test_unittest-ignore_DeprecationWarning-from-twisted
-
-Ignore DeprecationWarnings in test_trial_error
-
-(cherry picked from commit 850a8447792f89c7d38c72b2f542536655ab0354)
----
- testing/test_unittest.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/testing/test_unittest.py b/testing/test_unittest.py
-index 8b00cb826..de8fc5c55 100644
---- a/testing/test_unittest.py
-+++ b/testing/test_unittest.py
-@@ -533,7 +533,9 @@ class TestTrialUnittest:
-                 # will crash both at test time and at teardown
-         """
-         )
--        result = testdir.runpytest("-vv", "-oconsole_output_style=classic")
-+        result = testdir.runpytest(
-+            "-vv", "-oconsole_output_style=classic", "-W", "ignore::DeprecationWarning"
-+        )
-         result.stdout.fnmatch_lines(
-             [
-                 "test_trial_error.py::TC::test_four FAILED",
--- 
-2.35.0
-
-From 932792c22a300fc7794f966851df2b996f4a79bc Mon Sep 17 00:00:00 2001
-From: Bruno Oliveira <nicoddemus@gmail.com>
-Date: Thu, 16 Dec 2021 10:37:52 -0300
-Subject: [PATCH 2/2] Merge pull request #9417 from
- nicoddemus/fix-py3.10.1-9413
-
-(cherry picked from commit 47df71d23ff13bd083b21ffcf839bd11169b42fc)
----
- .github/workflows/main.yml | 4 ++--
- testing/test_skipping.py   | 2 --
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
-index 5a9435357..a8a6406c6 100644
---- a/.github/workflows/main.yml
-+++ b/.github/workflows/main.yml
-@@ -75,7 +75,7 @@ jobs:
-             os: windows-latest
-             tox_env: "py39-xdist"
-           - name: "windows-py310"
--            python: "3.10-dev"
-+            python: "3.10.1"
-             os: windows-latest
-             tox_env: "py310-xdist"
- 
-@@ -105,7 +105,7 @@ jobs:
-             os: ubuntu-latest
-             tox_env: "py39-xdist"
-           - name: "ubuntu-py310"
--            python: "3.10-dev"
-+            python: "3.10.1"
-             os: ubuntu-latest
-             tox_env: "py310-xdist"
-           - name: "ubuntu-pypy3"
-diff --git a/testing/test_skipping.py b/testing/test_skipping.py
-index 3cb8bdff2..487793645 100644
---- a/testing/test_skipping.py
-+++ b/testing/test_skipping.py
-@@ -1126,8 +1126,6 @@ def test_errors_in_xfail_skip_expressions(pytester: Pytester) -> None:
-     pypy_version_info = getattr(sys, "pypy_version_info", None)
-     if pypy_version_info is not None and pypy_version_info < (6,):
-         markline = markline[5:]
--    elif sys.version_info[:2] >= (3, 10):
--        markline = markline[11:]
-     elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
-         markline = markline[4:]
- 
--- 
-2.35.0
-
diff --git a/dev-python/pytest/pytest-6.2.5-r3.ebuild b/dev-python/pytest/pytest-7.0.1.ebuild
index 888dfd1c2010..6642ca7f51e5 100644
--- a/dev-python/pytest/pytest-6.2.5-r3.ebuild
+++ b/dev-python/pytest/pytest-7.0.1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,26 +25,22 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
 	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/argcomplete[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/xmlschema[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=(
-	# backport fixes for py3.10 test regressions
-	"${FILESDIR}"/${P}-py310.patch
-)
-
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
@@ -54,6 +50,7 @@ src_test() {
 
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
 
 	local EPYTEST_DESELECT=(
 		# broken by epytest args
diff --git a/dev-python/pytest/pytest-6.2.5-r2.ebuild b/dev-python/pytest/pytest-7.1.1.ebuild
index 6679e63a6906..00c527953219 100644
--- a/dev-python/pytest/pytest-6.2.5-r2.ebuild
+++ b/dev-python/pytest/pytest-7.1.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Simple powerful testing with Python"
@@ -12,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -23,26 +25,22 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
 	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/argcomplete[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/xmlschema[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=(
-	# backport fixes for py3.10 test regressions
-	"${FILESDIR}"/${P}-py310.patch
-)
-
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
@@ -51,9 +49,8 @@ src_test() {
 }
 
 python_test() {
-	distutils_install_for_testing --via-root
-
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
 
 	local EPYTEST_DESELECT=(
 		# broken by epytest args
@@ -71,6 +68,16 @@ python_test() {
 		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
+	)
+
+	[[ ${EPYTHON} == 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
 	)
 
 	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"