Adding metadata

29 files changed, 170 insertions, 154 deletions

diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 728046d1d580..a1658209491d 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1 +1,2 @@
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
+DIST PyUtilib-6.0.0.tar.gz 1569916 BLAKE2B ee4085b597e928c5d6602b647f122c562f2e05dcaf300217cea9c5bc652f6acb5dbe5a075cbbbc1b81497987ab5c658f86cc3e44e16cae02a37d546b2e925a9b SHA512 7841a84ee8d66d2d7af3db810e4d787030acbd8e3e81c3f61251ea160931feddeab6f4d205977a411964359f1cb7e7e59e846593c113093e01c48b81784f7477
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index 4fbf76a98e9c..c7368196fa6b 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
new file mode 100644
index 000000000000..6c9007827289
--- /dev/null
+++ b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
@@ -0,0 +1,40 @@
+# 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_{6,7,8,9,10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python utilities"
+HOMEPAGE="https://github.com/PyUtilib/pyutilib"
+SRC_URI="https://github.com/${PN}/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN,,}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/PyUtilib-6.0.0-tests.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${ED}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+
+	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
+		COLUMNS=80
+
+	eunittest
+}
diff --git a/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch b/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
new file mode 100644
index 000000000000..33dcd4605818
--- /dev/null
+++ b/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/pyutilib/component/loader/tests/test_egg.py b/pyutilib/component/loader/tests/test_egg.py
+index c8674d0..7126e5c 100644
+--- a/pyutilib/component/loader/tests/test_egg.py
++++ b/pyutilib/component/loader/tests/test_egg.py
+@@ -23,6 +23,7 @@ except ImportError:
+ 
+ 
+ @unittest.skipIf(not pkg_resources_avail, "Cannot import 'pkg_resources'")
++@unittest.skipIf(sys.hexversion >= 0x03090000, "Example eggs not generated for python >= 3.9")
+ class Test(pyutilib.th.TestCase):
+ 
+     def test_egg1(self):
diff --git a/dev-python/aiohttp/aiohttp-3.7.4.ebuild b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
index bfb79f21f5d7..c93c546dff1b 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
@@ -21,9 +21,6 @@ RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/apispec/files/apispec-3.3.0-tests.patch b/dev-python/apispec/files/apispec-3.3.0-tests.patch
deleted file mode 100644
index fb2ffc549207..000000000000
--- a/dev-python/apispec/files/apispec-3.3.0-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/test_ext_marshmallow_openapi.py b/tests/test_ext_marshmallow_openapi.py
-index ab1b0b8..d151a32 100644
---- a/tests/test_ext_marshmallow_openapi.py
-+++ b/tests/test_ext_marshmallow_openapi.py
-@@ -454,6 +454,7 @@ class TestNesting:
-         assert "breed" not in category_props
- 
- 
-+@pytest.mark.skip("test requires extra dependencies")
- def test_openapi_tools_validate_v2():
-     ma_plugin = MarshmallowPlugin()
-     spec = APISpec(
-@@ -512,6 +513,7 @@ def test_openapi_tools_validate_v2():
-         pytest.fail(str(error))
- 
- 
-+@pytest.mark.skip("test requires extra dependencies")
- def test_openapi_tools_validate_v3():
-     ma_plugin = MarshmallowPlugin()
-     spec = APISpec(
diff --git a/dev-python/argcomplete/argcomplete-1.12.3.ebuild b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
index 577884ca0738..04f606dfd70b 100644
--- a/dev-python/argcomplete/argcomplete-1.12.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
index 335e3006aecb..31797f808d5b 100644
--- a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index fe5cacdc8479..ce86f5dda8e7 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,8 @@ KEYWORDS=""
 RDEPEND="
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.2[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
index bc33bef78312..c5e041e9385d 100644
--- a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 6588afec157d..f1f80172faa6 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,2 +1,3 @@
 DIST hypothesis-python-6.10.1.tar.gz 9126246 BLAKE2B cc8cb3436d1de5d3d65a13cb5edefdbaae8bf9daed296eea9111ac46c002c34f43119f10b2ab1f45c5cbca5fe46d00738676290eb0e8437f2c10b5926d9e0915 SHA512 586b7f380cb850089f7d5321f11da92ef4a9b80e2ea925103e29c1f6c6c9da0a2a899a1a45ce77e0a40073f147561bc4fcbd5cb2ce77a9c0c65f6f64dfe4b716
 DIST hypothesis-python-6.13.0.tar.gz 9128293 BLAKE2B be618d42639602bc6617f8b5e9374812298e9d6150b6510a8060ca7c489ea69f1d6bd2cf9322c325c9bffc3c3f886fb4a4fb038159fa2c81920541ac4cb668cd SHA512 66fd6e7842b7b257c92cf756db4cf97bfb64006c89e3e58cda154ebe9345302f0264297df8d9de0685033a0f4e43909d65e76495689a8ded9968ecda586b668c
+DIST hypothesis-python-6.13.2.tar.gz 9130008 BLAKE2B 3ca5c306ac402002a1435b8ccbc034f2a7acf1553eb6095e0394ff1ddf778f47ef6f72359cb5219db924edc18623b22732b4a94bd7c269217ec632b8d59adc1c SHA512 8c7e1a5de011ef66f5105009aa82f2b23ff36f0b0906554ae65e2e55e10c4df743c894b6264002c86bae3fc5e1dd7ded7e913f0866ed725e1afd4c9f54022b7c
diff --git a/dev-python/hypothesis/hypothesis-6.13.2.ebuild b/dev-python/hypothesis/hypothesis-6.13.2.ebuild
new file mode 100644
index 000000000000..3858e9c1e208
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3_{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
deleted file mode 100644
index 0746793e2b9c..000000000000
--- a/dev-python/idna-ssl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
deleted file mode 100644
index ffc82addd9bb..000000000000
--- a/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# this is backport, please do not add 3.8+
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
-SRC_URI="
-	https://github.com/aio-libs/idna-ssl/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/aiohttp[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -e 's:--no-cov-on-fail --cov=idna_ssl --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-	sed -e 's:test_aiohttp:_&:' -i tests/test_base.py || die
-	distutils-r1_src_prepare
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/idna-ssl/metadata.xml b/dev-python/idna-ssl/metadata.xml
deleted file mode 100644
index 7133b794edcd..000000000000
--- a/dev-python/idna-ssl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">idna_ssl</remote-id>
-  <remote-id type="github">aio-libs/idna-ssl</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
index 75c7998dcd81..1361f73866b0 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Configuration manager in your pocket"
 HOMEPAGE="https://github.com/emre/kaptan"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="kaptan"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
diff --git a/dev-python/oslotest/oslotest-4.4.1.ebuild b/dev-python/oslotest/oslotest-4.4.1.ebuild
index 8a53dd0e4622..f983565b179b 100644
--- a/dev-python/oslotest/oslotest-4.4.1.ebuild
+++ b/dev-python/oslotest/oslotest-4.4.1.ebuild
@@ -19,4 +19,7 @@ RDEPEND="
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]"
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
index cc00d8dcee80..e07e9292aa83 100644
--- a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
@@ -27,14 +27,11 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="crypt test"
+IUSE="crypt"
 
 BDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
 	crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )
-	test? ( dev-python/reportlab[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
+	test? ( dev-python/reportlab[${PYTHON_USEDEP}] )"
 
 # unittest would be sufficient but its output is unreadable
 distutils_enable_tests pytest
diff --git a/dev-python/pycountry/pycountry-20.7.3.ebuild b/dev-python/pycountry/pycountry-20.7.3.ebuild
index f96f2b65cc42..a00fe491c7f3 100644
--- a/dev-python/pycountry/pycountry-20.7.3.ebuild
+++ b/dev-python/pycountry/pycountry-20.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,20 +16,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ia64 ppc ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests --install pytest
 
 # https://github.com/flyingcircusio/pycountry/pull/51
 PATCHES=( "${FILESDIR}/${P}-fix-tests-for-pypy3.patch" )
-
-python_test() {
-	# The package uses pkg_resources to determine its version
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
index b5a1a042bc13..bbe758a18fa2 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index 97f02dc8edec..1109d09d767d 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -14,8 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
@@ -36,15 +34,11 @@ BDEPEND="
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 
+distutils_enable_tests --install setup.py
+
 python_prepare_all() {
 	# keeps trying to install this in tests
 	sed -i 's:path.py::' setup.py || die
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
index 981ab4c65e5a..2eb89a2675f4 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/snapshottest/snapshottest-0.5.1.ebuild b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
index 0c1761132611..262160413466 100644
--- a/dev-python/snapshottest/snapshottest-0.5.1.ebuild
+++ b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 # no tests on pypi, no tags on github
@@ -13,24 +12,21 @@ COMMIT_HASH="4ac2b4fb09e9e7728bebb11967c164a914775d1d"
 DESCRIPTION="Snapshot Testing utils for Python"
 HOMEPAGE="https://pypi.org/project/snapshottest/
 	https://github.com/syrusakbary/snapshottest"
-SRC_URI="https://github.com/syrusakbary/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/syrusakbary/${PN}/archive/${COMMIT_HASH}.tar.gz
+		-> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+
+distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}/snapshottest-0.5.1-remove-fastdiff.patch"
@@ -44,6 +40,6 @@ python_prepare_all() {
 
 python_test() {
 	distutils_install_for_testing
-	pytest -vv tests examples/pytest || die "Tests failed with ${EPYTHON}"
+	epytest tests examples/pytest
 	"${EPYTHON}" examples/unittest/test_demo.py || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index a78fc49973e7..0a108fb527bc 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
@@ -13,23 +13,22 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
 "
 
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
 
-python_prepare() {
+src_prepare() {
 	sed -e "s/import urllib/import urllib.request as urllib/" \
 		-i sphinxcontrib/jinja.py || die
-}
-
-python_test() {
-	nosetests -v || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
index 99a8a58861c2..5e938a4bd279 100644
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index 45a6febab6bd..b69572ebeb6b 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,6 @@ BDEPEND="
 	test? (
 		dev-python/colorama[${PYTHON_USEDEP}]
 		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index 0d1bec96492a..1ac9b6b35a40 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,7 @@ HOMEPAGE="https://github.com/txamqp/txamqp"
 # pypi tarball misses doc files
 # https://github.com/txamqp/txamqp/pull/10
 SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86 ~x64-solaris"
@@ -24,14 +25,12 @@ RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		${RDEPEND}
 		net-misc/rabbitmq-server
 	)"
 
-S=${WORKDIR}/${MY_P}
-
 # Tests connect to the system rabbitmq server
 # TODO: figure out how to start an isolated instance
 RESTRICT="test"
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
index fa84b9265493..47f0620786ff 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Warning: do not use distutils_enable_tests to avoid a circular
 # dependency on itself!
diff --git a/dev-python/warlock/warlock-1.3.3.ebuild b/dev-python/warlock/warlock-1.3.3.ebuild
index e51b3151d8e1..5a09b1e17c19 100644
--- a/dev-python/warlock/warlock-1.3.3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3.ebuild
@@ -13,21 +13,12 @@ SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/six[${PYTHON_USEDEP}]
-				>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-				<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-				>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-				<dev-python/jsonschema-4[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-		<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-		<dev-python/jsonschema-4[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
+	<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-4[${PYTHON_USEDEP}]"
 
-python_test() {
-	"${PYTHON}" tests/test_core.py || die
-}
+distutils_enable_tests unittest