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

[Michał Górny]

commit:     d36bb27451a22c7329ef4ad1a20b6f70adedefec
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 12:49:50 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 12:53:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36bb274

dev-python/urllib3: Enable py3.8

Enable python3.8.  While the ebuild doesn't test it, the test run
locally via venv fail the same way on py3.7 and py3.8.

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

 dev-python/urllib3/urllib3-1.24.2.ebuild | 31 +++++++++++++++++--------------
 dev-python/urllib3/urllib3-1.25.7.ebuild |  4 ++--
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild 
b/dev-python/urllib3/urllib3-1.24.2.ebuild
index 8e4a8d1a987..b1598117c52 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -33,16 +33,19 @@ DEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]
        test? (
                ${RDEPEND}
-               >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+               dev-python/mock[${PYTHON_USEDEP}]
                dev-python/pytest[${PYTHON_USEDEP}]
+               >=www-servers/tornado-4.2.1[$(python_gen_usedep 
python{2_7,3_{5,6,7}})]
        )
        doc? (
-               dev-python/mock[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
+               $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
        )
 "
 
-# Testsuite written requiring mock to be installed under all Cpythons
+python_check_deps() {
+       use doc || return 0
+       has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
 
 python_prepare_all() {
        # skip appengine tests
@@ -52,17 +55,17 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-       use doc && emake -C docs SPHINXOPTS= html
+       if use doc; then
+               emake -C docs SPHINXOPTS= html
+               HTML_DOCS=( docs/_build/html/. )
+       fi
 }
 
 python_test() {
        # FIXME: get tornado ported
-       if [[ ${EPYTHON} == python* ]]; then
-               py.test -v || die "Tests fail with ${EPYTHON}"
-       fi
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( docs/_build/html/. )
-       distutils-r1_python_install_all
+       case ${EPYTHON} in
+               python2*|python3.[567])
+                       pytest -vv || die "Tests fail with ${EPYTHON}"
+                       ;;
+       esac
 }

diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild 
b/dev-python/urllib3/urllib3-1.25.7.ebuild
index 26c31d9c416..5795ab0d02a 100644
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -37,7 +37,7 @@ BDEPEND="
                dev-python/mock[${PYTHON_USEDEP}]
                dev-python/pytest[${PYTHON_USEDEP}]
                >=dev-python/trustme-0.5.3[${PYTHON_USEDEP}]
-               >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+               >=www-servers/tornado-4.2.1[$(python_gen_usedep 
python{2_7,3_{5,6,7}})]
        )
        doc? (
                $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')