[gentoo-commits] repo/gentoo:master commit in: dev-python/loky/, dev-python/loky/files/
commit: 7856f165d0cd90d0791d84e696f5973ce87d7e2b
Author: Michał Górny gentoo org>
AuthorDate: Sat Oct 16 06:00:20 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Oct 16 06:00:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7856f165
dev-python/loky: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/loky/Manifest | 1 -
.../loky/files/loky-2.9.0-fix-py3.10-tests.patch | 41 ---
dev-python/loky/files/loky-2.9.0-libc.patch| 28 -
dev-python/loky/loky-2.9.0.ebuild | 47 --
4 files changed, 117 deletions(-)
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 5a3f027b314..aff99548103 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,2 +1 @@
-DIST loky-2.9.0.tar.gz 115019 BLAKE2B
2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6
SHA512
d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
DIST loky-3.0.0.tar.gz 152463 BLAKE2B
99f0a1fc85e879626d12402dd4fee4b92345eab9520b1afaf95bbf869d2dc9e429f1f9810554e10d97f0ecbc4add28b1cbaee0477de05aa366faeb335eaef7c8
SHA512
ad171bfac031ab4d6749bde416031e905eb29adb97dab9c3348791c9df78b17e1e3eab8a354954d7c16fb2095ccc03d26cf2153fe53a546007a7a89c6046cb36
diff --git a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
deleted file mode 100644
index 51cbfb348a5..000
--- a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0d31dc24ca9688c11d1fe53fa1283728ecc50706 Mon Sep 17 00:00:00 2001
-From: Arthur Zamarin
-Date: Mon, 2 Aug 2021 18:35:31 +0300
-Subject: [PATCH] Fix no attribute import_module for python 3.10
-
-In python 3.10, the `import_module` has moved from the
-`test.support` module to `test.support.import_helper`.
-
-As fix, try to import the from the new place and if unknown try from
-the old place.
- tests/_test_process_executor.py | 11 +++
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/tests/_test_process_executor.py b/tests/_test_process_executor.py
-index 65d9a2c9..3bd0b12d 100644
a/tests/_test_process_executor.py
-+++ b/tests/_test_process_executor.py
-@@ -1,15 +1,18 @@
- from __future__ import print_function
- try:
--import test.support
-+try:
-+from test.support.import_helper import import_module
-+except ImportError:
-+from test.support import import_module
-
- # Skip tests if _multiprocessing wasn't built.
--test.support.import_module('_multiprocessing')
-+import_module('_multiprocessing')
- # Skip tests if sem_open implementation is broken.
--test.support.import_module('multiprocessing.synchronize')
-+import_module('multiprocessing.synchronize')
- # import threading after _multiprocessing to raise a more revelant error
- # message: "No module named _multiprocessing" if multiprocessing is not
- # compiled without thread support.
--test.support.import_module('threading')
-+import_module('threading')
- except ImportError:
- pass
-
diff --git a/dev-python/loky/files/loky-2.9.0-libc.patch
b/dev-python/loky/files/loky-2.9.0-libc.patch
deleted file mode 100644
index 58cceab01eb..000
--- a/dev-python/loky/files/loky-2.9.0-libc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4100bb481dd1599be3deae8539ff9eac2d9b7104 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Mon, 8 Mar 2021 10:32:38 +0100
-Subject: [PATCH] FIX load libc correctly in test_reusable_executor
-
-Fix test_reusable_executor to load libc via "c" library rather than
-"libc". The latter is incorrect, and does not work in the newest
-versions of Python anymore, see https://bugs.python.org/issue42580.
- tests/test_reusable_executor.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_reusable_executor.py b/tests/test_reusable_executor.py
-index 1ff5b8b..d24d2de 100644
a/tests/test_reusable_executor.py
-+++ b/tests/test_reusable_executor.py
-@@ -32,7 +32,7 @@ if sys.platform == "win32":
- else:
- from signal import SIGKILL
- from ctypes.util import find_library
--libc = ctypes.CDLL(find_library("libc"))
-+libc = ctypes.CDLL(find_library("c"))
-
-
- try:
---
-2.30.1
-
diff --git a/dev-python/loky/loky-2.9.0.ebuild
b/dev-python/loky/loky-2.9.0.ebuild
deleted file mode 100644
index d1db85d53e5..000
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Robust and reusable Executor for joblib"
[gentoo-commits] repo/gentoo:master commit in: dev-python/loky/, dev-python/loky/files/
commit: 3ecd1f9e7ec50320fe6f0430fbdef6da3a47ff9e
Author: Arthur Zamarin gmail com>
AuthorDate: Mon Aug 2 15:56:49 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Aug 5 21:44:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ecd1f9e
dev-python/loky: enable py3.10, fix tests
patch from my PR here: https://github.com/joblib/loky/pull/295
Signed-off-by: Arthur Zamarin gmail.com>
Signed-off-by: Michał Górny gentoo.org>
.../loky/files/loky-2.9.0-fix-py3.10-tests.patch | 41 ++
dev-python/loky/loky-2.9.0.ebuild | 3 +-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
new file mode 100644
index 000..51cbfb348a5
--- /dev/null
+++ b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
@@ -0,0 +1,41 @@
+From 0d31dc24ca9688c11d1fe53fa1283728ecc50706 Mon Sep 17 00:00:00 2001
+From: Arthur Zamarin
+Date: Mon, 2 Aug 2021 18:35:31 +0300
+Subject: [PATCH] Fix no attribute import_module for python 3.10
+
+In python 3.10, the `import_module` has moved from the
+`test.support` module to `test.support.import_helper`.
+
+As fix, try to import the from the new place and if unknown try from
+the old place.
+---
+ tests/_test_process_executor.py | 11 +++
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/tests/_test_process_executor.py b/tests/_test_process_executor.py
+index 65d9a2c9..3bd0b12d 100644
+--- a/tests/_test_process_executor.py
b/tests/_test_process_executor.py
+@@ -1,15 +1,18 @@
+ from __future__ import print_function
+ try:
+-import test.support
++try:
++from test.support.import_helper import import_module
++except ImportError:
++from test.support import import_module
+
+ # Skip tests if _multiprocessing wasn't built.
+-test.support.import_module('_multiprocessing')
++import_module('_multiprocessing')
+ # Skip tests if sem_open implementation is broken.
+-test.support.import_module('multiprocessing.synchronize')
++import_module('multiprocessing.synchronize')
+ # import threading after _multiprocessing to raise a more revelant error
+ # message: "No module named _multiprocessing" if multiprocessing is not
+ # compiled without thread support.
+-test.support.import_module('threading')
++import_module('threading')
+ except ImportError:
+ pass
+
diff --git a/dev-python/loky/loky-2.9.0.ebuild
b/dev-python/loky/loky-2.9.0.ebuild
index 1b5b6ffc1d4..25edf84e76a 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Robust and reusable Executor for joblib"
@@ -27,6 +27,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${P}-libc.patch
+ "${FILESDIR}"/${P}-fix-py3.10-tests.patch
)
python_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/loky/, dev-python/loky/files/
commit: c1e7cd7d73a20d21e665797ac0531c7748128dad
Author: Michał Górny gentoo org>
AuthorDate: Mon Mar 8 10:08:17 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Mar 8 12:35:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e7cd7d
dev-python/loky: Fix tests with newer CPython
Fix test failure with newer versions of CPython due to incorrect loading
of libc via ctypes.
Closes: https://bugs.gentoo.org/774789
Signed-off-by: Michał Górny gentoo.org>
dev-python/loky/files/loky-2.9.0-libc.patch | 28
dev-python/loky/loky-2.9.0.ebuild | 6 +-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/dev-python/loky/files/loky-2.9.0-libc.patch
b/dev-python/loky/files/loky-2.9.0-libc.patch
new file mode 100644
index 000..58cceab01eb
--- /dev/null
+++ b/dev-python/loky/files/loky-2.9.0-libc.patch
@@ -0,0 +1,28 @@
+From 4100bb481dd1599be3deae8539ff9eac2d9b7104 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Mon, 8 Mar 2021 10:32:38 +0100
+Subject: [PATCH] FIX load libc correctly in test_reusable_executor
+
+Fix test_reusable_executor to load libc via "c" library rather than
+"libc". The latter is incorrect, and does not work in the newest
+versions of Python anymore, see https://bugs.python.org/issue42580.
+---
+ tests/test_reusable_executor.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_reusable_executor.py b/tests/test_reusable_executor.py
+index 1ff5b8b..d24d2de 100644
+--- a/tests/test_reusable_executor.py
b/tests/test_reusable_executor.py
+@@ -32,7 +32,7 @@ if sys.platform == "win32":
+ else:
+ from signal import SIGKILL
+ from ctypes.util import find_library
+-libc = ctypes.CDLL(find_library("libc"))
++libc = ctypes.CDLL(find_library("c"))
+
+
+ try:
+--
+2.30.1
+
diff --git a/dev-python/loky/loky-2.9.0.ebuild
b/dev-python/loky/loky-2.9.0.ebuild
index 70165402b04..a4096ef4abe 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -25,6 +25,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-libc.patch
+)
+
python_test() {
local args=(
# docker, seriously?
@@ -34,5 +38,5 @@ python_test() {
--skip-high-memory
)
- pytest -vv "${args[@]}" || die "Tests failed on ${EPYTHON}"
+ epytest "${args[@]}"
}
[gentoo-commits] repo/gentoo:master commit in: dev-python/loky/, dev-python/loky/files/
commit: 1916230ab03bd734b14f14f695f405d8f4765607
Author: Michał Górny gentoo org>
AuthorDate: Wed Nov 4 07:26:07 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Nov 4 07:34:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1916230a
dev-python/loky: Remove old
Signed-off-by: Michał Górny 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
5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12cd891067c936ca984404146890fb131f8c261e
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..000
--- 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
-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..000
--- 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
-}
