gentoo resync : 05.12.2021

4 files changed, 66 insertions, 4 deletions

diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 8dec60d686dc..53f40c2ee54d 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,5 +1,6 @@
+AUX ipyparallel-7.1.0-test-timeouts.patch 2067 BLAKE2B 577b33b730f110775dbd61fe02d06834fe3c4eb3c730d6df16730bbc877402e9f4756b74691bb977c3892ff981d374a4d1b439bf2b682e76c496ce8502f26583 SHA512 2d0f9fb4966be06299b40cd2ad974b4f94cfedea84fcee38b900ce4596b15cd3963068fc374aa1c0e54765b92d68c5233965fd2d3696bba5474da24917d1f009
 DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
 DIST ipyparallel-7.1.0.tar.gz 4029033 BLAKE2B badf4bdad0dca0898e62abee3e5a48b06460160bd1f2ae096bc05beb00dbd6dc2b52681aa699d69a76f5a51e4cd3f0bb107fa6b1d20109e76bc78da8f08b69f9 SHA512 9a629bd92176dbace1724efe0a5a698b2d684128567513f8809fd25e4901227d1c7fc7b02427fd3c14b3743b47956ff8387098a1cc8759d8987aa5e3d8ca60d5
-EBUILD ipyparallel-6.3.0-r1.ebuild 2301 BLAKE2B aff6fdb2be4fd77aa1c6196cba66230d77913197e12cc3f091822972832428fd7904ad5adcb73634f8b3d6845918d7e37ee401867d57ab0c52c0fb19991bf6c9 SHA512 630837548ff1cc637fb2acf6fca3baf2425f6c9139ede20f6dbfb08f618fceb83a42b4dd222c5841e98b6e2aa19713e080dc00594432744661a06fd5dc9764a9
-EBUILD ipyparallel-7.1.0.ebuild 2268 BLAKE2B a7007faf216c13f9d39294c4fcb8caf5a3917c895951fc2c3dac86fc77a3222f3d049fec94a9429a5f386b9d2994bb861d12f497d9fe77cd68ac5d7276b8e961 SHA512 243098986e9a2be39c2af5b7ec9fee9611db065849ad5cc34793609bb71d219aa0b5e58b8d6b43662abad281872c0e473382d8384d3270959f718ac6f07ec7ff
+EBUILD ipyparallel-6.3.0-r1.ebuild 2305 BLAKE2B 80b0818f788962604a564ce9c74068b27c8740e59b84405c297f314e65d7d459f6e638885570babbff88d861f5e48e8353c6ce30f4ae698f5213dd285104f0af SHA512 c6e4d5005fb46c79f5a19f00bfa60cafd8e57ce98f5083aa2d975710ec05678fe8319f66722dfe065d27bba4ae38984da0f5cfb51ce64c5d21671bce35226c19
+EBUILD ipyparallel-7.1.0.ebuild 2913 BLAKE2B 409329a470efa0b9e6996925ff3d57084c1aeede7fcf9e588d7d7131633a83db3528d701a31d1cd3b39cc45ad7f2c89d41e775c91eade506e34a0bf99d9609e0 SHA512 4baf3ffad4747bd01ecfd498b4ac30dfc33765c8f441ec5016fe3985de2671c1e0cedc9a180554690e4ee5e4587f4f20b9fdc14b3f508320967e83fc0ecd97cf
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/files/ipyparallel-7.1.0-test-timeouts.patch b/dev-python/ipyparallel/files/ipyparallel-7.1.0-test-timeouts.patch
new file mode 100644
index 000000000000..2b0614e95d7d
--- /dev/null
+++ b/dev-python/ipyparallel/files/ipyparallel-7.1.0-test-timeouts.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/823458
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 14 Nov 2021 08:34:15 +0000
+Subject: [PATCH] Crank up test timeouts
+
+--- a/ipyparallel/tests/__init__.py
++++ b/ipyparallel/tests/__init__.py
+@@ -74,7 +74,7 @@ def setup():
+     while not os.path.exists(engine_json) or not os.path.exists(client_json):
+         if cp.poll() is not None:
+             raise RuntimeError("The test controller exited with status %s" % cp.poll())
+-        elif time.time() - tic > 15:
++        elif time.time() - tic > 60:
+             raise RuntimeError("Timeout waiting for the test controller to start.")
+         time.sleep(0.1)
+     add_engines(1)
+@@ -107,7 +107,7 @@ def add_engines(n=1, profile='iptest', total=False):
+     while len(rc) < base + n:
+         if any([ep.poll() is not None for ep in eps]):
+             raise RuntimeError("A test engine failed to start.")
+-        elif time.time() - tic > 15:
++        elif time.time() - tic > 60:
+             raise RuntimeError("Timeout waiting for engines to connect.")
+         time.sleep(0.1)
+     rc.close()
+--- a/ipyparallel/tests/test_lbview.py
++++ b/ipyparallel/tests/test_lbview.py
+@@ -21,7 +21,7 @@ class TestLoadBalancedView(ClusterTestCase):
+         self.assertRaisesRemote(error.EngineError, ar.get, 10)
+         eid = ar.engine_id
+         tic = time.time()
+-        while eid in self.client.ids and time.time() - tic < 5:
++        while eid in self.client.ids and time.time() - tic < 30:
+             time.sleep(0.01)
+         assert eid not in self.client.ids
+ 
+--- a/ipyparallel/tests/test_view.py
++++ b/ipyparallel/tests/test_view.py
+@@ -47,7 +47,7 @@ class TestView(ClusterTestCase):
+         ar = view.apply_async(conditional_crash, ipp.Reference("should_crash"))
+         self.assertRaisesRemote(error.EngineError, ar.get, 10)
+         tic = time.perf_counter()
+-        while eid in self.client.ids and time.perf_counter() - tic < 5:
++        while eid in self.client.ids and time.perf_counter() - tic < 30:
+             time.sleep(0.05)
+         assert eid not in self.client.ids
+ 
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
index c7d601a15eb3..fabd8e6f6efc 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # About tests and tornado
 # Upstreams claims to work fine with tornado 5, and it's indeed possible to
diff --git a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
index 254e36f5040c..4b62f1ffd3bc 100644
--- a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
@@ -42,6 +42,10 @@ BDEPEND="${RDEPEND}
 # distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
+)
+
 python_test() {
 	local deselect=(
 		# we don't run a mongo instance for tests
@@ -53,6 +57,15 @@ python_test() {
 		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_result
 		ipyparallel/tests/test_view.py::TestView::test_unicode_execute
 		ipyparallel/tests/test_view.py::TestView::test_sync_imports_quiet
+		# Gets upset that a timeout _doesn't_ occur, presumably because
+		# we're cranking up too many test timeouts. Oh well.
+		# bug #823458#c3
+		ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send
+		# We could patch the timeout for these too but they're going to be inherently
+		# fragile anyway based on what they do.
+		ipyparallel/tests/test_client.py::TestClient::test_activate
+		ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets
+		ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines
 	)
 	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
 		# failing due to irrelevant warnings