Unvendoring joblib

GaelVaroquaux · GaelVaroquaux · commit 57a7c95211a8 · 2018-05-31T02:57:42.000+02:00
Follows scikit-learn/scikit-learn#11166 to deal with unvendoring joblib in scikit-learn
diff --git a/distributed/joblib.py b/distributed/joblib.py
@@ -24,16 +24,24 @@
         joblib = None
 with ignoring(ImportError):
     import sklearn.externals.joblib as sk_joblib
-    if LooseVersion(sk_joblib.__version__) < '0.10.2':
+    if joblib is not None and sk_joblib.Parallel is joblib.Parallel:
+        # joblib is unvendored in scikit-learn
+        sk_joblib = None
+    elif LooseVersion(sk_joblib.__version__) < '0.10.2':
         sk_joblib = None
 
 _bases = []
 if joblib:
     from joblib.parallel import AutoBatchingMixin, ParallelBackendBase
     _bases.append(ParallelBackendBase)
 if sk_joblib:
-    from sklearn.externals.joblib.parallel import (AutoBatchingMixin,  # noqa
-            ParallelBackendBase)
+    # Follow changes in scikit-learn
+    try:
+        from sklearn.externals.joblib.parallel import (  # noqa
+            AutoBatchingMixin, ParallelBackendBase)
+    except ModuleNotFoundError:
+        from sklearn.externals._joblib.parallel import (  # noqa
+            AutoBatchingMixin, ParallelBackendBase)
     _bases.append(ParallelBackendBase)
 if not _bases:
     raise RuntimeError("Joblib backend requires either `joblib` >= '0.10.2' "
