Update to scikit-learn 0.20.1

packages/scikit-learn/meta.yaml

 package:
   name: scikit-learn
-  version: 0.20.0
+  version: 0.20.1
 
 source:
-  url: https://pypi.io/packages/source/s/scikit-learn/scikit-learn-0.20.0.tar.gz
-  sha256: 97d1d971f8ec257011e64b7d655df68081dd3097322690afa1a71a1d755f8c18
+  url: https://github.com/scikit-learn/scikit-learn/archive/0.20.1.tar.gz
+  sha256: 618feea121c59a52ea459d6af7bc179344ca345775b04bd60e96740e9df75960
 
   patches:
    - patches/use-site-joblib.patch
-   - patches/support-joblib-011.patch
 
 build:
   cflags: -Wno-implicit-function-declaration
 
 requirements:
   run:
-    - numpy   # TODO: add scipy once the corresponding PR is merged
+    - numpy
+    - scipy
     - joblib
 
 test:

packages/scikit-learn/patches/use-site-joblib.patch

-commit 8778fe57c37a275fc36959e9bade234bd9bbe88f
+commit 55cfffe8243d7d85dc6f8d14f045cee8a4e8b0ae
 Author: Roman Yurchak <rth.yurchak@pm.me>
-Date:   Thu Oct 25 16:56:54 2018 +0200
+Date:   Mon Dec 3 22:09:46 2018 +0100
 
     Use site joblib
 
