Skip to content

Commit e971134

Browse files
CI Move some pip_dependencies to conda_dependencies (scikit-learn#31623)
1 parent 57df491 commit e971134

7 files changed

+86
-86
lines changed

build_tools/azure/pylatest_conda_mkl_no_openmp_environment.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ dependencies:
88
- numpy
99
- blas[build=mkl]
1010
- scipy<1.12
11+
- cython
1112
- joblib
13+
- threadpoolctl
1214
- matplotlib
1315
- pandas
1416
- pyamg
@@ -17,12 +19,7 @@ dependencies:
1719
- pillow
1820
- pip
1921
- ninja
22+
- meson-python
2023
- pytest-cov
2124
- coverage
2225
- ccache
23-
- pip
24-
- pip:
25-
- cython
26-
- threadpoolctl
27-
- meson-python
28-
- meson

build_tools/azure/pylatest_conda_mkl_no_openmp_osx-64_conda.lock

Lines changed: 6 additions & 6 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: cc639ea0beeaceb46e2ad729ba559d5d5e746b8f6ff522bc718109af6265069c
3+
# input_hash: 5adafa63ab1109c544ec1b12e91e8b32a70341ed5a2ae7c9eeea50ecb2907ebd
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
@@ -40,6 +40,7 @@ https://repo.anaconda.com/pkgs/main/osx-64/python-3.12.11-he8d2d4c_0.conda#9783e
4040
https://repo.anaconda.com/pkgs/main/osx-64/brotli-python-1.0.9-py312h6d0c2b6_9.conda#425936421fe402074163ac3ffe33a060
4141
https://repo.anaconda.com/pkgs/main/osx-64/coverage-7.6.9-py312h46256e1_0.conda#f8c1547bbf522a600ee795901240a7b0
4242
https://repo.anaconda.com/pkgs/main/noarch/cycler-0.11.0-pyhd3eb1b0_0.conda#f5e365d2cdb66d547eb8c3ab93843aab
43+
https://repo.anaconda.com/pkgs/main/osx-64/cython-3.0.11-py312h46256e1_1.conda#44443579c3f4ae02940aeefb77e6115e
4344
https://repo.anaconda.com/pkgs/main/noarch/execnet-2.1.1-pyhd3eb1b0_0.conda#b3cb797432ee4657d5907b91a5dc65ad
4445
https://repo.anaconda.com/pkgs/main/noarch/iniconfig-1.1.1-pyhd3eb1b0_0.tar.bz2#e40edff2c5708f342cef43c7f280c507
4546
https://repo.anaconda.com/pkgs/main/osx-64/joblib-1.4.2-py312hecd8cb5_0.conda#8ab03dfa447b4e0bfa0bd3d25930f3b6
@@ -56,16 +57,20 @@ https://repo.anaconda.com/pkgs/main/noarch/python-tzdata-2025.2-pyhd3eb1b0_0.con
5657
https://repo.anaconda.com/pkgs/main/osx-64/pytz-2024.1-py312hecd8cb5_0.conda#2b28ec0e0d07f5c0c701f75200b1e8b6
5758
https://repo.anaconda.com/pkgs/main/osx-64/setuptools-78.1.1-py312hecd8cb5_0.conda#76b66b96a1564cb76011408c1eb8df3e
5859
https://repo.anaconda.com/pkgs/main/osx-64/six-1.17.0-py312hecd8cb5_0.conda#aadd782bc06426887ae0835eedd98ceb
60+
https://repo.anaconda.com/pkgs/main/noarch/threadpoolctl-2.2.0-pyh0d69192_0.conda#bbfdbae4934150b902f97daaf287efe2
5961
https://repo.anaconda.com/pkgs/main/noarch/toml-0.10.2-pyhd3eb1b0_0.conda#cda05f5f6d8509529d1a2743288d197a
6062
https://repo.anaconda.com/pkgs/main/osx-64/tornado-6.5.1-py312h46256e1_0.conda#8ce574315c742b52790459087e273fb4
6163
https://repo.anaconda.com/pkgs/main/osx-64/unicodedata2-15.1.0-py312h46256e1_1.conda#4a7fd1dec7277c8ab71aa11aa08df86b
6264
https://repo.anaconda.com/pkgs/main/osx-64/wheel-0.45.1-py312hecd8cb5_0.conda#fafb8687668467d8624d2ddd0909bce9
6365
https://repo.anaconda.com/pkgs/main/osx-64/fonttools-4.55.3-py312h46256e1_0.conda#f7680dd6b8b1c2f8aab17cf6630c6deb
66+
https://repo.anaconda.com/pkgs/main/osx-64/meson-1.6.0-py312hecd8cb5_0.conda#7fda9195b93d66b3799a47d643782467
6467
https://repo.anaconda.com/pkgs/main/osx-64/numpy-base-1.26.4-py312h6f81483_0.conda#87f73efbf26ab2e2ea7c32481a71bd47
6568
https://repo.anaconda.com/pkgs/main/osx-64/pillow-11.1.0-py312h935ef2f_1.conda#c2f7a3f027cc93a3626d50b765b75dc5
6669
https://repo.anaconda.com/pkgs/main/noarch/pip-25.1-pyhc872135_2.conda#2778327d2a700153fefe0e69438b18e1
70+
https://repo.anaconda.com/pkgs/main/osx-64/pyproject-metadata-0.9.0-py312hecd8cb5_0.conda#d249fcd6371bb45263d32a3f74087116
6771
https://repo.anaconda.com/pkgs/main/osx-64/pytest-8.4.1-py312hecd8cb5_0.conda#438421697d4806567af06bd006b26db0
6872
https://repo.anaconda.com/pkgs/main/osx-64/python-dateutil-2.9.0post0-py312hecd8cb5_2.conda#1047dde28f78127dd9f6121e882926dd
73+
https://repo.anaconda.com/pkgs/main/osx-64/meson-python-0.17.1-py312h46256e1_0.conda#8ec02421632bd391150e12f6924f6172
6974
https://repo.anaconda.com/pkgs/main/osx-64/pytest-cov-6.0.0-py312hecd8cb5_0.conda#db697e319a4d1145363246a51eef0352
7075
https://repo.anaconda.com/pkgs/main/osx-64/pytest-xdist-3.6.1-py312hecd8cb5_0.conda#38df9520774ee82bf143218f1271f936
7176
https://repo.anaconda.com/pkgs/main/osx-64/bottleneck-1.4.2-py312ha2b695f_0.conda#7efb63b6a5b33829a3b2c7a3efcf53ce
@@ -79,8 +84,3 @@ https://repo.anaconda.com/pkgs/main/osx-64/numexpr-2.8.7-py312hac873b0_0.conda#6
7984
https://repo.anaconda.com/pkgs/main/osx-64/scipy-1.11.4-py312h81688c2_0.conda#7d57b4c21a9261f97fa511e0940c5d93
8085
https://repo.anaconda.com/pkgs/main/osx-64/pandas-2.2.3-py312h6d0c2b6_0.conda#84ce5b8ec4a986d13a5df17811f556a2
8186
https://repo.anaconda.com/pkgs/main/osx-64/pyamg-5.2.1-py312h1962661_0.conda#58881950d4ce74c9302b56961f97a43c
82-
# pip cython @ https://files.pythonhosted.org/packages/22/86/9393ab7204d5bb65f415dd271b658c18f57b9345d06002cae069376a5a7a/cython-3.1.2-cp312-cp312-macosx_10_13_x86_64.whl#sha256=9c2c4b6f9a941c857b40168b3f3c81d514e509d985c2dcd12e1a4fea9734192e
83-
# pip meson @ https://files.pythonhosted.org/packages/8e/6e/b9dfeac98dd508f88bcaff134ee0bf5e602caf3ccb5a12b5dd9466206df1/meson-1.8.2-py3-none-any.whl#sha256=274b49dbe26e00c9a591442dd30f4ae9da8ce11ce53d0f4682cd10a45d50f6fd
84-
# pip threadpoolctl @ https://files.pythonhosted.org/packages/32/d5/f9a850d79b0851d1d4ef6456097579a9005b31fea68726a4ae5f2d82ddd9/threadpoolctl-3.6.0-py3-none-any.whl#sha256=43a0b8fd5a2928500110039e43a5eed8480b918967083ea48dc3ab9f13c4a7fb
85-
# pip pyproject-metadata @ https://files.pythonhosted.org/packages/7e/b1/8e63033b259e0a4e40dd1ec4a9fee17718016845048b43a36ec67d62e6fe/pyproject_metadata-0.9.1-py3-none-any.whl#sha256=ee5efde548c3ed9b75a354fc319d5afd25e9585fa918a34f62f904cc731973ad
86-
# pip meson-python @ https://files.pythonhosted.org/packages/28/58/66db620a8a7ccb32633de9f403fe49f1b63c68ca94e5c340ec5cceeb9821/meson_python-0.18.0-py3-none-any.whl#sha256=3b0fe051551cc238f5febb873247c0949cd60ded556efa130aa57021804868e2

build_tools/circle/doc_environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ dependencies:
3737
- sphinx-design
3838
- pydata-sphinx-theme
3939
- towncrier
40+
- jupyterlite-sphinx
41+
- jupyterlite-pyodide-kernel
4042
- pip
4143
- pip:
42-
- jupyterlite-sphinx
43-
- jupyterlite-pyodide-kernel
4444
- sphinxcontrib-sass

0 commit comments

Comments
 (0)