Bumped version number

Increased sklearn version required and fixed a deprecation warning for sklearn

CADETMatch/kde_generator.py

@@ -13,7 +13,7 @@
 from pathlib import Path
 import numpy
 import multiprocessing
-from sklearn.neighbors.kde import KernelDensity
+from sklearn.neighbors import KernelDensity
 from sklearn.model_selection import cross_val_score
 from sklearn import preprocessing
 import copy

CADETMatch/mcmc_plot_tube.py

@@ -1,6 +1,6 @@
 import numpy
 from sklearn import preprocessing
-from sklearn.neighbors.kde import KernelDensity
+from sklearn.neighbors import KernelDensity
 from sklearn.model_selection import cross_val_score
 import scipy
 import multiprocessing

CADETMatch/mle.py

@@ -1,6 +1,6 @@
 import numpy
 from sklearn import preprocessing
-from sklearn.neighbors.kde import KernelDensity
+from sklearn.neighbors import KernelDensity
 from sklearn.model_selection import cross_val_score
 import scipy
 import multiprocessing

CADETMatch/search/mcmc.py

@@ -26,7 +26,7 @@
 import emcee.autocorr as autocorr
 
 import CADETMatch.kde_generator as kde_generator
-from sklearn.neighbors.kde import KernelDensity
+from sklearn.neighbors import KernelDensity
 
 name = "MCMC"
 

CADETMatch/version.py

@@ -16,5 +16,5 @@
 __email__ = "[email protected]"
 __license__ = "GNU General Public License v3 (GPLv3)"
 __copyright__ = "2020 %s" % __author__
-__version__ = "0.5.41"
+__version__ = "0.5.42"
 __uri__ = "https://github.com/modsim/CADET-Match"

setup.py

@@ -32,7 +32,7 @@
           'CADET>=0.3',
           'seaborn>=0.9',
           'sklearn',
-          'scikit-learn>=0.21',
+          'scikit-learn>=0.22',
       ],
     classifiers=[
         "Programming Language :: Python :: 3",