bump pytest-7.1.1 from main

2022-04-02 15:26:22 +02:00 · 2022-04-02 15:26:22 +02:00 · 6a86d8d1ce
commit 6a86d8d1ce
parent 82e70be4a4
7 changed files with 192 additions and 98 deletions
--- a/README.md
+++ b/README.md
@ -496,11 +496,11 @@ From time to time a fresh compile test on empty boxes (one with Python 3.9 and o

 ## Licenses
 This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted.
-There are 1687 Ebuilds in total, 1680 of them have in total 1688 (35 different) licenses assigned.
+There are 1688 Ebuilds in total, 1681 of them have in total 1689 (35 different) licenses assigned.

 |License| Ebuilds using it|
 |-------|-----|
-|MIT|1030|
+|MIT|1031|
 |Apache-2.0|307|
 |GPL-3|102|
 |BSD|90|
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@ -1,7 +1,9 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
-DIST pytest-6.2.3.tar.gz 1117995 BLAKE2B ad3b4412afd3ce13ea8c61642379aa24d5d119cf19ebecf14a1f9fed7005b5749c641c010d1acaa0f95c8b6506912d2f38ca9487ee2ad27769c819d65c7356f9 SHA512 51a86e99f4a2c0518c45c92b590f58fa6b13e46ebe4a7555d243d8094752ac1145e63fc5b2d5db2637c90df86c14f10ad50ef4c76a6701dc31717e4e8dc8d339
-DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
-EBUILD pytest-6.2.3.ebuild 1709 BLAKE2B a391e59c41147d7046c926193c900578e75013de7e3f293988e94b06497a052a8558785d8f123dd0864591b7690a111d9c8e23f2a11096696a96bc1ac4f3bbf9 SHA512 3d905208693fb7392cafa84de56946807f0ebbe10451ffc4ec59f77f6587e2ba6f40e4386803c477722147328dd699aba0dd13c46bf85cf6f92c77f28cfec11a
-EBUILD pytest-6.2.4.ebuild 1709 BLAKE2B a391e59c41147d7046c926193c900578e75013de7e3f293988e94b06497a052a8558785d8f123dd0864591b7690a111d9c8e23f2a11096696a96bc1ac4f3bbf9 SHA512 3d905208693fb7392cafa84de56946807f0ebbe10451ffc4ec59f77f6587e2ba6f40e4386803c477722147328dd699aba0dd13c46bf85cf6f92c77f28cfec11a
-MISC metadata.xml 325 BLAKE2B 7c113b2ddb2bf82043ec459face1fce737ca84820fd277b8885f291ab0bc194244a3e61e2bd21f81a6ca6a03d30d32b86b748622b100cccaf145f415d244526f SHA512 1613c1866928f45ad4bee8fce44ed6fb3af9671b882e89e98f90b6f488f76250bf30fe46184eb59df81a46da9dd9f040f14e09e5ee0c17bc0e2730c01b812c85
+DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9
+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-6.2.5.ebuild 1542 BLAKE2B 5edd074d7608a87dbcf7565ed84809359151de7f751b7ae9e599f7f26f57d955c5def9a2d6545a76e5bfd54684abe1d8673251f91ed33975856addc2293befed SHA512 be5f1a4ab957004f1595ef9ada0d3bbf6e1d2c677a286a0d6f03a5e8339e3d739963d060068e7b3760b65eae1afccf3b1719c73f0143ac6a99ada64fc73cb04f
+EBUILD pytest-7.0.1.ebuild 2583 BLAKE2B ac9a4bd8516d6e8cc1684b4a53609ed07070560906a7f1509e51c6a91498db1ccb0f126a93a0d82de03dd417cd4bc9fc46629594fd4f0bb828c35d8f196f04da SHA512 1a4807b27cba6ee0294334a5ce2916b1431315cb515b2ec73f625d2ceb1734d169ec9548352408bc3511946b0a612aa89c8c6556852a995acc670cf21fc5590b
+EBUILD pytest-7.1.1.ebuild 2821 BLAKE2B f5152a53d70d7b7c42e00a869a10857ca58b78dff1a109e6092d99c63df3a73e48c2c7b49658033d3e6d315fa8e4985b8482518e2a5bfcf99fd51ffd1ac9fcce SHA512 b9027fa648f8507e9d1a4e197706afb290671ce8fceb3e580c6cc19db91ae8848353d9fa502587c3a8a84f5a2a95bb357742ba7d8ada042526ee070f5c289ddf
+MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
--- a/dev-python/pytest/metadata.xml
+++ b/dev-python/pytest/metadata.xml
@ -1,11 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>b@edevau.net</email>
-    <name>Andreas Billmeier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pytest</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest</remote-id>
+		<remote-id type="github">pytest-dev/pytest</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-python/pytest/pytest-6.2.4.ebuild
+++ b/dev-python/pytest/pytest-6.2.4.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2021 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 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( 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}]
-"
-# flake cause a number of tests to fail
-DEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/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 --via-root
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
--- a/dev-python/pytest/pytest-6.2.5.ebuild
+++ b/dev-python/pytest/pytest-6.2.5.ebuild
@ -3,9 +3,7 @@

 EAPI=7

-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1

 DESCRIPTION="Simple powerful testing with Python"
@ -14,26 +12,23 @@ 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 ~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 )"
-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)
+	' 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}]
+	dev-python/tomli[${PYTHON_USEDEP}]
 "
-# flake cause a number of tests to fail
-DEPEND="
+BDEPEND="
 	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
@ -43,21 +38,18 @@ DEPEND="
 		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
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
 }

 python_test() {
 	distutils_install_for_testing --via-root

-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX -p no:pkgcore -p no:flaky ||
 		die "Tests failed with ${EPYTHON}"
 }
--- a/dev-python/pytest/pytest-7.0.1.ebuild
+++ b/dev-python/pytest/pytest-7.0.1.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
+
+	local EPYTEST_DESELECT=(
+		# broken by epytest args
+		testing/test_warnings.py::test_works_with_filterwarnings
+
+		# tend to be broken by random pytest plugins
+		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
+		testing/test_helpconfig.py::test_version_less_verbose
+		testing/test_helpconfig.py::test_version_verbose
+		testing/test_junitxml.py::test_random_report_log_xdist
+		testing/test_junitxml.py::test_runs_twice_xdist
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
+		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
+		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
+		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
+
+		# unstable with xdist
+		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
+	)
+
+	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/pytest/pytest-7.1.1.ebuild
+++ b/dev-python/pytest/pytest-7.1.1.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
+
+	local EPYTEST_DESELECT=(
+		# broken by epytest args
+		testing/test_warnings.py::test_works_with_filterwarnings
+
+		# tend to be broken by random pytest plugins
+		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
+		testing/test_helpconfig.py::test_version_less_verbose
+		testing/test_helpconfig.py::test_version_verbose
+		testing/test_junitxml.py::test_random_report_log_xdist
+		testing/test_junitxml.py::test_runs_twice_xdist
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
+		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
+		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
+		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
+
+		# unstable with xdist
+		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
+	)
+
+	[[ ${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)")"
+}