diff options
| author |   Arthur Zamarin <arthurzam@gmail.com> | 2021-08-02 18:56:49 +0300 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2021-08-05 23:44:09 +0200 |
| commit | 3ecd1f9e7ec50320fe6f0430fbdef6da3a47ff9e (patch) | |
| tree | b3199733be37b68f8fdec5c3bbc1db174678185c /dev-python/loky | |
| parent | dev-python/loky: Fix test failures due to pytest-xvfb (diff) | |
| download | gentoo-3ecd1f9e7ec50320fe6f0430fbdef6da3a47ff9e.tar.gz gentoo-3ecd1f9e7ec50320fe6f0430fbdef6da3a47ff9e.tar.bz2 gentoo-3ecd1f9e7ec50320fe6f0430fbdef6da3a47ff9e.zip | |
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 <arthurzam@gmail.com>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/loky')
| -rw-r--r-- | dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch | 41 | ||||
| -rw-r--r-- | dev-python/loky/loky-2.9.0.ebuild | 3 |
2 files changed, 43 insertions, 1 deletions
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 000000000000..51cbfb348a51 --- /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 <arthurzam@gmail.com> +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 1b5b6ffc1d4f..25edf84e76a1 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() { |