bump; update and re-include pypy test phase, upstream bug cited for known suspect...

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

diff --git a/dev-python/urllib3/ChangeLog b/dev-python/urllib3/ChangeLog
index f53f921ce7ddeb2b6bcc870dd2ac56503137d76b..b5ebab75a49eda43776d0b6e8589ad7d4aefbb6b 100644 (file)
--- a/dev-python/urllib3/ChangeLog
+++ b/dev-python/urllib3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/urllib3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.27 2014/10/22 09:59:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.28 2014/12/27 03:17:59 idella4 Exp $
+
+*urllib3-1.10 (27 Dec 2014)
+
+  27 Dec 2014; Ian Delaney <idella4@gentoo.org> +urllib3-1.10.ebuild,
+  -urllib3-1.8.3.ebuild, -urllib3-1.9.ebuild:
+  bump; update and re-include pypy test phase, upstream bug cited for known
+  suspect tests, rm old
 
   22 Oct 2014; Jeroen Roovers <jer@gentoo.org> urllib3-1.9.1.ebuild:
   Marked ~hppa (bug #525246).

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index e0743bb0d406a92491bb7cc43b29c3d991d1bb6c..f2744d0ffc2f0f3b0507ade1642f9ed5fd8ebf38 100644 (file)
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST urllib3-1.8.3.tar.gz 85466 SHA256 4b162cffb6c7dde47b47ecee741f8a00953512541241e61d0f8292107a865426 SHA512 f60b9a20ba4d6c4cc11cb2bfca7278fee24cd8a4c528207dd95694ca44052878ecb147a85f335ed54854116fb1d9d7830da41e90032627a4c3d9f55c87fde553 WHIRLPOOL c4deebebdd8f25efc049d635e5705415d3ce47bf3da557816c43732fe607e0f7fe941806e3b81257376d22fdcd01d935938ef7ae46c3d56d84222e3d2e8035bc
+DIST urllib3-1.10.tar.gz 128200 SHA256 25b4a7fbbd9112e0190f31f8877aa0523caeab8630872ad1bbddaba01cdd6599 SHA512 32f9162f82a676146fae6bba462d21eb81635d8660ca4676b5e8dd3d18b68525a265695c646f06c099a78c24d9b108f0610d3e17f20578d473771bebd42cc52d WHIRLPOOL a8a84b79fd0edeecdd19eaef0ee809d1c5d842ff6bcf089df9a1111744a2f42bec1a366b76b6e7334a51cad83d42b166f133a4156bbbfb7be24518353ee71081
 DIST urllib3-1.9.1.tar.gz 171086 SHA256 d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b SHA512 c972e4dc9dabf6378da75e0abce5e53bec29624f2dc0faff3c8ce762474d490da6aec7d2e374c57d0d18e640311845750eb257fc7829ac9d25a3d9c957c59c6f WHIRLPOOL 666b82e712939b3ff5dfe109ba0498c16dbea7f2c0f0c2e1c317cf7e6f03711ce4a9468bb72327abe7821aa75c0257d30dbce5c196ba59215df3dba4084c7360
-DIST urllib3-1.9.tar.gz 91865 SHA256 4e400b2e2f53652dd0d8062ca5ecc425b6af6e96989b8d31f5dd875186aa247b SHA512 7a0be91d448c7983f92fb7255a9fed20c406de85748274f056c7e54f0d87930891d7825ffc0c885e828a75bb53cccd2dbdbe40a04dab81a36001aad776dab9e0 WHIRLPOOL 3ac0085e941047ada63258c7e7306980d0537cfe46fcf94870ed0f71b417b7116e1d9d9dc62ce689eecb6a93fd59d69b5de25e13db3ced8348d062e6837750bc
-EBUILD urllib3-1.8.3.ebuild 1270 SHA256 1627640af3e397a7ff0d9011606a8bedbda36b1b0a81a07bfe65ec614047ca02 SHA512 a427fbde72acb607543287118db9db63bb765c71e21afa5d20b4315039785aa0ae448bce7a667af37d4f16053e732051c7a2a2418960562e2558fcaa456a0ad1 WHIRLPOOL d5f30ad5f577527366e80e6b44fbec8086ac397de02ffb97d1a418c0ac8ece229b8075f5b96561322443f1c828c96dd62a0b16e4e766139170094f1a3f644e6e
+EBUILD urllib3-1.10.ebuild 2169 SHA256 84e591c9a212b577586f6ce00603c813c18a169bce8b1e986ba88e6f2e0256d7 SHA512 bfb71f1367af9c5c3eac8b430baf4d1b472829182dbfdffd08aaf12d12298b56001affbacb95d971ebc78362ec97541237e1e987f38474d7c1efc122cb52b432 WHIRLPOOL 36523345804450e0d8a0d916d55ae9554e4d79ab9d45c46dfe0cbe840c07e8a411635b3ca8a7f932801b908036a1d6ea46485b83bd654d11d8d058a9f7652628
 EBUILD urllib3-1.9.1.ebuild 2198 SHA256 f992dbcb9525f15246333b86b6a09ccdc7ca0d78fd7d037ed3de5db23686f44b SHA512 1c7dfdf015d4e6345de3454406e782d4ae47668ccebfa5818fa469a7ca3489f54d9540dc361d48671d7ff074081157b429d38ae0b30f556f71c82a70efb77174 WHIRLPOOL 09799375acc738231e056202aef278464bea56fda0cfb16f2a6effaf16f9d30fbe454bd1ebfe751ab3c10cc9cf397c1546342b3a74caf40c8914695df174d32d
-EBUILD urllib3-1.9.ebuild 1360 SHA256 b33450c2f71b93f3320b5b883f1802215860c120744627212ba6ac63c7918abf SHA512 bc931b7a2b9ce4f0a408b318d799ef4430a05f08245e338f56d9bdd4f9c253c847c12dc28d335c20c5743cf0fa75e56a0d10b778dbd055dec1f24a186a83f448 WHIRLPOOL 0327ece84d9b08a67e9e83c43e7456defdf8548e9cb92c7c36deb63fc4dc6e44f5f3d9fdd580d6bb5f10fa7ceb85e5797232db357fea51838cddd12b215bf541
-MISC ChangeLog 4080 SHA256 2d2aad8678517977871721d4e27ab7533974b3615af64c03f9e5d537c15d66ba SHA512 b28f8f11bee1e418fb413d0a6fc2a655bb5b5d72e91ce8ab761008de2731ebc1d27fe004875f218835170b52aefd4add196798e7e3041bcf09eaef231b9e162d WHIRLPOOL 68a3df7b7d2a6cf8df9186828e7811f592cfe4ea7b6dba08e3334242437ce22e8f9597148b14ab753ac404ca52b50ec333cb23c721bacd5fcabf0e815dbf4616
+MISC ChangeLog 4330 SHA256 f4cd7559c5900ea3b03a9dfd4196b5ae444fe77ba98fc41bd5d42740666f7143 SHA512 49a3ac6a8f7a035473c03585af55cd368cf342a938b13dcea1a07789146ab420743e0887f57ce9c6950144e7a3108e89157bde5e22ebd18f90bce38cca0188d4 WHIRLPOOL a64cbdcd83fe088cd6ddae845f8319b662bf159ec57597dad94c1494c85829a9f3b72bb213a94d1499f235c8b6de7b31fdf065dd3be4dcd30995834500646b98
 MISC metadata.xml 230 SHA256 783d7ab5ebaca687ef2ba45f8c567e93e45eb308a515f0d5ec28afc1e0fe652b SHA512 9f624d4ed6ed478e14955782355c19c0f92198d23bf9c4422e11d38b978f062f781a125883b43ea4c5fc7a1002e08db61cdb59bfc5e7e40c50361869913abf87 WHIRLPOOL 183ead4fc7c1b5dd984879f30ed2fcf7ed855a38edb1747b4000dc1dbe17fc19cf101345c60ed85d996102879ed4a786d8f5227436b978cc910edd3b2727cf89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRHf/sACgkQVWmRsqeSphPi4wCbB68+nQiu+Uy6QHIy9+vbfNEb
-ktkAn2ZUtATBixWNuDHDCvN1LlDQa1Mw
-=W6O2
+iEYEAREIAAYFAlSeJPcACgkQso7CE7gHKw0+SgCfRitzbyAXIU3MdpuM31p7+f2H
+iEgAnjojiDnY7COvdSB+IyrXFJWvoVwj
+=qexW
 -----END PGP SIGNATURE-----

diff --git a/dev-python/urllib3/urllib3-1.10.ebuild b/dev-python/urllib3/urllib3-1.10.ebuild
new file mode 100644 (file)
index 0000000..81217db
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.10.ebuild,v 1.1 2014/12/27 03:17:59 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep \
+               'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
+DEPEND="test? (
+               ${RDEPEND}
+               ~www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+               dev-python/nose[${PYTHON_USEDEP}]
+       )"
+
+python_prepare_all() {
+       # Replace bundled copy of dev-python/six
+       cat > urllib3/packages/six.py <<-EOF
+               from __future__ import absolute_import
+               from six import *
+       EOF
+
+       sed -i 's:cover-min-percentage = 100::' setup.cfg || die
+       # Fix tests
+       sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
+
+       # Reset source of objects.inv
+       if use doc; then
+               local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+               local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+               local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+               local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+               sed -i "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+       fi
+
+       distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+       use doc && emake -C docs html
+}
+
+python_test() {
+       # https://github.com/shazow/urllib3/issues/527
+       # test_https_connection_read_timeout is found to hang and
+       # test_verified is found to fail  under py2.7 and pypy.
+       # upstream by their own admission describe the tests as flakey
+       nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+       use doc && local HTML_DOCS=( docs/_build/html/. )
+
+       distutils-r1_python_install_all
+}

