Merge pull request #323 from KeitaW/fix/duplication_warning

Fix `DuplicationWarning` by importing the original libraries.

Author: lmcinnes

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
 

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

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

requirements.txt

@@ -3,3 +3,4 @@ numpy>=1.16.0
 scipy >= 0.9
 scikit-learn>=0.17
 joblib
+six