8000 MAINT bumpversion Python and dependencies (#27910) · punndcoder28/scikit-learn@e8ec36c · GitHub
[go: up one dir, main page]
Skip to content

Commit e8ec36c

Browse files
glemaitreglemaitre
authored
MAINT bumpversion Python and dependencies (scikit-learn#27910)
1 parent 6291f66 commit e8ec36c

28 files changed

+222
-257
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
jobs:
44
lint:
55
docker:
6-
- image: cimg/python:3.8.12
6+
- image: cimg/python:3.9.18
77
steps:
88
- checkout
99
- run:
@@ -18,7 +18,7 @@ jobs:
1818

1919
doc-min-dependencies:
2020
docker:
21-
- image: cimg/python:3.8.12
21+
- image: cimg/python:3.9.18
2222
environment:
2323
- MKL_NUM_THREADS: 2
2424
- OPENBLAS_NUM_THREADS: 2
@@ -52,7 +52,7 @@ jobs:
5252

5353
doc:
5454
docker:
55-
- image: cimg/python:3.8.12
55+
- image: cimg/python:3.9.18
5656
environment:
5757
- MKL_NUM_THREADS: 2
5858
- OPENBLAS_NUM_THREADS: 2
@@ -91,7 +91,7 @@ jobs:
9191

9292
deploy:
9393
docker:
94-
- image: cimg/python:3.8.12
94+
- image: cimg/python:3.9.18
9595
steps:
9696
- checkout
9797
- run: ./build_tools/circle/checkout_merge_commit.sh

‎.github/workflows/update-lock-files.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
matrix:
1818
include:
1919
- name: main
20-
update_script_args: "--skip-build 'scipy-dev|^py39_conda_forge$|pypy'"
20+
update_script_args: "--skip-build 'scipy-dev|^pymin_conda_forge$|pypy'"
2121
additional_commit_message: "[doc build]"
2222
- name: scipy-dev
2323
update_script_args: "--select-build scipy_dev"
2424
additional_commit_message: "[scipy-dev]"
2525
- name: cirrus-arm
26-
update_script_args: "--select-build '^py39_conda_forge$'"
26+
update_script_args: "--select-build '^pymin_conda_forge$'"
2727
additional_commit_message: "[cirrus arm]"
2828
- name: pypy
2929
update_script_args: "--select-build pypy"

‎.github/workflows/wheels.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
name: Check build trigger
4141
run: bash build_tools/github/check_build_trigger.sh
4242

43-
# Build the wheels for Linux, Windows and macOS for Python 3.8 and newer
43+
# Build the wheels for Linux, Windows and macOS for Python 3.9 and newer
4444
build_wheels:
4545
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }}
4646
runs-on: ${{ matrix.os }}
@@ -55,9 +55,6 @@ jobs:
5555
# Window 64 bit
5656
# Note: windows-2019 is needed for older Python versions:
5757
# https://github.com/scikit-learn/scikit-learn/issues/22530
58-
- os: windows-2019
59-
python: 38
60-
platform_id: win_amd64
6158
- os: windows-latest
6259
python: 39
6360
platform_id: win_amd64
@@ -72,10 +69,6 @@ jobs:
7269
platform_id: win_amd64
7370

7471
# Linux 64 bit manylinux2014
75-
- os: ubuntu-latest
76-
python: 38
77-
platform_id: manylinux_x86_64
78-
manylinux_image: manylinux2014
7972
- os: ubuntu-latest
8073
python: 39
8174
platform_id: manylinux_x86_64
@@ -97,9 +90,6 @@ jobs:
9790
manylinux_image: manylinux2014
9891

9992
# MacOS x86_64
100-
- os: macos-latest
101-
python: 38
102-
platform_id: macosx_x86_64
10393
- os: macos-latest
10494
python: 39
10595
platform_id: macosx_x86_64
@@ -118,9 +108,6 @@ jobs:
118108
# Cirrus CI but due to limited build time for free accounts on Cirrus
119109
# CI, we build the macOS arm64 wheels for the other Python versions on
120110
# Github Actions via cross-compilation (without running the tests).
121-
- os: macos-latest
122-
python: 38
123-
platform_id: macosx_arm64
124111
- os: macos-latest
125112
python: 39
126113
platform_id: macosx_arm64

‎README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
.. |Benchmark| image:: https://img.shields.io/badge/Benchmarked%20by-asv-blue
3333
.. _`Benchmark`: https://scikit-learn.org/scikit-learn-benchmarks/
3434

35-
.. |PythonMinVersion| replace:: 3.8
36-
.. |NumPyMinVersion| replace:: 1.17.3
37-
.. |SciPyMinVersion| replace:: 1.5.0
35+
.. |PythonMinVersion| replace:: 3.9
36+
.. |NumPyMinVersion| replace:: 1.19.5
37+
.. |SciPyMinVersion| replace:: 1.6.0
3838
.. |JoblibMinVersion| replace:: 1.2.0
3939
.. |ThreadpoolctlMinVersion| replace:: 2.0.0
4040
.. |MatplotlibMinVersion| replace:: 3.3.4
41-
.. |Scikit-ImageMinVersion| replace:: 0.16.2
42-
.. |PandasMinVersion| replace:: 1.0.5
41+
.. |Scikit-ImageMinVersion| replace:: 0.17.2
42+
.. |PandasMinVersion| replace:: 1.1.5
4343
.. |SeabornMinVersion| replace:: 0.9.0
4444
.. |PytestMinVersion| replace:: 7.1.2
4545
.. |PlotlyMinVersion| replace:: 5.14.0

