Skip to content

Commit 46f5423

Browse files
CI Remove constraints for scipy version in pylatest_conda_mkl_no_openmp job (scikit-learn#31729)
1 parent 953af7d commit 46f5423

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

build_tools/azure/pylatest_conda_mkl_no_openmp_environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- python
88
- numpy
99
- blas[build=mkl]
10-
- scipy<1.12
10+
- scipy
1111
- cython
1212
- joblib
1313
- threadpoolctl

build_tools/azure/pylatest_conda_mkl_no_openmp_osx-64_conda.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: osx-64
3-
# input_hash: 5adafa63ab1109c544ec1b12e91e8b32a70341ed5a2ae7c9eeea50ecb2907ebd
3+
# input_hash: 272bc18497f5ac80413d90a152efd3e60065cca52254829eb4ec33cec3001534
44
@EXPLICIT
55
https://repo.anaconda.com/pkgs/main/osx-64/blas-1.0-mkl.conda#cb2c87e85ac8e0ceae776d26d4214c8a
66
https://repo.anaconda.com/pkgs/main/osx-64/bzip2-1.0.8-h6c40b1e_6.conda#96224786021d0765ce05818fa3c59bdb
@@ -12,6 +12,7 @@ https://repo.anaconda.com/pkgs/main/osx-64/libffi-3.4.4-hecd8cb5_1.conda#eb7f09a
1212
https://repo.anaconda.com/pkgs/main/osx-64/libwebp-base-1.3.2-h46256e1_1.conda#399c11b50e6e7a6969aca9a84ea416b7
1313
https://repo.anaconda.com/pkgs/main/osx-64/llvm-openmp-17.0.6-hdd4a2e0_0.conda#0871f60a4c389ef44c343aa33b5a3acd
1414
https://repo.anaconda.com/pkgs/main/osx-64/ncurses-6.4-hcec6c5f_0.conda#0214d1ee980e217fabc695f1e40662aa
15+
https://repo.anaconda.com/pkgs/main/noarch/pybind11-abi-5-hd3eb1b0_0.conda#7f0df6639fdf60ccd3045ee6faedd32f
1516
https://repo.anaconda.com/pkgs/main/noarch/tzdata-2025b-h04d1e81_0.conda#1d027393db3427ab22a02aa44a56f143
1617
https://repo.anaconda.com/pkgs/main/osx-64/xxhash-0.8.0-h9ed2024_3.conda#79507f6b51082e0dc409046ee1471e8b
1718
https://repo.anaconda.com/pkgs/main/osx-64/xz-5.6.4-h46256e1_1.conda#ce989a528575ad332a650bb7c7f7e5d5
@@ -81,6 +82,6 @@ https://repo.anaconda.com/pkgs/main/osx-64/mkl_fft-1.3.8-py312h6c40b1e_0.conda#d
8182
https://repo.anaconda.com/pkgs/main/osx-64/mkl_random-1.2.4-py312ha357a0b_0.conda#c1ea9c8eee79a5af3399f3c31be0e9c6
8283
https://repo.anaconda.com/pkgs/main/osx-64/numpy-1.26.4-py312hac873b0_0.conda#3150bac1e382156f82a153229e1ebd06
8384
https://repo.anaconda.com/pkgs/main/osx-64/numexpr-2.8.7-py312hac873b0_0.conda#6303ba071636ef57fddf69eb6f440ec1
84-
https://repo.anaconda.com/pkgs/main/osx-64/scipy-1.11.4-py312h81688c2_0.conda#7d57b4c21a9261f97fa511e0940c5d93
85+
https://repo.anaconda.com/pkgs/main/osx-64/scipy-1.13.0-py312h81688c2_0.conda#b7431aa846b36c7fa2db35fe32c9c123
8586
https://repo.anaconda.com/pkgs/main/osx-64/pandas-2.2.3-py312h6d0c2b6_0.conda#84ce5b8ec4a986d13a5df17811f556a2
8687
https://repo.anaconda.com/pkgs/main/osx-64/pyamg-5.2.1-py312h1962661_0.conda#58881950d4ce74c9302b56961f97a43c

build_tools/update_environments_and_lock_files.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ def remove_from(alist, to_remove):
160160
"conda_dependencies": common_dependencies + ["ccache"],
161161
"package_constraints": {
162162
"blas": "[build=mkl]",
163-
# scipy 1.12.x crashes on this platform (https://github.com/scipy/scipy/pull/20086)
164-
# TODO: release scipy constraint when 1.13 is available in the "default"
165-
# channel.
166-
"scipy": "<1.12",
167163
},
168164
},
169165
{

0 commit comments

Comments
 (0)