gentoo Easter resync : 12.04.2020

5 files changed, 67 insertions, 13 deletions

diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 5af950b7772d..72254113d932 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,5 +1,7 @@
-DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
+AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5ac0f713a619cd9bae6514bfd22157c8edad08f950b1e207f78b2c9e06e0a0bf281a4406a639200e7b3559a727ff048cf4c51105 SHA512 a0ac3983aa6d88a30b1b31872f24b1ecd7c1055d5f8354ecb14da6aaab029ffe9e5f818d75e5ff3f44f6f70c624ec20bd9f5ae1831e3297cdaf423af7e2ce3d5
+AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
-EBUILD yarl-1.1.1.ebuild 680 BLAKE2B 6d6b88fd0f63d036e74169e4fc767d3c0f4e64f260bf45483ffea89d0ef7e8c6be699f242575e5e7bc477f71c6b041613807a6a8b083ed1ea9cf1672c760c2e6 SHA512 662f52237301ccbba20055206489c7329eef367a94c9e3e415fd8bb6d52b11074a9f74e51b855095b2ca5d23d531e5518795434a3551a8342e5ec4f34a57f16d
-EBUILD yarl-1.3.0.ebuild 831 BLAKE2B 2ddf19659aed2b990c7c90e396b216651fb780826699a220bb8d445a76d96989c15a97545f29acb3e28cce90bd5c405788b0829c1cc113abc573578fdd6311be SHA512 2b831cc6410ba69f92dad1e01564729daf16a232774602495f4391b4373d8064d28801477c2988195d71bc302b7f89007f52e7a4b3eb9582dfbf4b0514e0e534
+DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
+EBUILD yarl-1.3.0.ebuild 830 BLAKE2B cc31ea0ccab8787c7b0a4fc50c4c4859b70d4bbd2264ecd5fbb65d944b5be7f4a3d77416643b447d4d85da79225dace6af20d9244cedd0c913f43b06cdadab65 SHA512 81237147ffab8d8497bb5305a766d656725c9b0f2d168e6f42c5b713f8a3feb3080d61c91ff0e33da531c081fe4837900e3876e11c8490efb33a183d123b8663
+EBUILD yarl-1.4.2.ebuild 854 BLAKE2B 5a07c101c49128f389cd4dcd21306b08191a613509c38f8887229b9f43de30fd36a5316396bc124d0972c5e2e11084c41843dcabf81843a58a4601e5c3d44f5d SHA512 0f5f65af2a68f2dc9718a5281f711bbf1228e7dd252f7c88c1dd8bece5150eeed273906acf2134a789ba6cb3706763c810e8eb1eb2cc299a6278f7a29803d4a4
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch b/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
new file mode 100644
index 000000000000..b6f774a77eaa
--- /dev/null
+++ b/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
@@ -0,0 +1,25 @@
+From ca06b26582c08c6e75fa5588f712c4c2f7247223 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 4 Mar 2020 22:36:58 +0100
+Subject: [PATCH] Disable failing test TestScheme.test_no_scheme1
+
+---
+ tests/test_url_parsing.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py
+index beea365..58fa198 100644
+--- a/tests/test_url_parsing.py
++++ b/tests/test_url_parsing.py
+@@ -38,7 +38,7 @@ class TestScheme:
+         assert u.query_string == ""
+         assert u.fragment == ""
+ 
+-    def test_no_scheme1(self):
++    def _test_no_scheme1(self):
+         u = URL("google.com:80")
+         assert u.scheme == ""
+         assert u.host is None
+-- 
+2.24.1
+
diff --git a/dev-python/yarl/files/yarl-1.4.2-test-without-coverage.patch b/dev-python/yarl/files/yarl-1.4.2-test-without-coverage.patch
new file mode 100644
index 000000000000..6fac57fdd249
--- /dev/null
+++ b/dev-python/yarl/files/yarl-1.4.2-test-without-coverage.patch
@@ -0,0 +1,24 @@
+From 364faab4ba6d433fdb31785ee14c25fa4d65dbb4 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 4 Mar 2020 22:23:40 +0100
+Subject: [PATCH] setup.cfg: Stop collecting coverage during test execution
+
+---
+ setup.cfg | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index a9c0f7b..aea046b 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -2,7 +2,6 @@
+ license_file = LICENSE
+ 
+ [tool:pytest]
+-addopts = --cov=yarl -v
+ filterwarnings = error
+ norecursedirs = dist docs build .tox .eggs venv virtualenv .git
+ minversion = 3.8.2
+-- 
+2.24.1
+
diff --git a/dev-python/yarl/yarl-1.3.0.ebuild b/dev-python/yarl/yarl-1.3.0.ebuild
index 3bd01b198118..f541d5c0f1d2 100644
--- a/dev-python/yarl/yarl-1.3.0.ebuild
+++ b/dev-python/yarl/yarl-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yarl/yarl-1.1.1.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index 8e54ae1a03f3..029aea2f92fe 100644
--- a/dev-python/yarl/yarl-1.1.1.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -21,12 +21,15 @@ RDEPEND="
 	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
+
+	# Upstream: https://github.com/aio-libs/yarl/issues/410
+	"${FILESDIR}"/${PN}-1.4.2-disable-broken-tests.patch
+)
 
 python_test() {
-	esetup.py test
+	py.test -v tests || die "Tests fail with ${EPYTHON}"
 }