-diff --git a/sklearn/datasets/california_housing.py b/sklearn/datasets/california_housing.py
-index 76cb27dad..98cb34f6e 100644
---- a/sklearn/datasets/california_housing.py
-+++ b/sklearn/datasets/california_housing.py
-@@ -33,7 +33,7 @@ from .base import _fetch_remote
- from .base import _pkl_filepath
- from .base import RemoteFileMetadata
- from ..utils import Bunch
--from ..externals import joblib
-+from ..utils import _joblib as _joblib
- 
- # The original data can be found at:
- # http://www.dcc.fc.up.pt/~ltorgo/Regression/cal_housing.tgz
-diff --git a/sklearn/datasets/covtype.py b/sklearn/datasets/covtype.py
-index a08f61f02..4ac93f93f 100644
---- a/sklearn/datasets/covtype.py
-+++ b/sklearn/datasets/covtype.py
-@@ -27,7 +27,7 @@ from .base import RemoteFileMetadata
- from ..utils import Bunch
- from .base import _pkl_filepath
- from ..utils.fixes import makedirs
--from ..externals import joblib
-+from ..utils import _joblib as joblib
- from ..utils import check_random_state
- 
- # The original data can be found in:
-diff --git a/sklearn/datasets/kddcup99.py b/sklearn/datasets/kddcup99.py
-index c8ed0e308..3aa6ebb35 100644
---- a/sklearn/datasets/kddcup99.py
-+++ b/sklearn/datasets/kddcup99.py
-@@ -22,7 +22,8 @@ from .base import _fetch_remote
- from .base import get_data_home
- from .base import RemoteFileMetadata
- from ..utils import Bunch
--from ..externals import joblib, six
-+from ..externals import six
-+from ..utils import _joblib as joblib
- from ..utils import check_random_state
- from ..utils import shuffle as shuffle_method
- 
-diff --git a/sklearn/datasets/olivetti_faces.py b/sklearn/datasets/olivetti_faces.py
-index 74915c6c6..ba5bfecfb 100644
---- a/sklearn/datasets/olivetti_faces.py
-+++ b/sklearn/datasets/olivetti_faces.py
-@@ -24,7 +24,7 @@ from .base import _fetch_remote
- from .base import RemoteFileMetadata
- from .base import _pkl_filepath
- from ..utils import check_random_state, Bunch
--from ..externals import joblib
-+from ..utils import _joblib as joblib
- 
- # The original data can be found at:
- # http://cs.nyu.edu/~roweis/data/olivettifaces.mat
-diff --git a/sklearn/datasets/rcv1.py b/sklearn/datasets/rcv1.py
-index 7890d7e18..ea22fb076 100644
---- a/sklearn/datasets/rcv1.py
-+++ b/sklearn/datasets/rcv1.py
-@@ -22,7 +22,7 @@ from .base import _pkl_filepath
- from .base import _fetch_remote
- from .base import RemoteFileMetadata
- from ..utils.fixes import makedirs
--from ..externals import joblib
-+from ..utils import _joblib as joblib
- from .svmlight_format import load_svmlight_files
- from ..utils import shuffle as shuffle_
- from ..utils import Bunch
-diff --git a/sklearn/datasets/species_distributions.py b/sklearn/datasets/species_distributions.py
-index 6d8acddcc..8191048d7 100644
---- a/sklearn/datasets/species_distributions.py
-+++ b/sklearn/datasets/species_distributions.py
-@@ -51,7 +51,7 @@ from .base import _fetch_remote
- from .base import RemoteFileMetadata
- from ..utils import Bunch
- from sklearn.datasets.base import _pkl_filepath
--from sklearn.externals import joblib
-+import joblib
- 
- PY3_OR_LATER = sys.version_info[0] >= 3
- 
-diff --git a/sklearn/datasets/twenty_newsgroups.py b/sklearn/datasets/twenty_newsgroups.py
-index 8df908a2e..a2440222a 100644
---- a/sklearn/datasets/twenty_newsgroups.py
-+++ b/sklearn/datasets/twenty_newsgroups.py
-@@ -45,7 +45,7 @@ from ..utils import check_random_state, Bunch
- from ..utils import deprecated
- from ..feature_extraction.text import CountVectorizer
- from ..preprocessing import normalize
--from ..externals import joblib
-+from ..utils import _joblib as joblib
- 
- logger = logging.getLogger(__name__)
- 
-diff --git a/sklearn/ensemble/base.py b/sklearn/ensemble/base.py
-index 321031892..2a516619b 100644
---- a/sklearn/ensemble/base.py
-+++ b/sklearn/ensemble/base.py
-@@ -13,9 +13,11 @@ from ..base import BaseEstimator
- from ..base import MetaEstimatorMixin
- from ..utils import check_random_state
- from ..externals import six
--from ..externals.joblib import effective_n_jobs
-+from ..utils import _joblib
- from abc import ABCMeta, abstractmethod
- 
-+effective_n_jobs = _joblib.effective_n_jobs
-+
- MAX_RAND_SEED = np.iinfo(np.int32).max
- 
- 
-diff --git a/sklearn/ensemble/tests/test_forest.py b/sklearn/ensemble/tests/test_forest.py
-index d7586c286..f12f6f886 100644
---- a/sklearn/ensemble/tests/test_forest.py
-+++ b/sklearn/ensemble/tests/test_forest.py
-@@ -23,7 +23,12 @@ import pytest
- 
- from sklearn.utils import parallel_backend
- from sklearn.utils import register_parallel_backend
--from sklearn.externals.joblib.parallel import LokyBackend
-+try:
-+    from sklearn.utils import _joblib
-+    LokyBackend = _joblib.parallel.LokyBackend
-+except ImportError:
-+    LokyBackend = object
-+
- 
- from sklearn.utils.testing import assert_almost_equal
- from sklearn.utils.testing import assert_array_almost_equal
-diff --git a/sklearn/metrics/tests/test_score_objects.py b/sklearn/metrics/tests/test_score_objects.py
-index da04b4215..fc3f6a6b1 100644
---- a/sklearn/metrics/tests/test_score_objects.py
-+++ b/sklearn/metrics/tests/test_score_objects.py
-@@ -40,7 +40,7 @@ from sklearn.datasets import load_diabetes
- from sklearn.model_selection import train_test_split, cross_val_score
- from sklearn.model_selection import GridSearchCV
- from sklearn.multiclass import OneVsRestClassifier
--from sklearn.externals import joblib
-+import joblib
- 
- 
- REGRESSION_SCORERS = ['explained_variance', 'r2',
-diff --git a/sklearn/neighbors/tests/test_kde.py b/sklearn/neighbors/tests/test_kde.py
-index 990942c9e..e9a6c31bd 100644
---- a/sklearn/neighbors/tests/test_kde.py
-+++ b/sklearn/neighbors/tests/test_kde.py
-@@ -10,7 +10,7 @@ from sklearn.pipeline import make_pipeline
- from sklearn.datasets import make_blobs
- from sklearn.model_selection import GridSearchCV
- from sklearn.preprocessing import StandardScaler
--from sklearn.externals import joblib
-+import joblib
- 
- 
- def compute_kernel_slow(Y, X, kernel, h):
-diff --git a/sklearn/tests/test_site_joblib.py b/sklearn/tests/test_site_joblib.py
-index bffd43cc1..df4c96893 100644
---- a/sklearn/tests/test_site_joblib.py
-+++ b/sklearn/tests/test_site_joblib.py
-@@ -1,7 +1,10 @@
- import os
- import pytest
- from sklearn import externals
--from sklearn.externals import joblib as joblib_vendored
-+try:
-+    from sklearn.externals import joblib as joblib_vendored
-+except ImportError:
-+    joblib_vendored = None
- from sklearn.utils import Parallel, delayed, Memory, parallel_backend
- 
- if os.environ.get('SKLEARN_SITE_JOBLIB', False):
 diff --git a/sklearn/utils/_joblib.py b/sklearn/utils/_joblib.py
-index e1c39a401..9c4e815f7 100644
+index c3df15e91..b9f218ef1 100644
 --- a/sklearn/utils/_joblib.py
 +++ b/sklearn/utils/_joblib.py
 @@ -5,7 +5,7 @@ import os as _os
@@ -186,29 +17,3 @@ index e1c39a401..9c4e815f7 100644
      with _warnings.catch_warnings():
          _warnings.simplefilter("ignore")
          # joblib imports may raise DeprecationWarning on certain Python
-diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py
-index 75b378961..b81b9ab58 100644
---- a/sklearn/utils/testing.py
-+++ b/sklearn/utils/testing.py
-@@ -44,7 +44,7 @@ except NameError:
- 
- import sklearn
- from sklearn.base import BaseEstimator
--from sklearn.externals import joblib
-+import joblib
- from sklearn.utils.fixes import signature
- from sklearn.utils import deprecated, IS_PYPY, _IS_32BIT
- 
-diff --git a/sklearn/utils/tests/test_estimator_checks.py b/sklearn/utils/tests/test_estimator_checks.py
-index bf8412b3e..2eebb36b0 100644
---- a/sklearn/utils/tests/test_estimator_checks.py
-+++ b/sklearn/utils/tests/test_estimator_checks.py
-@@ -5,7 +5,7 @@ import numpy as np
- import scipy.sparse as sp
- 
- from sklearn.externals.six.moves import cStringIO as StringIO
--from sklearn.externals import joblib
-+import joblib
- 
- from sklearn.base import BaseEstimator, ClassifierMixin
- from sklearn.utils import deprecated