Merge pull request #298 from areeh/master

fix Nose being imported outside tests

Author: lmcinnes

hdbscan/__init__.py

@@ -2,6 +2,5 @@
 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/tests/test_hdbscan.py

@@ -22,8 +22,7 @@
                      validity_index,
                      approximate_predict,
                      membership_vector,
-                     all_points_membership_vectors,
-                     if_matplotlib)
+                     all_points_membership_vectors)
 # from sklearn.cluster.tests.common import generate_clustered_data
 from sklearn.datasets import make_blobs
 from sklearn.utils import shuffle
@@ -45,6 +44,28 @@
 X = StandardScaler().fit_transform(X)
 
 
+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
+
+
 def if_pandas(func):
     """Test decorator that skips test if pandas not installed."""
     @wraps(func)