8000 Joblib 0.12.4 (#12007) · scikit-learn/scikit-learn@5e101a2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5e101a2

Browse files
ogriselogrisel
authored
Joblib 0.12.4 (#12007)
This should fix #11971 (fixed PyPy support, pypy3 is now part of the joblib build matrix on travis). It should also be backported to 0.20.X.
1 parent c268230 commit 5e101a2

File tree

9 files changed

+617
-565
lines changed

9 files changed

+617
-565
lines changed

‎sklearn/externals/copy_joblib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ else
1111
JOBLIB=$1
1212
fi
1313

14-
pip install $JOBLIB --target $INSTALL_FOLDER
14+
pip install --no-cache $JOBLIB --target $INSTALL_FOLDER
1515
cp -r $INSTALL_FOLDER/joblib joblib
1616
rm -rf $INSTALL_FOLDER
1717

‎sklearn/externals/joblib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
# Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
107107
# 'X.Y.dev0' is the canonical version of 'X.Y.dev'
108108
#
109-
__version__ = '0.12.3'
109+
__version__ = '0.12.4'
110110

111111

112112
from .memory import Memory, MemorizedResult, register_store_backend

‎sklearn/externals/joblib/externals/loky/__init__.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,20 @@
33
:class:`ProcessPoolExecutor` and a function :func:`get_reusable_executor` which
44
hide the pool management under the hood.
55
"""
6-
from .reusable_executor import get_reusable_executor # noqa: F401
7-
from .process_executor import ProcessPoolExecutor # noqa: F401
8-
from .process_executor import BrokenProcessPool # noqa: F401
6+
from ._base import Executor, Future
7+
from ._base import wait, as_completed
8+
from ._base import TimeoutError, CancelledError
9+
from ._base import ALL_COMPLETED, FIRST_COMPLETED, FIRST_EXCEPTION
910

10-
from .backend.context import cpu_count # noqa: F401
11+
from .backend.context import cpu_count
12+
from .reusable_executor import get_reusable_executor
13+
from .process_executor import BrokenProcessPool, ProcessPoolExecutor
1114

12-
__version__ = '2.2.2'
15+
16+
__all__ = ["get_reusable_executor", "cpu_count", "wait", "as_completed",
17+
"Future", "Executor", "ProcessPoolExecutor",
18+
"BrokenProcessPool", "CancelledError", "TimeoutError",
19+
"FIRST_COMPLETED", "FIRST_EXCEPTION", "ALL_COMPLETED", ]
20+
21+
22+
__version__ = '2.3.0'

0 commit comments

Comments
 (0)
0