commit: a43fb0f7edf3f399db903277323148963e4d2b4f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 14:49:52 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 15:13:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43fb0f7
dev-python/setuptools: Reenable tests on py3.8
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/setuptools/setuptools-42.0.2.ebuild | 28 +++++++-------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/dev-python/setuptools/setuptools-42.0.2.ebuild
b/dev-python/setuptools/setuptools-42.0.2.ebuild
index 4a4fdf1ae70..9bee3995ddc 100644
--- a/dev-python/setuptools/setuptools-42.0.2.ebuild
+++ b/dev-python/setuptools/setuptools-42.0.2.ebuild
@@ -24,21 +24,16 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-# Temporary hack to avoid py38 keywording hell. Please remove when
-# the test deps all have py38. Also setuptools' test pass with py38,
-# so you need to hack them all in locally before bumping and test.
BDEPEND="
app-arch/unzip
test? (
- $(python_gen_cond_dep '
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- ' python2_7 python3_{5,6,7} pypy{,3})
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+ dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+ dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
)
"
PDEPEND="
@@ -71,15 +66,6 @@ python_prepare_all() {
}
python_test() {
- if [[ ${EPYTHON} == python3.8 ]]; then
- if [[ ${PV} != 42.0.2 ]]; then
- eerror "Please disable py38 hacks and test locally,
then update this."
- die "Python 3.8 support untested for ${PV}"
- fi
- einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
- return
- fi
-
# test_easy_install raises a SandboxViolation due to
${HOME}/.pydistutils.cfg
# It tries to sandbox the test in a tempdir
HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
