Thanks to visit codestin.com
Credit goes to github.com

Skip to content

MAINT bumpversion Python and dependencies #27910

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.

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

Merged
merged 21 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
jobs:
lint:
docker:
- image: cimg/python:3.8.12
- image: cimg/python:3.9.18
steps:
- checkout
- run:
Expand All @@ -18,7 +18,7 @@ jobs:

doc-min-dependencies:
docker:
- image: cimg/python:3.8.12
- image: cimg/python:3.9.18
environment:
- MKL_NUM_THREADS: 2
- OPENBLAS_NUM_THREADS: 2
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

doc:
docker:
- image: cimg/python:3.8.12
- image: cimg/python:3.9.18
environment:
- MKL_NUM_THREADS: 2
- OPENBLAS_NUM_THREADS: 2
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

deploy:
docker:
- image: cimg/python:3.8.12
- image: cimg/python:3.9.18
steps:
- checkout
- run: ./build_tools/circle/checkout_merge_commit.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-lock-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
matrix:
include:
- name: main
update_script_args: "--skip-build 'scipy-dev|^py39_conda_forge$|pypy'"
update_script_args: "--skip-build 'scipy-dev|^pymin_conda_forge$|pypy'"
additional_commit_message: "[doc build]"
- name: scipy-dev
update_script_args: "--select-build scipy_dev"
additional_commit_message: "[scipy-dev]"
- name: cirrus-arm
update_script_args: "--select-build '^py39_conda_forge$'"
update_script_args: "--select-build '^pymin_conda_forge$'"
additional_commit_message: "[cirrus arm]"
- name: pypy
update_script_args: "--select-build pypy"
Expand Down
15 changes: 1 addition & 14 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
name: Check build trigger
run: bash build_tools/github/check_build_trigger.sh

# Build the wheels for Linux, Windows and macOS for Python 3.8 and newer
# Build the wheels for Linux, Windows and macOS for Python 3.9 and newer
build_wheels:
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }}
runs-on: ${{ matrix.os }}
Expand All @@ -55,9 +55,6 @@ jobs:
# Window 64 bit
# Note: windows-2019 is needed for older Python versions:
# https://github.com/scikit-learn/scikit-learn/issues/22530
- os: windows-2019
python: 38
platform_id: win_amd64
- os: windows-latest
python: 39
platform_id: win_amd64
Expand All @@ -72,10 +69,6 @@ jobs:
platform_id: win_amd64

# Linux 64 bit manylinux2014
- os: ubuntu-latest
python: 38
platform_id: manylinux_x86_64
manylinux_image: manylinux2014
- os: ubuntu-latest
python: 39
platform_id: manylinux_x86_64
Expand All @@ -97,9 +90,6 @@ jobs:
manylinux_image: manylinux2014

# MacOS x86_64
- os: macos-latest
python: 38
platform_id: macosx_x86_64
- os: macos-latest
python: 39
platform_id: macosx_x86_64
Expand All @@ -118,9 +108,6 @@ jobs:
# Cirrus CI but due to limited build time for free accounts on Cirrus
# CI, we build the macOS arm64 wheels for the other Python versions on
# Github Actions via cross-compilation (without running the tests).
- os: macos-latest
python: 38
platform_id: macosx_arm64
- os: macos-latest
python: 39
platform_id: macosx_arm64
Expand Down
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
.. |Benchmark| image:: https://img.shields.io/badge/Benchmarked%20by-asv-blue
.. _`Benchmark`: https://scikit-learn.org/scikit-learn-benchmarks/

