gentoo resync : 15.12.2019

3 files changed, 101 insertions, 0 deletions

diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index f123425b9318..77289770ba7f 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,6 @@
+AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab467ccbcd2020ea41ca49299688e2f88127e0b7e67545eb62659ac2729ca02b46d1e5a8c015c1d6cdd6a5ee0f8170cd483 SHA512 1de7c78c51be49e4004decd28d40e183a44c15b1e321c41595abc114ddb829ad54fc02dfb573a620cfe71f0996b78c822cb37cd68b3fb2d8e395b5f829227496
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
+DIST requests-2.22.0.tar.gz 113406 BLAKE2B 36e1fa106f30af3d560c11edab3cd8f7e79116378c6f4d505052c8b19021846a22b4631567859b23331e7c9413896e77d7fc3288cd3af586f5f99da21c9181a6 SHA512 8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5
 EBUILD requests-2.21.0-r1.ebuild 1428 BLAKE2B fd14c5283f935d82bad2cd2bcd174205c7633f849bf6033765b24eb8e05cac239ce0b1f6e29a5ce820def922b8773ac22eaf4555e668b16b8d020d085cc0e023 SHA512 1f8625f76a44dfe4547dcbce5f03263650b478312fcc015f72db3c8f49e7d468faf3295016b6efd9925e9d94775d7f318371117b484d9b893ef5fc0b7eaeed66
+EBUILD requests-2.22.0.ebuild 1869 BLAKE2B 380a5cdc0b640568399b536b11568c687b762bfdd1981e599154a9e9bda4291ad7de73d1abde30139ab772090a1676ffe9a17461e53bbe6f2ea7d931390aff63 SHA512 64046bb303e3ff3e9e0050ff1343f2fae5d0fa24c07df38c9605d00925e40dd6161cb048e498991683da9b539acecd5081e90fe79afa5c3e9bfdb495dfadc74a
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/files/requests-2.22.0-pytest-4.patch b/dev-python/requests/files/requests-2.22.0-pytest-4.patch
new file mode 100644
index 000000000000..5b8ec34912d9
--- /dev/null
+++ b/dev-python/requests/files/requests-2.22.0-pytest-4.patch
@@ -0,0 +1,27 @@
+From dc75b3ca0b4c95648eb07b92cb414394d99c13a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Mon, 8 Apr 2019 18:04:22 +0200
+Subject: [PATCH] Support pytest 4
+
+Fixes https://github.com/kennethreitz/requests/issues/5048
+
+See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
+---
+ setup.py            | 2 +-
+ tests/test_utils.py | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_utils.py b/tests/test_utils.py
+index 59b0b0efa..62c51494d 100644
+--- a/tests/test_utils.py
++++ b/tests/test_utils.py
+@@ -33,7 +33,8 @@ class TestSuperLen:
+         'stream, value', (
+             (StringIO.StringIO, 'Test'),
+             (BytesIO, b'Test'),
+-            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
++            pytest.param(cStringIO, 'Test',
++                         marks=pytest.mark.skipif('cStringIO is None')),
+         ))
+     def test_io_streams(self, stream, value):
+         """Ensures that we properly deal with different kinds of IO streams."""
diff --git a/dev-python/requests/requests-2.22.0.ebuild b/dev-python/requests/requests-2.22.0.ebuild
new file mode 100644
index 000000000000..1902a0432fd7
--- /dev/null
+++ b/dev-python/requests/requests-2.22.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="socks5 +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	<dev-python/chardet-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-2.9[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	)
+"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+		' python{2_7,3_{5,6,7}})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/requests-2.22.0-pytest-4.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip tests that require some kind of network
+	sed -e 's:test_connect_timeout:_&:' \
+		-e 's:test_total_timeout_connect:_&:' \
+		-i tests/test_requests.py || die
+	# probably pyopenssl version dependent
+	sed -e 's:test_https_warnings:_&:' \
+		-i tests/test_requests.py || die
+}
+
+python_test() {
+	# tests hang with pypy & pypy3
+	[[ ${EPYTHON} == pypy* ]] && continue
+	# TODO: reenable when deps are ready
+	[[ ${EPYTHON} == python3_8 ]] && continue
+
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}