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

[Michał Górny]

commit:     bbbf8d20a2d4f437c07b7c6519408bc98325b224
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 10:27:07 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 10:46:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbf8d20

dev-python/urllib3: Remove python2

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

 .../{urllib3-1.24.2.ebuild => urllib3-1.24.2-r1.ebuild}        |  5 +----
 .../{urllib3-1.25.10.ebuild => urllib3-1.25.10-r1.ebuild}      | 10 +---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild 
b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
similarity index 93%
rename from dev-python/urllib3/urllib3-1.24.2.ebuild
rename to dev-python/urllib3/urllib3-1.24.2-r1.ebuild
index 82e56036616..e2c7aedf480 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
        >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
        >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
        >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '
-               dev-python/ipaddress[${PYTHON_USEDEP}]
-       ' -2)
 "
 DEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]

diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild 
b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild
similarity index 84%
rename from dev-python/urllib3/urllib3-1.25.10.ebuild
rename to dev-python/urllib3/urllib3-1.25.10-r1.ebuild
index 911f80d2650..e6ad8daf3d3 100644
--- a/dev-python/urllib3/urllib3-1.25.10.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -25,9 +25,6 @@ RDEPEND="
        >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
        >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
        >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '
-               dev-python/ipaddress[${PYTHON_USEDEP}]
-       ' -2)
        brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
 "
 BDEPEND="
@@ -64,11 +61,6 @@ python_test() {
        local -x CI=1
        # FIXME: get tornado ported
        case ${EPYTHON} in
-               python2*)
-                       ewarn "Tests are being skipped for Python 2 in order to 
reduce the number"
-                       ewarn "of circular dependencies for Python 2 removal.  
Please test"
-                       ewarn "manually in a virtualenv."
-                       ;;
                python3*)
                        pytest -vv || die "Tests fail with ${EPYTHON}"
                        ;;