Adding metadata

27 files changed, 402 insertions, 59 deletions

diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index e0432e73d85c..2bcd5baa0230 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1 +1,2 @@
 DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
+DIST apipkg-2.0.0rc1.gh.tar.gz 11737 BLAKE2B 5c2c109dcab512f4154f275fb0bac42c626d753ca0b9f7c5bec91a0f7d0048c4ddadb8ea580626e51a2a879ac487ea9fcb06109d271a0b214dea3c5a1758126a SHA512 2bdfda86bb8d3a5d57868adf5e44de895f95d37b1928f4e24796bdde3a02eb9f8c51a017060c8b9c4a918c85d5d2d8348c634fc11f5eea9a9e333c14cabb1c23
diff --git a/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild b/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild
new file mode 100644
index 000000000000..d8ab977ed9bb
--- /dev/null
+++ b/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild
@@ -0,0 +1,26 @@
+# 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 )
+
+inherit distutils-r1
+
+MY_P=${P/_/}
+DESCRIPTION="Namespace control and lazy-import mechanism"
+HOMEPAGE="https://pypi.org/project/apipkg/"
+SRC_URI="
+	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index a3541fe64ce9..09494bc15e8d 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1 +1,2 @@
+DIST attrs-03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b.tar.gz 170688 BLAKE2B 1256cb115b3613929f9caf7f31907a51c9afdd5f6e0a10a172089e920d6604c41db3fb11726ab71a698b4ff9e6420e827d5ff25c4127ef7c6cf12536a66a9bb3 SHA512 3007f8c502c0bcd2481ffbbb00bec4ed677d1be9514e417670c4adb791dc67eee76b8a7c07a4a972cd4ece3291e2c996944bb1cdb282682086551cbd571a0011
 DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
diff --git a/dev-python/attrs/attrs-20.3.0_p20210222.ebuild b/dev-python/attrs/attrs-20.3.0_p20210222.ebuild
new file mode 100644
index 000000000000..45eb3f933071
--- /dev/null
+++ b/dev-python/attrs/attrs-20.3.0_p20210222.ebuild
@@ -0,0 +1,34 @@
+# 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 )
+
+inherit distutils-r1
+
+EGIT_COMMIT=03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/attrs/
+	https://attrs.readthedocs.io/
+	https://pypi.org/project/attrs/"
+SRC_URI="
+	https://github.com/python-attrs/attrs/archive/${EGIT_COMMIT}.tar.gz
+		-> ${PN}-${EGIT_COMMIT}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
index d0bf09860838..35d49c6e794f 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
@@ -54,6 +54,5 @@ python_test() {
 		test/test_compatibility.py::test_brotli_version
 	)
 
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/cffi/cffi-1.14.5.ebuild b/dev-python/cffi/cffi-1.14.5.ebuild
index 187343c9a4e1..d329f87995f8 100644
--- a/dev-python/cffi/cffi-1.14.5.ebuild
+++ b/dev-python/cffi/cffi-1.14.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -46,9 +46,8 @@ src_configure() {
 
 python_test() {
 	"${EPYTHON}" -c "import _cffi_backend as backend" || die
-	pytest -x -vv \
+	epytest \
 		--ignore testing/test_zintegration.py \
 		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
+		c/ testing/
 }
diff --git a/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch b/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch
new file mode 100644
index 000000000000..f81186a46e6e
--- /dev/null
+++ b/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch
@@ -0,0 +1,75 @@
+From 27ee073728e70e930118a36ffa4f8123ce363099 Mon Sep 17 00:00:00 2001
+From: Zac-HD <zac.hatfield.dodds@gmail.com>
+Date: Wed, 5 May 2021 13:01:21 +1000
+Subject: [PATCH] Test on 3.10-dev again
+
+now that pytest has been fixed
+---
+ tests/cover/test_annotations.py | 4 +---
+ tests/cover/test_lookup.py      | 7 +------
+ tests/cover/test_lookup_py38.py | 2 --
+ 4 files changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/tests/cover/test_annotations.py b/tests/cover/test_annotations.py
+index 564339d39..95ebea3c5 100644
+--- a/tests/cover/test_annotations.py
++++ b/tests/cover/test_annotations.py
+@@ -13,7 +13,6 @@
+ #
+ # END HEADER
+ 
+-import sys
+ from inspect import getfullargspec
+ 
+ import attr
+@@ -116,8 +115,7 @@ def test_composite_edits_annotations():
+ @pytest.mark.parametrize("nargs", [1, 2, 3])
+ def test_given_edits_annotations(nargs):
+     spec_given = getfullargspec(given(*(nargs * [st.none()]))(pointless_composite))
+-    expected = None if sys.version_info[:2] < (3, 10) else type(None)
+-    assert spec_given.annotations.pop("return") == expected
++    assert spec_given.annotations.pop("return") is None
+     assert len(spec_given.annotations) == 3 - nargs
+ 
+ 
+diff --git a/tests/cover/test_lookup.py b/tests/cover/test_lookup.py
+index b74eccc62..33cb78050 100644
+--- a/tests/cover/test_lookup.py
++++ b/tests/cover/test_lookup.py
+@@ -756,12 +756,7 @@ def test_compat_get_type_hints_aware_of_None_default():
+     find_any(strategy, lambda x: x.a is not None)
+ 
+     assert typing.get_type_hints(constructor)["a"] == typing.Optional[str]
+-    annotation = inspect.signature(constructor).parameters["a"].annotation
+-    assert annotation == str or (
+-        # See https://bugs.python.org/issue43006
+-        annotation == typing.Optional[str]
+-        and sys.version_info[:2] >= (3, 10)
+-    )
++    assert inspect.signature(constructor).parameters["a"].annotation == str
+ 
+ 
+ _ValueType = typing.TypeVar("_ValueType")
+diff --git a/tests/cover/test_lookup_py38.py b/tests/cover/test_lookup_py38.py
+index 6a68254a7..db11777fe 100644
+--- a/tests/cover/test_lookup_py38.py
++++ b/tests/cover/test_lookup_py38.py
+@@ -14,7 +14,6 @@
+ # END HEADER
+ 
+ import dataclasses
+-import sys
+ import typing
+ 
+ import pytest
+@@ -103,7 +102,6 @@ class NestedDict(typing.TypedDict):
+     inner: A
+ 
+ 
+-@pytest.mark.skipif(sys.version_info[:2] >= (3, 10), reason="see issue #2897")
+ @given(from_type(NestedDict))
+ def test_typeddict_with_nested_value(value):
+     assert type(value) == dict
+-- 
+2.31.1
+
diff --git a/dev-python/hypothesis/hypothesis-6.10.1.ebuild b/dev-python/hypothesis/hypothesis-6.10.1.ebuild
index 29dc15959261..cb958ac43e92 100644
--- a/dev-python/hypothesis/hypothesis-6.10.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.10.1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
@@ -26,7 +25,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/black[${PYTHON_USEDEP}]
 			dev-python/click[${PYTHON_USEDEP}]
-		' 'python*')
+		' python3_{7..9})
 	)
 "
 BDEPEND="
