Merge pull request #297 from areeh/master

fix import errors for scikit-learn 0.21

Author: lmcinnes

hdbscan/__init__.py

@@ -2,4 +2,6 @@
 from .robust_single_linkage_ import RobustSingleLinkage, robust_single_linkage
 from .validity import validity_index
 from .prediction import approximate_predict, membership_vector, all_points_membership_vectors
+from .utils import if_matplotlib
+
 

hdbscan/hdbscan_.py

@@ -10,11 +10,11 @@
 from sklearn.metrics import pairwise_distances
 from scipy.sparse import issparse
 from sklearn.neighbors import KDTree, BallTree
-from sklearn.externals.joblib import Memory
+from joblib import Memory
 from sklearn.externals import six
 from warnings import warn
 from sklearn.utils import check_array
-from sklearn.externals.joblib.parallel import cpu_count
+from joblib.parallel import cpu_count
 
 from scipy.sparse import csgraph
 

hdbscan/robust_single_linkage_.py

@@ -8,7 +8,7 @@
 from sklearn.metrics import pairwise_distances
 from scipy.sparse import issparse
 
-from sklearn.externals.joblib import Memory
+from joblib import Memory
 from sklearn.externals import six
 from sklearn.utils import check_array
 

hdbscan/tests/test_hdbscan.py

@@ -16,14 +16,14 @@
                                    assert_raises,
                                    assert_in,
                                    assert_not_in,
-                                   assert_no_warnings,
-                                   if_matplotlib)
+                                   assert_no_warnings)
 from hdbscan import (HDBSCAN,
                      hdbscan,
                      validity_index,
                      approximate_predict,
                      membership_vector,
-                     all_points_membership_vectors)
+                     all_points_membership_vectors,
+                     if_matplotlib)
 # from sklearn.cluster.tests.common import generate_clustered_data
 from sklearn.datasets import make_blobs
 from sklearn.utils import shuffle

hdbscan/tests/test_rsl.py

@@ -12,9 +12,9 @@
                                    assert_raises,
                                    assert_in,
                                    assert_not_in,
-                                   assert_no_warnings,
-                                   if_matplotlib)
+                                   assert_no_warnings)
 from hdbscan import RobustSingleLinkage, robust_single_linkage
+
 # from sklearn.cluster.tests.common import generate_clustered_data
 
 from sklearn import datasets

hdbscan/utils.py

@@ -0,0 +1,25 @@
+from functools import wraps
+
+from nose import SkipTest
+
+
+def if_matplotlib(func):
+    """Test decorator that skips test if matplotlib not installed.
+
+    Parameters
+    ----------
+    func
+    """
+    @wraps(func)
+    def run_test(*args, **kwargs):
+        try:
+            import matplotlib
+            matplotlib.use('Agg', warn=False)
+            # this fails if no $DISPLAY specified
+            import matplotlib.pyplot as plt
+            plt.figure()
+        except ImportError:
+            raise SkipTest('Matplotlib not available.')
+        else:
+            return func(*args, **kwargs)
+    return run_test

requirements.txt

@@ -2,4 +2,4 @@ cython>=0.27
 numpy>=1.16.0
 scipy >= 0.9
 scikit-learn>=0.17
-
+joblib