diff --git a/dev-python/urllib3/urllib3-1.8.3.ebuild b/dev-python/urllib3/urllib3-1.8.3.ebuild
deleted file mode 100644 (file)
index b61d318..0000000
--- a/dev-python/urllib3/urllib3-1.8.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.8.3.ebuild,v 1.2 2014/10/15 23:14:04 blueness Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
-
-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="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep \
-               'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' \
-               'python2*' pypy)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               >=www-servers/tornado-2.4.1[${PYTHON_USEDEP}]
-               dev-python/mock[${PYTHON_USEDEP}]
-               dev-python/nose[${PYTHON_USEDEP}]
-       )"
-
-python_prepare_all() {
-       # Replace bundled copy of dev-python/six
-       cat > urllib3/packages/six.py <<-EOF
-               from __future__ import absolute_import
-               from six import *
-       EOF
-
-       sed -i "s/'dummyserver',//" setup.py || die
-       sed -i 's:cover-min-percentage = 100::' setup.cfg || die
-
-       distutils-r1_python_prepare_all
-}
-
-python_test() {
-       nosetests -v || die "Tests fail with ${EPYTHON}"
-}

diff --git a/dev-python/urllib3/urllib3-1.9.ebuild b/dev-python/urllib3/urllib3-1.9.ebuild
deleted file mode 100644 (file)
index e1b4d00..0000000
--- a/dev-python/urllib3/urllib3-1.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.9.ebuild,v 1.3 2014/10/15 23:14:04 blueness Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
-
-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="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep \
-               'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' \
-               'python2*' pypy)"
-DEPEND="test? (
-               ${RDEPEND}
-               >=www-servers/tornado-2.4.1[${PYTHON_USEDEP}]
-               dev-python/mock[${PYTHON_USEDEP}]
-               dev-python/nose[${PYTHON_USEDEP}]
-               dev-python/six[${PYTHON_USEDEP}]
-       )"
-
-python_prepare_all() {
-       # Replace bundled copy of dev-python/six
-       cat > urllib3/packages/six.py <<-EOF
-               from __future__ import absolute_import
-               from six import *
-       EOF
-
-       sed -i 's:cover-min-percentage = 100::' setup.cfg || die
-       # Fix tests
-       sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
-       sed -i '/clear_warnings/d' test/test_util.py || die
-
-       distutils-r1_python_prepare_all
-}
-
-python_test() {
-       nosetests -v || die "Tests fail with ${EPYTHON}"
-}