From 796fd89746b49a3939dfdc347a86adbd2a03330a Mon Sep 17 00:00:00 2001
From: fdion <fdion@dionresearch.com>
Date: Thu, 11 Jun 2020 09:32:41 -0400
Subject: [PATCH 1/2] Imputer is now SimpleImputer

---
 few/few.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/few/few.py b/few/few.py
index cb86c2d..e797245 100644
--- a/few/few.py
+++ b/few/few.py
@@ -23,7 +23,8 @@
 from sklearn.pipeline import Pipeline
 from sklearn.model_selection import cross_val_score, train_test_split, KFold
 from sklearn.metrics import r2_score, accuracy_score, roc_auc_score
-from sklearn.preprocessing import Imputer, StandardScaler
+from sklearn.preprocessing import StandardScaler
+from sklearn.impute import SimpleImputer
 from sklearn.utils import check_random_state
 from DistanceClassifier import DistanceClassifier
 import numpy as np
@@ -34,7 +35,7 @@
 import pdb
 from collections import defaultdict
 # from update_checker import update_check
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 from tqdm import tqdm
 import uuid
 
@@ -433,7 +434,7 @@ def transform(self,x,inds=None,labels = None):
 
     def impute_data(self,x):
         """Imputes data set containing Nan values"""
-        imp = Imputer(missing_values='NaN', strategy='mean', axis=0)
+        imp = SimpleImputer(missing_values='NaN', strategy='mean', axis=0)
         return imp.fit_transform(x)
 
     def clean(self,x):

From bfd730c759fca63da8e20e861f948af1fab6a66d Mon Sep 17 00:00:00 2001
From: fdion <fdion@dionresearch.com>
Date: Thu, 11 Jun 2020 09:33:26 -0400
Subject: [PATCH 2/2] Parallel and delayed no longer in sklearn, in joblib

---
 few/evaluation.py | 3 ++-
 setup.py          | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/few/evaluation.py b/few/evaluation.py
index 71ec17c..7000394 100644
--- a/few/evaluation.py
+++ b/few/evaluation.py
@@ -13,8 +13,9 @@
 import sys
 from sklearn.metrics.pairwise import pairwise_distances
 # from profilehooks import profile
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 from sklearn.feature_selection import f_classif, f_regression
+
 # safe division
 def divs(x,y):
     """safe division"""
diff --git a/setup.py b/setup.py
index af978fa..9d148f1 100644
--- a/setup.py
+++ b/setup.py
@@ -65,10 +65,10 @@ def calculate_version():
 This project is hosted at https://github.com/lacava/few
 ''',
     zip_safe=True,
-    install_requires=['numpy', 'scipy', 'pandas', 'scikit-learn',
+    install_requires=['numpy', 'scipy', 'pandas', 'scikit-learn', 'joblib',
                       'update_checker', 'tqdm', 'joblib','DistanceClassifier',
                       'scikit-mdr','Cython', 'eigency'],
-    setup_requires=['numpy', 'scipy', 'pandas', 'scikit-learn',
+    setup_requires=['numpy', 'scipy', 'pandas', 'scikit-learn', 'joblib',
                       'update_checker', 'tqdm', 'joblib','DistanceClassifier',
                       'scikit-mdr','Cython', 'eigency'],
     classifiers=[