commit: 1916230ab03bd734b14f14f695f405d8f4765607 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Nov 4 07:26:07 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Nov 4 07:34:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1916230a
dev-python/loky: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/loky/Manifest | 1 - .../loky/files/loky-2.8.0-cloudpickle-1.5.patch | 39 ---------------------- dev-python/loky/loky-2.8.0-r1.ebuild | 38 --------------------- 3 files changed, 78 deletions(-) diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest index c1539e30bad..45b7ee06140 100644 --- a/dev-python/loky/Manifest +++ b/dev-python/loky/Manifest @@ -1,2 +1 @@ -DIST loky-2.8.0.tar.gz 112383 BLAKE2B 5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12c0000d891067c936ca984404146890fb131f8c261e SHA512 15fbdb56994e08f643b7bd5aa68d193f74ab61ef1230df9e2101fb4602a201a050e3ecf08229fc4ad61e478c893e0b34b81371ef9596733baa0e3d008125cd11 DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9 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 05fb70455f0..00000000000 --- 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 <[email protected]> -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.8.0-r1.ebuild deleted file mode 100644 index 09a94d2bab7..00000000000 --- a/dev-python/loky/loky-2.8.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..8} ) -inherit distutils-r1 - -DESCRIPTION="Robust and reusable Executor for joblib" -HOMEPAGE="https://github.com/joblib/loky"; -SRC_URI=" - https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" - -RDEPEND=" - dev-python/cloudpickle[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-cloudpickle-1.5.patch -) - -src_prepare() { - # docker, seriously? - sed -e 's:test_cpu_count_cfs_limit:_&:' \ - -i tests/test_loky_module.py || die - - distutils-r1_src_prepare -}