@@ -40,8 +39,12 @@ BDEPEND="
 
 distutils_enable_tests --install pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
 python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+	if ! use cli || ! has "${EPYTHON}" python3_{7..9}; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
 }
diff --git a/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
index a34e8845b2c4..f2c74b22b41e 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="MarkupSafe"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe"
+HOMEPAGE="https://pypi.org/project/MarkupSafe/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/mock/files/mock-4.0.3-py310.patch b/dev-python/mock/files/mock-4.0.3-py310.patch
new file mode 100644
index 000000000000..4a096f35126c
--- /dev/null
+++ b/dev-python/mock/files/mock-4.0.3-py310.patch
@@ -0,0 +1,76 @@
+From f3e3d82aab0ede7e25273806dc0505574d85eae2 Mon Sep 17 00:00:00 2001
+From: Chris Withers <chris@simplistix.co.uk>
+Date: Thu, 15 Apr 2021 08:27:25 +0100
+Subject: [PATCH] fix tests that should test mock but were testing
+ unittest.mock
+
+---
+ mock/tests/testmock.py | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/mock/tests/testmock.py b/mock/tests/testmock.py
+index 5702b6d..1a70909 100644
+--- a/mock/tests/testmock.py
++++ b/mock/tests/testmock.py
+@@ -13,6 +13,7 @@ from mock import (
+     create_autospec, mock
+ )
+ from mock.mock import _Call, _CallList
++import mock.mock as mock_module
+ 
+ 
+ class Iter(object):
+@@ -47,7 +48,7 @@ class MockTest(unittest.TestCase):
+         # if __all__ is badly defined then import * will raise an error
+         # We have to exec it because you can't import * inside a method
+         # in Python 3
+-        exec("from unittest.mock import *")
++        exec("from mock.mock import *")
+ 
+ 
+     def test_constructor(self):
+@@ -2137,16 +2138,16 @@ class MockTest(unittest.TestCase):
+         # test_patch_dict_test_prefix and test_patch_test_prefix not restoring
+         # causes the objects patched to go out of sync
+ 
+-        old_patch = unittest.mock.patch
++        old_patch = mock_module.patch
+ 
+         # Directly using __setattr__ on unittest.mock causes current imported
+         # reference to be updated. Use a lambda so that during cleanup the
+         # re-imported new reference is updated.
+-        self.addCleanup(lambda patch: setattr(unittest.mock, 'patch', patch),
++        self.addCleanup(lambda patch: setattr(mock_module, 'patch', patch),
+                         old_patch)
+ 
+         with patch.dict('sys.modules'):
+-            del sys.modules['unittest.mock']
++            del sys.modules['mock']
+ 
+             # This trace will stop coverage being measured ;-)
+             def trace(frame, event, arg):  # pragma: no cover
+@@ -2155,7 +2156,7 @@ class MockTest(unittest.TestCase):
+             self.addCleanup(sys.settrace, sys.gettrace())
+             sys.settrace(trace)
+ 
+-            from unittest.mock import (
++            from mock.mock import (
+                 Mock, MagicMock, NonCallableMock, NonCallableMagicMock
+             )
+ 
+@@ -2170,10 +2171,10 @@ class MockTest(unittest.TestCase):
+     def test_bool_not_called_when_passing_spec_arg(self):
+         class Something:
+             def __init__(self):
+-                self.obj_with_bool_func = unittest.mock.MagicMock()
++                self.obj_with_bool_func = mock_module.MagicMock()
+ 
+         obj = Something()
+-        with unittest.mock.patch.object(obj, 'obj_with_bool_func', autospec=True): pass
++        with mock_module.patch.object(obj, 'obj_with_bool_func', autospec=True): pass
+ 
+         self.assertEqual(obj.obj_with_bool_func.__bool__.call_count, 0)
+ 
+-- 
+2.31.1
+
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
index 3af9cae62900..cd45b0903239 100644
--- a/dev-python/mock/mock-4.0.3.ebuild
+++ b/dev-python/mock/mock-4.0.3.ebuild
@@ -16,12 +16,12 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/funcsigs[${PYTHON_USEDEP}]
-	' -2)
 	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
 
 src_prepare() {
 	sed -i -e '/  pytest.*/d' setup.cfg || die
@@ -35,9 +35,6 @@ python_test() {
 	# test filtering.
 	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
 	cd "${BUILD_DIR}"/lib || die
-	if ! python_is_python3; then
-		rm mock/tests/*py3* || die
-	fi
 
 	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
 	if [[ ${EPYTHON} == pypy* ]]; then
diff --git a/dev-python/more-itertools/more-itertools-8.7.0.ebuild b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
index ffc97340c4a2..716a7429626e 100644
--- a/dev-python/more-itertools/more-itertools-8.7.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
@@ -15,10 +15,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests unittest
diff --git a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
index eea7d9efec52..96e1cf199f33 100644
--- a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for zope"
diff --git a/dev-python/nose/nose-1.3.7-r8.ebuild b/dev-python/nose/nose-1.3.7-r8.ebuild
new file mode 100644
index 000000000000..35bfb6063fbd
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r8.ebuild
@@ -0,0 +1,82 @@
+# 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(+)"
+inherit distutils-r1
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.org/project/nose/
+	https://nose.readthedocs.io/en/latest/
+	https://github.com/nose-devs/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
+		' python3_{7..9} pypy3)
+		$(python_gen_cond_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.5-backport.patch
+
+	# Patch against master found in an upstream PR, backported:
+	# https://github.com/nose-devs/nose/pull/1004
+	"${FILESDIR}"/${P}-coverage-4.1-support.patch
+
+	"${FILESDIR}"/${P}-python-3.6-test.patch
+)
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# fix manpage install path
+	sed -i -e 's:man/:share/&:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile "${add_targets[@]}"
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
index d017e5f64413..4c07fbb7f6fa 100644
--- a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
@@ -32,6 +32,13 @@ python_compile_all() {
 	use doc && emake -C doc html
 }
 
+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_install() {
 	distutils-r1_python_install
 	if ! python_is_python3; then
diff --git a/dev-python/pluggy/pluggy-0.13.1-r1.ebuild b/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
index 077605f59b10..e8bc4004a387 100644
--- a/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1-r1.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,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="$(python_gen_cond_dep \
-	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
+	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 pypy3)"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
diff --git a/dev-python/ply/ply-3.11-r1.ebuild b/dev-python/ply/ply-3.11-r1.ebuild
index a708dc807f40..76f4ee1d812c 100644
--- a/dev-python/ply/ply-3.11-r1.ebuild
+++ b/dev-python/ply/ply-3.11-r1.ebuild
@@ -1,7 +1,7 @@
 # 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} pypy3 )
 
diff --git a/dev-python/pretend/pretend-1.0.9-r1.ebuild b/dev-python/pretend/pretend-1.0.9-r1.ebuild
index f5695befb9d2..28cd40712583 100644
--- a/dev-python/pretend/pretend-1.0.9-r1.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r1.ebuild
@@ -1,7 +1,7 @@
 # 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} pypy3 )
 
@@ -15,8 +15,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
 distutils_enable_tests pytest
diff --git a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
index e111896df2b2..3605822d6a46 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -11,8 +10,7 @@ MY_P=${P/-/_}
 DESCRIPTION="Easy-to-use Python module for text parsing"
 HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
@@ -21,8 +19,6 @@ IUSE="examples"
 
 distutils_enable_tests setup.py
 
-S=${WORKDIR}/${PN}-${MY_P}
-
 python_install_all() {
 	if use examples; then
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
index 5b0b2173559d..34fea311208d 100644
--- a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
@@ -31,5 +31,5 @@ BDEPEND="
 
 python_test() {
 	distutils_install_for_testing
-	pytest -vv -p no:flaky || die "Tests failed under ${EPYTHON}"
+	epytest -p no:flaky
 }
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 32a370363cd8..5dd254fb4aa4 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,3 +2,4 @@ DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
 DIST pytest-6.2.2.tar.gz 1116980 BLAKE2B 7e74050f01fdc4b1ba8a6d703915b0d707305e6e8299917fff8e0cedb873f998c9a904728b77e7234718016ccdac15d491d10411c582d1bfa60d2450a8a2fa7b SHA512 a81def83759c550c169b3db8ed43b4df40433a88acb663e2e9422ef562149ed52041724b7f3cc5d0d6b532f2243a8d9a9614ffbcd87ed571f7fdde7f036c2297
+DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
diff --git a/dev-python/pytest/pytest-6.2.4.ebuild b/dev-python/pytest/pytest-6.2.4.ebuild
new file mode 100644
index 000000000000..27c33f540af8
--- /dev/null
+++ b/dev-python/pytest/pytest-6.2.4.ebuild
@@ -0,0 +1,60 @@
+# 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 )
+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 )"
+
+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}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			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}]
+		' python3_{7..9} pypy3)
+	)"
+
+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() {
+	[[ ${EPYTHON} == python3.10 ]] && return
+
+	distutils_install_for_testing --via-root
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX -p no:pkgcore -p no:flaky ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
index b98dc6430ea7..2867cc3e508f 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
 inherit distutils-r1
 
 DESCRIPTION="Setuptools revision control system plugin for Git"
@@ -16,9 +14,9 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-vcs/git"
-RDEPEND="${DEPEND}"
+BDEPEND=${RDEPEND}
 
 python_test() {
 	git config --global user.name "test user" || die
diff --git a/dev-python/six/six-1.15.0-r1.ebuild b/dev-python/six/six-1.15.0-r1.ebuild
index aea3bb7b77fb..077e9cf185c7 100644
--- a/dev-python/six/six-1.15.0-r1.ebuild
+++ b/dev-python/six/six-1.15.0-r1.ebuild
@@ -17,3 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 
 distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'test_six.py::test_move_items[dbm_ndbm]'
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
index e3ccd4199a98..7e5df074aa55 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.3.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
@@ -24,5 +24,5 @@ distutils_enable_tests pytest
 
 python_test() {
 	local -x PYTHONPATH=.
-	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
+	epytest --ignore docs/conf.py
 }
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index 803f8f4c2833..998b82f92214 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -19,11 +19,11 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_USEDEP}]
-		' 'python*')
+		' python3_{7..9})
 	)"
 
 DOCS=( README.rst )
diff --git a/dev-python/wheel/wheel-0.36.2.ebuild b/dev-python/wheel/wheel-0.36.2.ebuild
index 2b0f6af87101..76323c9e1005 100644
--- a/dev-python/wheel/wheel-0.36.2.ebuild
+++ b/dev-python/wheel/wheel-0.36.2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
 inherit distutils-r1
 
 DESCRIPTION="A built-package format for Python"
@@ -17,7 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 
 src_prepare() {
 	sed \
@@ -25,14 +23,3 @@ src_prepare() {
 		-i setup.cfg || die
 	distutils-r1_src_prepare
 }
-
-python_test() {
-	if ! python_is_python3; then
-		# install fails due to unicode in paths
-		ewarn "Testing is broken with py2.7, please test externally"
-		return
-	fi
-
-	distutils_install_for_testing --via-root
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}