Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6be83f7

Browse filesBrowse files
jeromedockesjeromedockes
committed
Merge remote-tracking branch 'upstream/main' into ridgecv-arrayapi
2 parents b3d1bf7 + 0b9f0a7 commit 6be83f7
Copy full SHA for 6be83f7

File tree

115 files changed

+1556
-1479
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

115 files changed

+1556
-1479
lines changed

‎.github/workflows/wheels.yml

Copy file name to clipboardExpand all lines: .github/workflows/wheels.yml
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,13 @@ jobs:
163163
CIBW_ARCHS: all
164164
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
165165
CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.manylinux_image }}
166+
# Needed on Windows CI to compile with Visual Studio compiler
167+
# otherwise Meson detects a MINGW64 platform and use MINGW64
168+
# toolchain
169+
CIBW_CONFIG_SETTINGS_WINDOWS: "setup-args=--vsenv"
166170
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: bash build_tools/github/repair_windows_wheels.sh {wheel} {dest_dir}
167171
CIBW_BEFORE_TEST_WINDOWS: bash build_tools/github/build_minimal_windows_image.sh ${{ matrix.python }}
168-
CIBW_TEST_REQUIRES: pytest pandas threadpoolctl
172+
CIBW_TEST_REQUIRES: pytest pandas
169173
CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh
170174
CIBW_TEST_COMMAND_WINDOWS: bash {project}/build_tools/github/test_windows_wheels.sh ${{ matrix.python }}
171175
CIBW_BUILD_VERBOSITY: 1

‎.gitignore

Copy file name to clipboardExpand all lines: .gitignore
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ nips2010_pdf/
5454
examples/cluster/joblib
5555
reuters/
5656
benchmarks/bench_covertype_data/
57+
benchmarks/HIGGS.csv.gz
5758

5859
*.prefs
5960
.pydevproject
6061
.idea
6162
.vscode
63+
# used by pyenv
64+
.python-version
6265

6366
*.c
6467
*.cpp

‎Makefile

Copy file name to clipboardExpand all lines: Makefile
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ inplace:
2424
$(PYTHON) setup.py build_ext -i
2525

2626
dev-meson:
27-
# Temporary script to try the experimental meson build. Once meson is
28-
# accepted as the default build tool, this will go away.
29-
python build_tools/build-meson-editable-install.py
27+
pip install --verbose --no-build-isolation --editable . --config-settings editable-verbose=true
3028

3129
clean-meson:
3230
pip uninstall -y scikit-learn

‎asv_benchmarks/asv.conf.json

Copy file name to clipboardExpand all lines: asv_benchmarks/asv.conf.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"matrix": {
7979
"numpy": ["1.25.2"],
8080
"scipy": ["1.11.2"],
81-
"cython": ["3.0.8"],
81+
"cython": ["3.0.9"],
8282
"joblib": ["1.3.2"],
8383
"threadpoolctl": ["3.2.0"],
8484
"pandas": ["2.1.0"]

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ jobs:
168168
DISTRIB: 'conda'
169169
LOCK_FILE: './build_tools/azure/pylatest_conda_forge_mkl_linux-64_conda.lock'
170170
COVERAGE: 'true'
171-
BUILD_WITH_MESON: 'true'
172171
SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '42' # default global random seed
173172
# Tests that require large downloads over the networks are skipped in CI.
174173
# Here we make sure, that they are still run on a regular basis.
@@ -244,6 +243,7 @@ jobs:
244243
SKLEARN_ENABLE_DEBUG_CYTHON_DIRECTIVES: '1'
245244
SKLEARN_RUN_FLOAT32_TESTS: '1'
246245
SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '2' # non-default seed
246+
BUILD_WITH_SETUPTOOLS: 'true'
247247
# Linux environment to test the latest available dependencies.
248248
# It runs tests requiring lightgbm, pandas and PyAMG.
249249
pylatest_pip_openblas_pandas:

‎build_tools/azure/debian_atlas_32bit_lock.txt

Copy file name to clipboardExpand all lines: build_tools/azure/debian_atlas_32bit_lock.txt
+16-4Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,30 @@
66
#
77
attrs==23.2.0
88
# via pytest
9-
coverage==7.4.3
9+
coverage==7.4.4
1010
# via pytest-cov
11-
cython==3.0.8
11+
cython==3.0.9
1212
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
1313
iniconfig==2.0.0
1414
# via pytest
1515
joblib==1.2.0
1616
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
17+
meson==1.4.0
18+
# via meson-python
19+
meson-python==0.15.0
20+
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
21+
ninja==1.11.1.1
22+
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
1723
packaging==24.0
18-
# via pytest
24+
# via
25+
# pyproject-metadata
26+
# pytest
1927
pluggy==1.4.0
2028
# via pytest
2129
py==1.11.0
2230
# via pytest
31+
pyproject-metadata==0.7.1
32+
# via meson-python
2333
pytest==7.1.2
2434
# via
2535
# -r build_tools/azure/debian_atlas_32bit_requirements.txt
@@ -29,4 +39,6 @@ pytest-cov==2.9.0
2939
threadpoolctl==2.2.0
3040
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
3141
tomli==2.0.1
32-
# via pytest
42+
# via
43+
# meson-python
44+
# pytest

‎build_tools/azure/debian_atlas_32bit_requirements.txt

Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# DO NOT EDIT: this file is generated from the specification found in the
22
# following script to centralize the configuration for CI builds:
33
# build_tools/update_environments_and_lock_files.py
4-
cython==3.0.8 # min
4+
cython==3.0.9 # min
55
joblib==1.2.0 # min
66
threadpoolctl==2.2.0
77
pytest==7.1.2 # min
88
pytest-cov==2.9.0 # min
9+
ninja
10+
meson-python

‎build_tools/azure/install.sh

Copy file name to clipboardExpand all lines: build_tools/azure/install.sh
+10-4Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,23 @@ scikit_learn_install() {
126126
export LDFLAGS="$LDFLAGS -Wl,--sysroot=/"
127127
fi
128128

129-
if [[ "$BUILD_WITH_MESON" == "true" ]]; then
130-
make dev-meson
129+
if [[ "$BUILD_WITH_SETUPTOOLS" == "true" ]]; then
130+
python setup.py develop
131131
elif [[ "$PIP_BUILD_ISOLATION" == "true" ]]; then
132132
# Check that pip can automatically build scikit-learn with the build
133133
# dependencies specified in pyproject.toml using an isolated build
134134
# environment:
135-
pip install --verbose --editable .
135+
pip install --verbose .
136136
else
137+
if [[ "$UNAMESTR" == "MINGW64"* ]]; then
138+
# Needed on Windows CI to compile with Visual Studio compiler
139+
# otherwise Meson detects a MINGW64 platform and use MINGW64
140+
# toolchain
141+
ADDITIONAL_PIP_OPTIONS='-Csetup-args=--vsenv'
142+
fi
137143
# Use the pre-installed build dependencies and build directly in the
138144
# current environment.
139-
python setup.py develop
145+
pip install --verbose --no-build-isolation --editable . $ADDITIONAL_PIP_OPTIONS
140146
fi
141147

142148
ccache -s || echo "ccache not installed, skipping ccache statistics"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.