gentoo resync : 29.12.2022

4 files changed, 23 insertions, 39 deletions

diff --git a/dev-python/pytest-toolbox/Manifest b/dev-python/pytest-toolbox/Manifest
index 4f3d751d5b69..1c3e200083ce 100644
--- a/dev-python/pytest-toolbox/Manifest
+++ b/dev-python/pytest-toolbox/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-toolbox-0.4.gh.tar.gz 8594 BLAKE2B fb1f19513e9e4b191c3eb995cc5e9445bc9f19affef87350d925c5465210c4de945b91120f86664c1dcf02a638595a7725cf88e3244e377ae77558c70d65643a SHA512 ed27700ff77cd607be808142cc310cd2b7461e55b3f8352d304ef8ca6c5e6c060c67a63238a1025407868ab8e229c4a16eaaa56aa75000159762001accb67752
-EBUILD pytest-toolbox-0.4-r1.ebuild 757 BLAKE2B f53e454f12734030f1fd168691daddba5da410dbc8a632276fafe4374dacafefcaf7b826593b23514eaf61aed85aafe4c71b1e880d0b15a3a1d697956288b296 SHA512 b7192bee1948df3a9cbd4ab3c400375da15360ce4c0d3a2b5158030be5068b9e6905d572436d5675656b0b72435df889535fb1f999f866bcf6cbbb40ab9dff65
-EBUILD pytest-toolbox-0.4.ebuild 692 BLAKE2B c51849da62225a374485865a58bf249ebed8a754fd45921930b412f8e5933c7ac28f91374c4fe41b774d79818fa595ccb28a25a59eebbb03d7bb1021962f5542 SHA512 9067d07543bbe177eb8c756c79a65d9071783c9e020098b80e68fa1ff8c7e03ccf7e5744ebed7c61f4a52d4c5f22d09895bd558c9cf1e6682d634488a9fc0eca
-MISC metadata.xml 395 BLAKE2B 5d6c5c889169be1f1e05eadc0cefcbe90d51c4c7400aef7d1c653c4a018f5288384c30b7f58d8502d0c1ffb2c07aa08a81cca7e4d12b5df7ef344fabd13ee7a5 SHA512 bfcf70da768f5a66edc1ed98211ced383bac3ea1ca2313efc7caac197aeeba1c988fbd738b7118afdc775ed30b43ee8af42c9c39da82eefadb88e87802f6f8e4
+EBUILD pytest-toolbox-0.4-r1.ebuild 1039 BLAKE2B 3cb51977cc652333a5b72d00d3a2e43394e0a5a484858909ad3c136cd50ea162074eb274d88ec1a1cdae031e21175dbecdde16579c23779cb2fc02a7cd1ec23f SHA512 5723856f8d4d5a6cca2681f16f753876ea5591cbe5e3f384b34f8ee5a502bffc9c49064a30a9afa52d961a9c866673cc3f6c934fae4be5ea41ad481e451d47a4
+MISC metadata.xml 419 BLAKE2B 4d9d5836c30bf06f5b7cdc563cea54b206d17bd08ab192642f06697d81c8d7e4ed1094aa3851e905594dc233c7381937f2397149b19944e071019d6d5cd774c4 SHA512 044a0eb820497c6a01bcc0358d62cdcb6a071f82d98a81ca2b052108401db5dd07a993bc0a622631ce96a7add97b9686d20b015088b6cd6089eed830155b8f7f
diff --git a/dev-python/pytest-toolbox/metadata.xml b/dev-python/pytest-toolbox/metadata.xml
index 0b43cf3a3e28..3143de31e5e4 100644
--- a/dev-python/pytest-toolbox/metadata.xml
+++ b/dev-python/pytest-toolbox/metadata.xml
@@ -5,6 +5,7 @@
 		<email>arthurzam@gentoo.org</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-toolbox</remote-id>
 		<remote-id type="github">samuelcolvin/pytest-toolbox</remote-id>
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
index 89f7a584745c..8de597b0cadf 100644
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Numerous useful plugins for pytest"
-HOMEPAGE="https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/"
+HOMEPAGE="
+	https://github.com/samuelcolvin/pytest-toolbox/
+	https://pypi.org/project/pytest-toolbox/
+"
 SRC_URI="
 	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -17,11 +20,14 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pydantic[${PYTHON_USEDEP}]
+		' pypy3 python3_{8..10}  # TODO: python3_11
+		)
 	)
 "
 
@@ -31,3 +37,13 @@ src_prepare() {
 	sed -e '/addopts/d' -i setup.cfg || die
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/pydantic[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_comparison.py::test_close_to_now_{false,true}
+		)
+	fi
+	epytest
+}
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
deleted file mode 100644
index 373a1f591ddd..000000000000
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerous useful plugins for pytest"
-HOMEPAGE="https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/"
-SRC_URI="
-	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}