gentoo resync : 20.03.2022

4 files changed, 35 insertions, 101 deletions

diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 9453cefe5c7c..c549769d1495 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
-DIST pytest-regressions-2.3.0.tar.gz 109181 BLAKE2B 1b47d437c46c134b76b724859b6ebdca6aabee9932a7d63b64f3ee1561a2d84dca9c09b5d7fe7847af97814570cfa85a1eb26ef6c0e6bc14f9ce5684cca0874d SHA512 6013f468c522711eade949d814917ffcd77ef2f3505926d9529a8cfea6c8ee33b5520fa48369160767efdd70e6c54230fc8c77a4c5105c783339a3d7fca93bf7
 DIST pytest-regressions-2.3.1.tar.gz 109616 BLAKE2B cc1c4f5bb221f9b2e53cd235a135a91a301de955fa46a6ab62ebe900878d22ca7814745df72de9a664e16cfc044d99c9048d637dd4f0e3460af25ff2895b6ca8 SHA512 e6c95a085263c9f67223a342a7495e3e46b6c278ad35af726edf7cd0212e516431626d7655250e68f922417d2224568db15992e15f4f4105aada7180372adb64
-EBUILD pytest-regressions-2.2.0.ebuild 1118 BLAKE2B 51376b105099e5593beb7e00ec5a914de21eb6b9ef212325c74f5c8d1f9c6e7f6a40bc59714b200c4c6cb52bc0d51dbe9e0b9826e92a035b4ed55dd9f0175458 SHA512 914aa6eae033f5fec8744b586b953c4c90f2f3b6abef7740e3f34c30fe1115bedc9320b85562d6b79b9d15385121b26c215b50a619f25e8c51726142fca3dd63
-EBUILD pytest-regressions-2.3.0.ebuild 1124 BLAKE2B 73a3ced4cc5792c82acb0d8ec5d1e1ef0434987a651748c58b315f2bf27aeabb05a35056130cedd75527c5e6df99863d9416a4af9042e5b07449a31f4bb3e1ab SHA512 b19c5efada994191508d1c0a85d63a2899ad91b0ae587fa6ceb0f9cfa7ba0be95275a407a1e459925f8034cb8a9b0ffa675c57bdf127331e8a450e301951f5d5
-EBUILD pytest-regressions-2.3.1.ebuild 904 BLAKE2B 20a9b93958863964ddf7b07ee462e87e70a3661726659ac1a9c59000e11aa62af265adb5e3fd060c1000b01cb9873d75c5c6bf55b79f225fad1a78744de05f07 SHA512 c43b6b39e283ddb250abae39af3bdf64ca6be6feb604621badf5257fec6ae7e44ec86e978e427a3c2bbea994591bd73b4f0a2767d8de72d21be490e6b4333b67
+EBUILD pytest-regressions-2.3.1.ebuild 1509 BLAKE2B bafae66e5fd25ea922e86c1c473ecc70266f9ee1bb55aa29c7daeb1413840d479114d6b8977c7eebb862410e67167b8c8f1fd8f6fb392c4fad7cb2ff08ba9282 SHA512 f5936336be14483dfe57e14d8b499eafd526b920bbc8bcc1d797cb6153ef9a1f3a5937b0f332c1eb31fd70cf0d17075276611a731ecd52af7ad61bf3b5ff4e78
 MISC metadata.xml 465 BLAKE2B ae41a884052ebc7399af62f7c8375c1f32088f7ebc23625b521b1dedb31a9844b86fd05a55008178d248f2c9e2a552868301bc35649418cc0a767038f4a484ed SHA512 b698190fc24eff3235795959a1b165860a21a001bb0e05cfefca7d0fa6ee7e987b1b31bea3c69c8dad82ffd9df24ef665a57f8c39a6f17e872b9d2946a69c010
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
deleted file mode 100644
index ae5166e7bc8f..000000000000
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use fixtures to write regression tests"
-HOMEPAGE="https://github.com/ESSS/pytest-regressions"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-datadir[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# Does not work with the panda's version in ::gentoo
-	sed -i -e 's:test_non_numeric_data:_&:' \
-		-e 's:test_non_pandas_dataframe:_&:' \
-		tests/test_dataframe_regression.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild
deleted file mode 100644
index 8a4c7910c67a..000000000000
--- a/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use fixtures to write regression tests"
-HOMEPAGE="https://github.com/ESSS/pytest-regressions"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-datadir[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# Does not work with the panda's version in ::gentoo
-	sed -i -e 's:test_non_numeric_data:_&:' \
-		-e 's:test_non_pandas_dataframe:_&:' \
-		tests/test_dataframe_regression.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
index dd87173268c4..15718cc81455 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
@@ -22,14 +22,38 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 
-BDEPEND="
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=()
+	if ! has_version "dev-python/matplotlib[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_image_regression.py::test_image_regression
+		)
+	fi
+	if ! has_version "dev-python/numpy[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_ndarrays_regression.py
+		)
+	fi
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_filenames.py::test_foo
+			tests/test_filenames.py::TestClass::test_foo
+			tests/test_filenames.py::TestClassWithIgnoredName::test_foo
+		)
+		EPYTEST_IGNORE+=(
+			tests/test_dataframe_regression.py
+			tests/test_num_regression.py
+		)
+	fi
+	if ! has_version "dev-python/pillow[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_image_regression.py
+		)
+	fi
+
+	epytest
+}