From bbbf8d20a2d4f437c07b7c6519408bc98325b224 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 20 Sep 2020 12:27:07 +0200 Subject: dev-python/urllib3: Remove python2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/urllib3/urllib3-1.24.2-r1.ebuild | 64 +++++++++++++++++++++++ dev-python/urllib3/urllib3-1.24.2.ebuild | 67 ------------------------ dev-python/urllib3/urllib3-1.25.10-r1.ebuild | 68 +++++++++++++++++++++++++ dev-python/urllib3/urllib3-1.25.10.ebuild | 76 ---------------------------- 4 files changed, 132 insertions(+), 143 deletions(-) create mode 100644 dev-python/urllib3/urllib3-1.24.2-r1.ebuild delete mode 100644 dev-python/urllib3/urllib3-1.24.2.ebuild create mode 100644 dev-python/urllib3/urllib3-1.25.10-r1.ebuild delete mode 100644 dev-python/urllib3/urllib3-1.25.10.ebuild (limited to 'dev-python/urllib3') diff --git a/dev-python/urllib3/urllib3-1.24.2-r1.ebuild b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild new file mode 100644 index 000000000000..e2c7aedf4805 --- /dev/null +++ b/dev-python/urllib3/urllib3-1.24.2-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) +PYTHON_REQ_USE="ssl(+)" + +inherit distutils-r1 + +DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" +HOMEPAGE="https://github.com/shazow/urllib3" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] + =dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] + >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + $(python_gen_cond_dep " + ${RDEPEND} + dev-python/mock[\${PYTHON_USEDEP}] + dev-python/pytest[\${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] + " 'python3*') + ) +" + +distutils_enable_sphinx docs \ + dev-python/alabaster \ + dev-python/mock + +python_prepare_all() { + # skip appengine tests + rm -r test/appengine || die + + distutils-r1_python_prepare_all +} + +python_test() { + # 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}" + ;; + esac +} diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild deleted file mode 100644 index 82e560366169..000000000000 --- a/dev-python/urllib3/urllib3-1.24.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) -PYTHON_REQ_USE="ssl(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" -HOMEPAGE="https://github.com/shazow/urllib3" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] - =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}] - test? ( - $(python_gen_cond_dep " - ${RDEPEND} - dev-python/mock[\${PYTHON_USEDEP}] - dev-python/pytest[\${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] - " 'python3*') - ) -" - -distutils_enable_sphinx docs \ - dev-python/alabaster \ - dev-python/mock - -python_prepare_all() { - # skip appengine tests - rm -r test/appengine || die - - distutils-r1_python_prepare_all -} - -python_test() { - # 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}" - ;; - esac -} diff --git a/dev-python/urllib3/urllib3-1.25.10-r1.ebuild b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild new file mode 100644 index 000000000000..e6ad8daf3d3d --- /dev/null +++ b/dev-python/urllib3/urllib3-1.25.10-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) +PYTHON_REQ_USE="ssl(+)" + +inherit distutils-r1 + +DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" +HOMEPAGE="https://github.com/urllib3/urllib3" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86" +IUSE="brotli test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] + =dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] + >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] + brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + $(python_gen_cond_dep " + ${RDEPEND} + dev-python/brotlipy[\${PYTHON_USEDEP}] + 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_USEDEP}] + " python3_{6,7,8,9}) + ) +" + +distutils_enable_sphinx docs \ + dev-python/alabaster \ + dev-python/mock + +python_prepare_all() { + # https://github.com/urllib3/urllib3/issues/1756 + sed -e 's:10.255.255.1:240.0.0.0:' \ + -i test/__init__.py || die + # tests failing if 'localhost.' cannot be resolved + sed -e 's:test_dotted_fqdn:_&:' \ + -i test/with_dummyserver/test_https.py || die + sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \ + -i test/with_dummyserver/test_socketlevel.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + local -x CI=1 + # FIXME: get tornado ported + case ${EPYTHON} in + python3*) + pytest -vv || die "Tests fail with ${EPYTHON}" + ;; + esac +} diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10.ebuild deleted file mode 100644 index 911f80d2650d..000000000000 --- a/dev-python/urllib3/urllib3-1.25.10.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 ) -PYTHON_REQ_USE="ssl(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" -HOMEPAGE="https://github.com/urllib3/urllib3" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86" -IUSE="brotli test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] - =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=" - test? ( - $(python_gen_cond_dep " - ${RDEPEND} - dev-python/brotlipy[\${PYTHON_USEDEP}] - 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_USEDEP}] - " python3_{6,7,8,9}) - ) -" - -distutils_enable_sphinx docs \ - dev-python/alabaster \ - dev-python/mock - -python_prepare_all() { - # https://github.com/urllib3/urllib3/issues/1756 - sed -e 's:10.255.255.1:240.0.0.0:' \ - -i test/__init__.py || die - # tests failing if 'localhost.' cannot be resolved - sed -e 's:test_dotted_fqdn:_&:' \ - -i test/with_dummyserver/test_https.py || die - sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \ - -i test/with_dummyserver/test_socketlevel.py || die - - distutils-r1_python_prepare_all -} - -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}" - ;; - esac -} -- cgit v1.2.3-18-g5258