‎azure-pipelines.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ jobs:
191191
)
192192
commitMessage: dependencies['git_commit']['outputs']['commit.message']
193193
matrix:
194-
py38_conda_forge_openblas_ubuntu_2204:
194+
pymin_conda_forge_openblas_ubuntu_2204:
195195
DISTRIB: 'conda'
196-
LOCK_FILE: './build_tools/azure/py38_conda_forge_openblas_ubuntu_2204_linux-64_conda.lock'
196+
LOCK_FILE: './build_tools/azure/pymin_conda_forge_openblas_ubuntu_2204_linux-64_conda.lock'
197197
CHECK_WARNINGS: 'true'
198198
COVERAGE: 'false'
199199
SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '0' # non-default seed
@@ -231,10 +231,10 @@ jobs:
231231
not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]'))
232232
)
233233
matrix:
234-
# Linux + Python 3.8 build with OpenBLAS
235-
py38_conda_defaults_openblas:
234+
# Linux + Python 3.9 build with OpenBLAS
235+
pymin_conda_defaults_openblas:
236236
DISTRIB: 'conda'
237-
LOCK_FILE: './build_tools/azure/py38_conda_defaults_openblas_linux-64_conda.lock'
237+
LOCK_FILE: './build_tools/azure/pymin_conda_defaults_openblas_linux-64_conda.lock'
238238
# Enable debug Cython directives to capture IndexError exceptions in
239239
# combination with the -Werror::pytest.PytestUnraisableExceptionWarning
240240
# flag for pytest.
@@ -311,9 +311,9 @@ jobs:
311311
not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]'))
312312
)
313313
matrix:
314-
py38_conda_forge_mkl:
314+
pymin_conda_forge_mkl:
315315
DISTRIB: 'conda'
316-
LOCK_FILE: ./build_tools/azure/py38_conda_forge_mkl_win-64_conda.lock
316+
LOCK_FILE: ./build_tools/azure/pymin_conda_forge_mkl_win-64_conda.lock
317317
CHECK_WARNINGS: 'true'
318318
# The Azure Windows runner is typically much slower than other CI
319319
# runners due to the lack of compiler cache. Running the tests with

‎build_tools/azure/pylatest_conda_forge_mkl_linux-64_conda.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-hd590300_2.conda#172b
3636
https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda#6305a3dd2752c76335295da4e581f2fd
3737
https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
3838
https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-ha4646dd_3.conda#c714d905cdfa0e70200f68b80cc04764
39-
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
39+
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-hd590300_1.conda#4b06b43d0eca61db2899e4d7a289c302
4040
https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-3.0.0-hd590300_1.conda#ea25936bb4080d843790b586850f82b8
4141
https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda#30fd6e37fe21f86f4bd26d6ee73eeec7
4242
https://conda.anaconda.org/conda-forge/linux-64/libnuma-2.0.16-h0b41bf4_1.conda#28bfe2cb11357ccc5be21101a6b7ce86

‎build_tools/azure/pylatest_conda_forge_mkl_no_coverage_linux-64_conda.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.19-hd590300_0.conda
3131
https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda#6305a3dd2752c76335295da4e581f2fd
3232
https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
3333
https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-ha4646dd_3.conda#c714d905cdfa0e70200f68b80cc04764
34-
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
34+
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-hd590300_1.conda#4b06b43d0eca61db2899e4d7a289c302
3535
https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-3.0.0-hd590300_1.conda#ea25936bb4080d843790b586850f82b8
3636
https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda#30fd6e37fe21f86f4bd26d6ee73eeec7
3737
https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.4-h7f98852_1.tar.bz2#6e8cc2173440d77708196c5b93771680

‎build_tools/azure/pylatest_conda_forge_mkl_osx-64_conda.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.19-ha4e1b8e_0.conda#6
1111
https://conda.anaconda.org/conda-forge/osx-64/libexpat-2.5.0-hf0c8a7f_1.conda#6c81cb022780ee33435cca0127dd43c9
1212
https://conda.anaconda.org/conda-forge/osx-64/libffi-3.4.2-h0d85af4_5.tar.bz2#ccb34fb14960ad8b125962d3d79b31a9
1313
https://conda.anaconda.org/conda-forge/noarch/libgfortran-devel_osx-64-12.3.0-h0b6f5ec_1.conda#ecc03a145b87ed6b8806fb02dc0e13c4
14-
https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hac89ed1_0.tar.bz2#691d103d11180486154af49c037b7ed9
14+
https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hd75f5a5_1.conda#c4069fa5c051d41093d3fd52caffa285
1515
https://conda.anaconda.org/conda-forge/osx-64/libjpeg-turbo-3.0.0-h0dc2134_1.conda#72507f8e3961bc968af17435060b6dd6
1616
https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.3.2-h0dc2134_0.conda#4e7e9d244e87d66c18d36894fd6a8ae5
1717
https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-h8a1eda9_5.conda#4a3ad23f6e16f99c04e166767193d700

‎build_tools/azure/py38_conda_defaults_openblas_environment.yml renamed to ‎build_tools/azure/pymin_conda_defaults_openblas_environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
channels:
55
- defaults
66
dependencies:
7-
- python=3.8
8-
- numpy=1.17.3 # min
7+
- python=3.9
8+
- numpy=1.21
99
- blas[build=openblas]
10-
- scipy=1.5.0 # min
10+
- scipy=1.7
1111
- cython=0.29.33 # min
1212
- joblib
1313
- threadpoolctl=2.2.0

0 commit comments

Comments
 (0)
0