Use joblib instead of sklearn.externals.joblib

benchmarks/bench_ml.py

@@ -32,8 +32,8 @@
 from sklearn.datasets import fetch_mldata
 from sklearn.datasets import load_boston
 from sklearn.datasets import load_digits
-from sklearn.externals.joblib import delayed
-from sklearn.externals.joblib import Parallel
+from joblib import delayed
+from joblib import Parallel
 from sklearn.model_selection import train_test_split
 from sklearn.preprocessing import StandardScaler
 from sklearn.svm import SVC

examples/parallel-optimization.ipynb

@@ -46,7 +46,7 @@
       "source": [
         "from skopt import Optimizer\n",
         "from skopt.space import Real\n",
-        "from sklearn.externals.joblib import Parallel, delayed\n",
+        "from joblib import Parallel, delayed\n",
         "# example objective taken from skopt\n",
         "from skopt.benchmarks import branin\n",
         "\n",

skopt/learning/gbrt.py

@@ -4,7 +4,7 @@
 from sklearn.base import BaseEstimator, RegressorMixin
 from sklearn.ensemble import GradientBoostingRegressor
 from sklearn.utils import check_random_state
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 
 
 def _parallel_fit(regressor, X, y):

skopt/optimizer/optimizer.py

@@ -9,7 +9,7 @@
 
 from sklearn.base import clone
 from sklearn.base import is_regressor
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 from sklearn.multioutput import MultiOutputRegressor
 from sklearn.utils import check_random_state
 

skopt/searchcv.py

@@ -6,7 +6,7 @@
 
 import sklearn
 from sklearn.base import is_classifier, clone
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 from sklearn.model_selection._search import BaseSearchCV
 from sklearn.utils import check_random_state
 from sklearn.utils.fixes import MaskedArray

skopt/tests/test_searchcv.py

@@ -13,7 +13,7 @@
 from sklearn.tree import DecisionTreeClassifier
 from sklearn.base import clone
 from sklearn.base import BaseEstimator
-from sklearn.externals.joblib import cpu_count
+from joblib import cpu_count
 
 from skopt.space import Real, Categorical, Integer
 from skopt import BayesSearchCV

skopt/utils.py

@@ -6,8 +6,8 @@
 from scipy.optimize import minimize as sp_minimize
 from sklearn.base import is_regressor
 from sklearn.ensemble import GradientBoostingRegressor
-from sklearn.externals.joblib import dump as dump_
-from sklearn.externals.joblib import load as load_
+from joblib import dump as dump_
+from joblib import load as load_
 
 from .learning import ExtraTreesRegressor
 from .learning import GaussianProcessRegressor