From c7927c4c48d7c2f59fad80fa90912bd7d459b345 Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 9 Dec 2020 17:27:47 +0100 Subject: [PATCH 1/4] Update to new sklearn API Change as per FutureWarning in sklearn, to allow eli5 to be used with sklearn 0.24 and newer. --- eli5/sklearn/permutation_importance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eli5/sklearn/permutation_importance.py b/eli5/sklearn/permutation_importance.py index 370be8be..bbf36050 100644 --- a/eli5/sklearn/permutation_importance.py +++ b/eli5/sklearn/permutation_importance.py @@ -12,7 +12,7 @@ clone, is_classifier ) -from sklearn.metrics.scorer import check_scoring +from sklearn.metrics import check_scoring from eli5.permutation_importance import get_score_importances from eli5.sklearn.utils import pandas_available From 6f5ac09029257d1dc5735e61bc1f035a12f4b714 Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 9 Dec 2020 19:18:17 +0100 Subject: [PATCH 2/4] Update requirements.txt enforce the upgrade of sklearn --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ca97e5d2..97eb8df3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ numpy >= 1.9.0 scipy singledispatch >= 3.4.0.3 -scikit-learn >= 0.18 +scikit-learn >= 0.20 attrs > 16.0.0 jinja2 pip >= 8.1 From 021311a340b73dff70712cf7f89101b0f16a7c7e Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 9 Dec 2020 19:21:16 +0100 Subject: [PATCH 3/4] increased version of sklearn in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ec561515..22b52544 100755 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ def get_long_description(): 'numpy >= 1.9.0', 'scipy', 'six', - 'scikit-learn >= 0.18', + 'scikit-learn >= 0.20', 'graphviz', 'tabulate>=0.7.7', ], From 805a3c15cab93ae7be5f66c7b767abd59805498d Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 9 Dec 2020 19:22:20 +0100 Subject: [PATCH 4/4] version bump for sklearn --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 9b81c79a..ea3b328e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,5 +4,5 @@ sphinx_rtd_theme ipython scipy numpy > 1.9.0 -scikit-learn >= 0.18 +scikit-learn >= 0.20 typing