Merge pull request #323 from KeitaW/fix/duplication_warning

Fix `DuplicationWarning` by importing the original libraries.
scikit-learn-contrib · Sep 16, 2019 · 4248e23 · 4248e23
2 parents d3da6a7 + 94f4968
commit 4248e23
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/hdbscan/_hdbscan_boruvka.pyx b/hdbscan/_hdbscan_boruvka.pyx
@@ -68,7 +68,7 @@ from sklearn.neighbors import KDTree, BallTree
 import dist_metrics as dist_metrics
 cimport dist_metrics as dist_metrics
 
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 
 cdef np.double_t INF = np.inf
 

diff --git a/hdbscan/hdbscan_.py b/hdbscan/hdbscan_.py
@@ -11,7 +11,7 @@
 from scipy.sparse import issparse
 from sklearn.neighbors import KDTree, BallTree
 from joblib import Memory
-from sklearn.externals import six
+import six
 from warnings import warn
 from sklearn.utils import check_array
 from joblib.parallel import cpu_count

diff --git a/hdbscan/robust_single_linkage_.py b/hdbscan/robust_single_linkage_.py
@@ -9,7 +9,7 @@
 from scipy.sparse import issparse
 
 from joblib import Memory
-from sklearn.externals import six
+import six
 from sklearn.utils import check_array
 
 from ._hdbscan_linkage import mst_linkage_core, mst_linkage_core_vector, label

diff --git a/requirements.txt b/requirements.txt
@@ -3,3 +3,4 @@ numpy>=1.16.0
 scipy >= 0.9
 scikit-learn>=0.17
 joblib
+six
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ numpy>=1.16.0 @@
     scipy >= 0.9
     scikit-learn>=0.17
     joblib
+    six