Merge pull request #123 from trevorstephens/joblib

joblib dependency

Author: nicodv

kmodes/kmodes.py

@@ -7,9 +7,9 @@
 from collections import defaultdict
 
 import numpy as np
+from joblib import Parallel, delayed
 from scipy import sparse
 from sklearn.base import BaseEstimator, ClusterMixin
-from sklearn.externals.joblib import Parallel, delayed
 from sklearn.utils import check_random_state
 from sklearn.utils.validation import check_array
 

kmodes/kprototypes.py

@@ -7,8 +7,8 @@
 from collections import defaultdict
 
 import numpy as np
+from joblib import Parallel, delayed
 from scipy import sparse
-from sklearn.externals.joblib import Parallel, delayed
 from sklearn.utils import check_random_state
 from sklearn.utils.validation import check_array
 

setup.py

@@ -25,6 +25,7 @@
         'numpy>=1.10.4',
         'scikit-learn>=0.19.0',
         'scipy>=0.13.3',
+        'joblib>=0.11'
     ],
     classifiers=['Development Status :: 3 - Alpha',
                  'Intended Audience :: Science/Research',