Merge pull request #109 from kingsgeocomp/master

Updating dependency on joblib (sklearn >= 0.21)
sevamoo · Sep 19, 2019 · fa9e800 · fa9e800
2 parents 304b49d + 3a1bebc
commit fa9e800
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -3,13 +3,12 @@
 except ImportError:
     from distutils.core import setup
 
-
 setup(
     name="SOMPY",
-    version="1.0",
+    version="1.1",
     description="Self Organizing Maps Package",
     author="Vahid Moosavi and Sebastian Packmann",
     packages=find_packages(),
     install_requires=['numpy >= 1.7', 'scipy >= 0.9',
-                      'scikit-learn >= 0.16', 'numexpr >= 2.5']
+                      'scikit-learn >= 0.21', 'numexpr >= 2.5']
 )
diff --git a/sompy/sompy.py b/sompy/sompy.py
@@ -20,7 +20,7 @@
 from multiprocessing import cpu_count
 from scipy.sparse import csr_matrix
 from sklearn import neighbors
-from sklearn.externals.joblib import Parallel, delayed, load, dump
+from joblib import Parallel, delayed, load, dump
 import sys
 
 from .decorators import timeit