Skip to content

Commit

Permalink
Require scikit-learn 1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sebp committed Dec 21, 2024
1 parent 6f353f1 commit 8a97071
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor/py310.ps1
Original file line number Diff line number Diff line change
@@ -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.*"
2 changes: 1 addition & 1 deletion ci/appveyor/py311.ps1
Original file line number Diff line number Diff line change
@@ -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.*"
2 changes: 1 addition & 1 deletion ci/appveyor/py312.ps1
Original file line number Diff line number Diff line change
@@ -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.*"
2 changes: 1 addition & 1 deletion ci/appveyor/py313.ps1
Original file line number Diff line number Diff line change
@@ -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.*"
2 changes: 1 addition & 1 deletion ci/deps/py310.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/deps/py311.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/deps/py312.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/deps/py313.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"]

Expand Down

0 comments on commit 8a97071

Please sign in to comment.