From 8a97071fd7442b221d683c767bddd14cd157b120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20P=C3=B6lsterl?= <sebp@k-d-w.org>
Date: Sat, 21 Dec 2024 14:07:53 +0100
Subject: [PATCH] Require scikit-learn 1.6.0

---
 README.rst            | 2 +-
 ci/appveyor/py310.ps1 | 2 +-
 ci/appveyor/py311.ps1 | 2 +-
 ci/appveyor/py312.ps1 | 2 +-
 ci/appveyor/py313.ps1 | 2 +-
 ci/deps/py310.sh      | 2 +-
 ci/deps/py311.sh      | 2 +-
 ci/deps/py312.sh      | 2 +-
 ci/deps/py313.sh      | 2 +-
 doc/install.rst       | 2 +-
 pyproject.toml        | 5 ++---
 11 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index 71ef1cd5..fd1223f2 100644
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@ Requirements
 - numpy
 - osqp
 - pandas 1.4.0 or later
-- scikit-learn 1.4 or 1.5
+- scikit-learn 1.6
 - scipy
 - C/C++ compiler
 
diff --git a/ci/appveyor/py310.ps1 b/ci/appveyor/py310.ps1
index df7f0bfd..665d3214 100644
--- a/ci/appveyor/py310.ps1
+++ b/ci/appveyor/py310.ps1
@@ -1,4 +1,4 @@
 $env:CI_PYTHON_VERSION="3.10.*"
 $env:CI_PANDAS_VERSION="1.5.*"
 $env:CI_NUMPY_VERSION="1.25.*"
-$env:CI_SKLEARN_VERSION="1.4.*"
+$env:CI_SKLEARN_VERSION="1.6.*"
diff --git a/ci/appveyor/py311.ps1 b/ci/appveyor/py311.ps1
index 3cd8ad40..1d1e2456 100644
--- a/ci/appveyor/py311.ps1
+++ b/ci/appveyor/py311.ps1
@@ -1,4 +1,4 @@
 $env:CI_PYTHON_VERSION="3.11.*"
 $env:CI_PANDAS_VERSION="2.0.*"
 $env:CI_NUMPY_VERSION="1.26.*"
-$env:CI_SKLEARN_VERSION="1.5.*"
+$env:CI_SKLEARN_VERSION="1.6.*"
diff --git a/ci/appveyor/py312.ps1 b/ci/appveyor/py312.ps1
index d1ba90d1..eb7ee138 100644
--- a/ci/appveyor/py312.ps1
+++ b/ci/appveyor/py312.ps1
@@ -1,4 +1,4 @@
 $env:CI_PYTHON_VERSION="3.12.*"
 $env:CI_PANDAS_VERSION="2.2.*"
 $env:CI_NUMPY_VERSION="2.0.*"
-$env:CI_SKLEARN_VERSION="1.5.*"
+$env:CI_SKLEARN_VERSION="1.6.*"
diff --git a/ci/appveyor/py313.ps1 b/ci/appveyor/py313.ps1
index 32f2664a..cd6ef92d 100644
--- a/ci/appveyor/py313.ps1
+++ b/ci/appveyor/py313.ps1
@@ -1,4 +1,4 @@
 $env:CI_PYTHON_VERSION="3.13.*"
 $env:CI_PANDAS_VERSION="2.2.*"
 $env:CI_NUMPY_VERSION="2.1.*"
-$env:CI_SKLEARN_VERSION="1.5.*"
+$env:CI_SKLEARN_VERSION="1.6.*"
diff --git a/ci/deps/py310.sh b/ci/deps/py310.sh
index 57ef4d7b..968d5684 100644
--- a/ci/deps/py310.sh
+++ b/ci/deps/py310.sh
@@ -2,5 +2,5 @@
 export CI_PYTHON_VERSION='3.10.*'
 export CI_PANDAS_VERSION='1.5.*'
 export CI_NUMPY_VERSION='1.25.*'
-export CI_SKLEARN_VERSION='1.4.*'
+export CI_SKLEARN_VERSION='1.6.*'
 export CI_NO_SLOW=false
diff --git a/ci/deps/py311.sh b/ci/deps/py311.sh
index 28c83a40..13edeb85 100644
--- a/ci/deps/py311.sh
+++ b/ci/deps/py311.sh
@@ -2,5 +2,5 @@
 export CI_PYTHON_VERSION='3.11.*'
 export CI_PANDAS_VERSION='2.0.*'
 export CI_NUMPY_VERSION='1.26.*'
-export CI_SKLEARN_VERSION='1.5.*'
+export CI_SKLEARN_VERSION='1.6.*'
 export CI_NO_SLOW=true
diff --git a/ci/deps/py312.sh b/ci/deps/py312.sh
index 380ffca2..14b1da21 100644
--- a/ci/deps/py312.sh
+++ b/ci/deps/py312.sh
@@ -2,5 +2,5 @@
 export CI_PYTHON_VERSION='3.12.*'
 export CI_PANDAS_VERSION='2.2.*'
 export CI_NUMPY_VERSION='2.0.*'
-export CI_SKLEARN_VERSION='1.5.*'
+export CI_SKLEARN_VERSION='1.6.*'
 export CI_NO_SLOW=true
diff --git a/ci/deps/py313.sh b/ci/deps/py313.sh
index bce18de1..569fc5e8 100644
--- a/ci/deps/py313.sh
+++ b/ci/deps/py313.sh
@@ -2,5 +2,5 @@
 export CI_PYTHON_VERSION='3.13.*'
 export CI_PANDAS_VERSION='2.2.*'
 export CI_NUMPY_VERSION='2.1.*'
-export CI_SKLEARN_VERSION='1.5.*'
+export CI_SKLEARN_VERSION='1.6.*'
 export CI_NO_SLOW=false
diff --git a/doc/install.rst b/doc/install.rst
index f85abf55..763eb391 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -100,6 +100,6 @@ The current minimum dependencies to run scikit-survival are:
 - numpy
 - osqp
 - pandas 1.4.0 or later
-- scikit-learn 1.4 or 1.5
+- scikit-learn 1.6
 - scipy
 - C/C++ compiler
diff --git a/pyproject.toml b/pyproject.toml
index 7179e31e..c675845f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,8 +9,7 @@ requires = [
     "numpy>=2.0.0",
 
     # scikit-learn requirements
-    "scikit-learn~=1.4.0; python_version<='3.12'",
-    "scikit-learn~=1.5.0; python_version=='3.13'",
+    "scikit-learn~=1.6.0; python_version<='3.13'",
     "scikit-learn; python_version>'3.13'",
 ]
 build-backend = "setuptools.build_meta"
@@ -51,7 +50,7 @@ dependencies = [
     "osqp !=0.6.0,!=0.6.1",
     "pandas >=1.4.0",
     "scipy >=1.3.2",
-    "scikit-learn >=1.4.0,<1.6",
+    "scikit-learn >=1.6.0,<1.7",
 ]
 dynamic = ["version"]