Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scikit-learn requirement to >=0.22.2,<1.4.0 #2346

Closed
wants to merge 4 commits into from
Closed

Update scikit-learn requirement to >=0.22.2,<1.4.0 #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3792b4f
Allow latest scikit-learn
jamesmyatt Dec 20, 2023
9cabd9e
Add latest scikit-learn to CI
jamesmyatt Dec 20, 2023
8adb40d
Add old Python with latest scikit-learn to CI
jamesmyatt Dec 20, 2023
63339b2
Update scikit-learn and numba test requirements
jamesmyatt Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/ci-scikit-learn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ jobs:
fail-fast: false
matrix:
include:
- name: scikit-learn 0.24.2 (Python 3.9)
framework: scikitlearn
scikit-learn: 0.24.2
python: 3.9
- name: scikit-learn 1.1.3 (Python 3.9)
framework: scikitlearn
scikit-learn: 1.1.3
Expand All @@ -44,6 +40,14 @@ jobs:
framework: scikitlearn
scikit-learn: 1.2.2
python: '3.10'
- name: scikit-learn 1.3.2 (Python 3.10)
framework: scikitlearn
scikit-learn: 1.3.2
python: '3.10'
- name: scikit-learn 1.3.2 (Python 3.11)
framework: scikitlearn
scikit-learn: 1.3.2
python: '3.11'

name: ${{ matrix.name }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apt-get update -y
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
RUN apt-get install -y python3 python3-distutils python3-pip

RUN pip3 install tensorflow==2.9.1 keras==2.9.0 numpy==1.22.4 scipy==1.8.1 matplotlib==3.5.2 scikit-learn==1.1.2 \
RUN pip3 install tensorflow==2.9.1 keras==2.9.0 numpy==1.22.4 scipy==1.8.1 matplotlib==3.5.2 scikit-learn==1.3.2 \
six==1.15.0 Pillow==9.2.0 pytest-cov==3.0.0 tqdm==4.64.0 statsmodels==0.13.2 pydub==0.25.1 \
resampy==0.3.1 ffmpeg-python==0.2.0 cma==3.2.2 pandas==1.4.3 h5py==3.7.0 tensorflow-addons==0.17.1 \
mxnet==1.6.0 torch==1.12.0 torchaudio==0.12.0 torchvision==0.13.0 catboost==1.0.6 GPy==1.10.0 \
Expand Down
4 changes: 2 additions & 2 deletions requirements_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
numpy>=1.18.5,<1.25
scipy==1.10.1
matplotlib==3.7.1
scikit-learn>=0.22.2,<1.2.0
scikit-learn>=1.0.0,<1.4.0 # only test v1.0 onwards
six==1.16.0
Pillow==10.1.0
tqdm==4.66.1
Expand All @@ -14,7 +14,7 @@ ffmpeg-python==0.2.0
cma==3.3.0
pandas==2.1.4
librosa==0.10.0.post2
numba~=0.56.4
numba~=0.58.1 # for Python 3.11 support
opencv-python
sortedcontainers==2.4.0
h5py==3.10.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
install_requires = [
"numpy>=1.18.0",
"scipy>=1.4.1",
"scikit-learn>=0.22.2,<1.2.0",
"scikit-learn>=0.22.2,<1.4.0",
"six",
"setuptools",
"tqdm",
Expand All @@ -24,7 +24,7 @@
"numpy>=1.18.0",
"scipy>=1.4.1",
"six>=1.13.0",
"scikit-learn>=0.22.2,<1.2.0",
"scikit-learn>=0.22.2,<1.4.0",
"Pillow>=6.0.0",
]

Expand Down
Loading