Merge pull request #73 from VesnaT/sklearn_update

ICE: partial_dependence returns grid_values
biolab · Jun 13, 2024 · 6f1d026 · 6f1d026
2 parents 27c897e + 00c57e5
commit 6f1d026
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/orangecontrib/explain/inspection.py b/orangecontrib/explain/inspection.py
@@ -228,7 +228,7 @@ def dummy_fit(*_, **__):
     if data.domain.has_discrete_class and \
             len(data.domain.class_var.values) == 2:
         results = {"average": np.vstack([1 - dep["average"], dep["average"]]),
-                   "values": dep["values"][0]}
+                   "values": dep["grid_values"][0]}
         if kind == "both":
             results["individual"] = \
                 np.vstack([1 - dep["individual"], dep["individual"]])

diff --git a/setup.py b/setup.py
@@ -43,13 +43,13 @@
     # issues with numpy - completely remove this pin after october 2024
     "numba >=0.58",
     "numpy",
-    "Orange3 >=3.34.0",
-    "orange-canvas-core >=0.1.28",
-    "orange-widget-base >=4.19.0",
+    "Orange3 >=3.36.2",
+    "orange-canvas-core >=0.1.30",
+    "orange-widget-base >=4.22.0",
     "pyqtgraph",
     "scipy",
-    "shap >=0.42.1",
-    "scikit-learn>=1.0.1",
+    "shap==0.42.1",
+    "scikit-learn>=1.3.0",
 ]
 
 EXTRAS_REQUIRE = {

diff --git a/tox.ini b/tox.ini
@@ -22,11 +22,11 @@ deps =
     {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*}
     {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*}
     xgboost
-    oldest: orange3==3.34.0
-    oldest: orange-canvas-core==0.1.28
-    oldest: orange-widget-base==4.19.0
+    oldest: orange3==3.36.2
+    oldest: orange-canvas-core==0.1.30
+    oldest: orange-widget-base==4.22.0
     oldest: pandas==1.4.0
-    oldest: scikit-learn==1.0.1
+    oldest: scikit-learn==1.3.0
     oldest: scipy==1.9.0
     latest: https://github.com/biolab/orange3/archive/refs/heads/master.zip#egg=orange3
     latest: https://github.com/biolab/orange-canvas-core/archive/refs/heads/master.zip#egg=orange-canvas-core