gentoo resync : 25.11.2020

3 files changed, 13 insertions, 53 deletions

diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index fdd152f40dd0..d7665048cc7f 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,4 +1,3 @@
-AUX loky-2.8.0-cloudpickle-1.5.patch 1892 BLAKE2B c7ffea0bb50617db74d081345642ceef7044d44bbed10088fba6403fe69811957c13557dfcb80ef986337311078b02e3a97f7294075c3641fe9404327ec0a164 SHA512 aff27910cbabebc1c99e8765b11da7552ed09e9a145c841e82213304c7e3a00b028009e882e3b22471441066922a4e67feabac4bf9575f820e46b28fc3c1680e
-DIST loky-2.8.0.tar.gz 112383 BLAKE2B 5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12c0000d891067c936ca984404146890fb131f8c261e SHA512 15fbdb56994e08f643b7bd5aa68d193f74ab61ef1230df9e2101fb4602a201a050e3ecf08229fc4ad61e478c893e0b34b81371ef9596733baa0e3d008125cd11
-EBUILD loky-2.8.0-r1.ebuild 789 BLAKE2B 2196086bc9839bd5384cc1958c2c94d6f7b8efee8ed8f2a496ea8bf55fd5d3c539ea274fddc59b2bdf30a7b02c15e35b156e5ac8767d122957d59c5f2a8565f7 SHA512 9fae99a352bb990fa9f6485df8760339377a3848bf8d72f9ccb15c13256991257f106f50cad273c7a01422d2573ccbb5bdda2b1307d8be84efb47c21d3b40160
+DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
+EBUILD loky-2.9.0.ebuild 869 BLAKE2B e393af893d7dcb07d18d362326dab66b2ecac7d97fda6d14879a378649a689b7f2ac9f139a71605592d6391d0b0c4b7b073ef3ba3c536da6f3aeea2e1ca11776 SHA512 7ba50004fff3e0c1c49ee3a9997b66734048ea156eb2ba738c56f8658284b6e5377876ce22ce397b6422501a5153176fe1fc09f6df332222e5fb7879cace5b7b
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch b/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
deleted file mode 100644
index 05fb70455f0a..000000000000
--- a/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0e930389f4785f9d311b090f92057563e22b9768 Mon Sep 17 00:00:00 2001
-From: tomMoral <thomas.moreau.2010@gmail.com>
-Date: Thu, 2 Jul 2020 13:37:14 +0200
-Subject: [PATCH] FIX cloudpickle customization mechanism
-
----
- loky/backend/reduction.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/loky/backend/reduction.py b/loky/backend/reduction.py
-index 0bad5f63..d87fbdff 100644
---- a/loky/backend/reduction.py
-+++ b/loky/backend/reduction.py
-@@ -189,6 +189,10 @@ def __init__(self, writer, reducers=None, protocol=HIGHEST_PROTOCOL):
-                 self.dispatch = self._dispatch.copy()
-             else:
-                 if getattr(self, "dispatch_table", None) is not None:
-+                    # Make sure dispatch table is an instance level field
-+                    # as it is not the case for isntance for cloudpickle1.5+
-+                    # see joblib/loky#259
-+                    self.dispatch_table = self.dispatch_table.copy()
-                     self.dispatch_table.update(self._dispatch_table.copy())
-                 else:
-                     self.dispatch_table = self._dispatch_table.copy()
-@@ -202,10 +206,10 @@ def register(self, type, reduce_func):
-             if sys.version_info < (3,):
-                 # Python 2 pickler dispatching is not explicitly customizable.
-                 # Let us use a closure to workaround this limitation.
--                    def dispatcher(self, obj):
--                        reduced = reduce_func(obj)
--                        self.save_reduce(obj=obj, *reduced)
--                    self.dispatch[type] = dispatcher
-+                def dispatcher(self, obj):
-+                    reduced = reduce_func(obj)
-+                    self.save_reduce(obj=obj, *reduced)
-+                self.dispatch[type] = dispatcher
-             else:
-                 self.dispatch_table[type] = reduce_func
- 
diff --git a/dev-python/loky/loky-2.8.0-r1.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 09a94d2bab7c..0cf126c023e3 100644
--- a/dev-python/loky/loky-2.8.0-r1.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Robust and reusable Executor for joblib"
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
@@ -25,14 +25,14 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cloudpickle-1.5.patch
-)
+python_test() {
+	local args=(
+		# docker, seriously?
+		--deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit'
+		# one test that uses a lot of memory, also broken on 32-bit
+		# platforms
+		--skip-high-memory
+	)
 
-src_prepare() {
-	# docker, seriously?
-	sed -e 's:test_cpu_count_cfs_limit:_&:' \
-		-i tests/test_loky_module.py || die
-
-	distutils-r1_src_prepare
+	pytest -vv "${args[@]}" || die "Tests failed on ${EPYTHON}"
 }