.. |PythonMinVersion| replace:: 3.8
.. |NumPyMinVersion| replace:: 1.17.3
.. |SciPyMinVersion| replace:: 1.5.0
.. |PythonMinVersion| replace:: 3.9
.. |NumPyMinVersion| replace:: 1.19.5
.. |SciPyMinVersion| replace:: 1.6.0
.. |JoblibMinVersion| replace:: 1.2.0
.. |ThreadpoolctlMinVersion| replace:: 2.0.0
.. |MatplotlibMinVersion| replace:: 3.3.4
.. |Scikit-ImageMinVersion| replace:: 0.16.2
.. |PandasMinVersion| replace:: 1.0.5
.. |Scikit-ImageMinVersion| replace:: 0.17.2
.. |PandasMinVersion| replace:: 1.1.5
.. |SeabornMinVersion| replace:: 0.9.0
.. |PytestMinVersion| replace:: 7.1.2
.. |PlotlyMinVersion| replace:: 5.14.0
Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ jobs:
)
commitMessage: dependencies['git_commit']['outputs']['commit.message']
matrix:
py38_conda_forge_openblas_ubuntu_2204:
pymin_conda_forge_openblas_ubuntu_2204:
DISTRIB: 'conda'
LOCK_FILE: './build_tools/azure/py38_conda_forge_openblas_ubuntu_2204_linux-64_conda.lock'
LOCK_FILE: './build_tools/azure/pymin_conda_forge_openblas_ubuntu_2204_linux-64_conda.lock'
CHECK_WARNINGS: 'true'
COVERAGE: 'false'
SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '0' # non-default seed
Expand Down Expand Up @@ -231,10 +231,10 @@ jobs:
not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]'))
)
matrix:
# Linux + Python 3.8 build with OpenBLAS
py38_conda_defaults_openblas:
# Linux + Python 3.9 build with OpenBLAS
pymin_conda_defaults_openblas:
DISTRIB: 'conda'
LOCK_FILE: './build_tools/azure/py38_conda_defaults_openblas_linux-64_conda.lock'
LOCK_FILE: './build_tools/azure/pymin_conda_defaults_openblas_linux-64_conda.lock'
# Enable debug Cython directives to capture IndexError exceptions in
# combination with the -Werror::pytest.PytestUnraisableExceptionWarning
# flag for pytest.
Expand Down Expand Up @@ -311,9 +311,9 @@ jobs:
not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]'))
)
matrix:
py38_conda_forge_mkl:
pymin_conda_forge_mkl:
DISTRIB: 'conda'
LOCK_FILE: ./build_tools/azure/py38_conda_forge_mkl_win-64_conda.lock
LOCK_FILE: ./build_tools/azure/pymin_conda_forge_mkl_win-64_conda.lock
CHECK_WARNINGS: 'true'
# The Azure Windows runner is typically much slower than other CI
# runners due to the lack of compiler cache. Running the tests with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-hd590300_2.conda#172b
https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda#6305a3dd2752c76335295da4e581f2fd
https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-ha4646dd_3.conda#c714d905cdfa0e70200f68b80cc04764
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-hd590300_1.conda#4b06b43d0eca61db2899e4d7a289c302
https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-3.0.0-hd590300_1.conda#ea25936bb4080d843790b586850f82b8
https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda#30fd6e37fe21f86f4bd26d6ee73eeec7
https://conda.anaconda.org/conda-forge/linux-64/libnuma-2.0.16-h0b41bf4_1.conda#28bfe2cb11357ccc5be21101a6b7ce86
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.19-hd590300_0.conda
https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda#6305a3dd2752c76335295da4e581f2fd
https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-ha4646dd_3.conda#c714d905cdfa0e70200f68b80cc04764
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-hd590300_1.conda#4b06b43d0eca61db2899e4d7a289c302
https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-3.0.0-hd590300_1.conda#ea25936bb4080d843790b586850f82b8
https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda#30fd6e37fe21f86f4bd26d6ee73eeec7
https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.4-h7f98852_1.tar.bz2#6e8cc2173440d77708196c5b93771680
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.19-ha4e1b8e_0.conda#6
https://conda.anaconda.org/conda-forge/osx-64/libexpat-2.5.0-hf0c8a7f_1.conda#6c81cb022780ee33435cca0127dd43c9
https://conda.anaconda.org/conda-forge/osx-64/libffi-3.4.2-h0d85af4_5.tar.bz2#ccb34fb14960ad8b125962d3d79b31a9
https://conda.anaconda.org/conda-forge/noarch/libgfortran-devel_osx-64-12.3.0-h0b6f5ec_1.conda#ecc03a145b87ed6b8806fb02dc0e13c4
https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hac89ed1_0.tar.bz2#691d103d11180486154af49c037b7ed9
https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hd75f5a5_1.conda#c4069fa5c051d41093d3fd52caffa285
https://conda.anaconda.org/conda-forge/osx-64/libjpeg-turbo-3.0.0-h0dc2134_1.conda#72507f8e3961bc968af17435060b6dd6
https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.3.2-h0dc2134_0.conda#4e7e9d244e87d66c18d36894fd6a8ae5
https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-h8a1eda9_5.conda#4a3ad23f6e16f99c04e166767193d700
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
channels:
- defaults
dependencies:
- python=3.8
- numpy=1.17.3 # min
- python=3.9
- numpy=1.21
- blas[build=openblas]
- scipy=1.5.0 # min
- scipy=1.7
- cython=0.29.33 # min
- joblib
- threadpoolctl=2.2.0
Expand Down
Loading