[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/

[Michał Górny]

commit:     c8450538b10b235ace13d324021308dbf5ad9604
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 19:39:42 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 20:19:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8450538

dev-python/setuptools: Disable tests on py2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/setuptools/setuptools-44.1.0.ebuild    | 20 ++++++++++++--------
 dev-python/setuptools/setuptools-46.4.0-r1.ebuild | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild 
b/dev-python/setuptools/setuptools-44.1.0.ebuild
index 56fd5bdf49f..9e87131b2a1 100644
--- a/dev-python/setuptools/setuptools-44.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-44.1.0.ebuild
@@ -27,15 +27,14 @@ RESTRICT="!test? ( test )"
 BDEPEND="
        app-arch/unzip
        test? (
-               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}]
                $(python_gen_cond_dep '
-                       dev-python/futures[${PYTHON_USEDEP}]
-               ' -2)
+                       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}]
+               ' -3)
        )
 "
 PDEPEND="
@@ -68,6 +67,11 @@ python_prepare_all() {
 }
 
 python_test() {
+       if ! python_is_python3; then
+               einfo "Tests are skipped on py2 to untangle 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}"

diff --git a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild 
b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
index c78752db8a1..84c903df0f5 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
@@ -21,15 +21,14 @@ RESTRICT="!test? ( test )"
 BDEPEND="
        app-arch/unzip
        test? (
-               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}]
                $(python_gen_cond_dep '
-                       dev-python/futures[${PYTHON_USEDEP}]
-               ' -2)
+                       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}]
+               ' -3)
        )
 "
 PDEPEND="
@@ -63,6 +62,11 @@ python_prepare_all() {
 }
 
 python_test() {
+       if ! python_is_python3; then
+               einfo "Tests are skipped on py2 to untangle deps"
+               return
+       fi
+
        distutils_install_for_testing
        # test_easy_install raises a SandboxViolation due to 
${HOME}/.pydistutils.cfg
        # It tries to sandbox the test in a tempdir