Skip to content

Commit 14aa5a8

Browse files
rprkhrprkh
authored
Merge branch 'main' into enh_check_classification_targets
2 parents 3988f80 + 2131264 commit 14aa5a8

File tree

408 files changed

+15889
-5249
lines changed

Some content is hidden

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

408 files changed

+15889
-5249
lines changed

‎.github/workflows/labeler-module.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
triage:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: thomasjpfan/labeler@v2.5.0
17+
- uses: thomasjpfan/labeler@v2.5.1
1818
continue-on-error: true
1919
if: github.repository == 'scikit-learn/scikit-learn'
2020
with:
@@ -25,7 +25,7 @@ jobs:
2525
triage_file_extensions:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: thomasjpfan/labeler@v2.5.0
28+
- uses: thomasjpfan/labeler@v2.5.1
2929
continue-on-error: true
3030
if: github.repository == 'scikit-learn/scikit-learn'
3131
with:

‎.github/workflows/twitter.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
.. |Scikit-ImageMinVersion| replace:: 0.16.2
4242
.. |PandasMinVersion| replace:: 1.0.5
4343
.. |SeabornMinVersion| replace:: 0.9.0
44-
.. |PytestMinVersion| replace:: 5.3.1
45-
.. |PlotlyMinVersion| replace:: 5.10.0
44+
.. |PytestMinVersion| replace:: 7.1.2
45+
.. |PlotlyMinVersion| replace:: 5.14.0
4646

4747
.. image:: https://raw.githubusercontent.com/scikit-learn/scikit-learn/main/doc/logos/scikit-learn-logo.png
4848
:target: https://scikit-learn.org/
@@ -189,7 +189,6 @@ Communication
189189
- Blog: https://blog.scikit-learn.org
190190
- Calendar: https://blog.scikit-learn.org/calendar/
191191
- Twitter: https://twitter.com/scikit_learn
192-
- Twitter (commits): https://twitter.com/sklearn_commits
193192
- Stack Overflow: https://stackoverflow.com/questions/tagged/scikit-learn
194193
- Github Discussions: https://github.com/scikit-learn/scikit-learn/discussions
195194
- Website: https://scikit-learn.org

‎azure-pipelines.yml

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
#
7272
# The nogil build relies on a dedicated PyPI-style index to install patched
7373
# versions of NumPy, SciPy and Cython maintained by @colesbury and that
74-
# include specifc fixes to make them run correctly without relying on the GIL.
74+
# include specific fixes to make them run correctly without relying on the GIL.
7575
#
7676
# The goal of this CI entry is to make sure that we do not introduce any
7777
# dependency on the GIL in scikit-learn itself. An auxiliary goal is to early
@@ -121,6 +121,40 @@ jobs:
121121
DISTRIB: 'conda-pypy3'
122122
LOCK_FILE: './build_tools/azure/pypy3_linux-64_conda.lock'
123123

124+
125+
- job: Linux_Nightly_Pyodide
126+
pool:
127+
vmImage: ubuntu-22.04
128+
variables:
129+
# Need to match Python version and Emscripten version for the correct
130+
# Pyodide version. For Pyodide version 0.23.2, see
131+
# https://github.com/pyodide/pyodide/blob/0.23.2/Makefile.envs
132+
PYODIDE_VERSION: '0.23.2'
133+
EMSCRIPTEN_VERSION: '3.1.32'
134+
PYTHON_VERSION: '3.11.2'
135+
136+
dependsOn: [git_commit, linting]
137+
condition: |
138+
and(
139+
succeeded(),
140+
not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]')),
141+
or(eq(variables['Build.Reason'], 'Schedule'),
142+
contains(dependencies['git_commit']['outputs']['commit.message'], '[pyodide]'
143+
)
144+
)
145+
)
146+
steps:
147+
- task: UsePythonVersion@0
148+
inputs:
149+
versionSpec: $(PYTHON_VERSION)
150+
addToPath: true
151+
152+
- bash: bash build_tools/azure/install_pyodide.sh
153+
displayName: Build Pyodide wheel and install it in a Pyodide venv
154+
155+
- bash: bash build_tools/azure/test_script_pyodide.sh
156+
displayName: Test Pyodide wheel
157+
124158
# Will run all the time regardless of linting outcome.
125159
- template: build_tools/azure/posix.yml
126160
parameters:

‎benchmarks/bench_mnist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ def load_data(dtype=np.float32, order="F"):
8686
"ExtraTrees": ExtraTreesClassifier(),
8787
"RandomForest": RandomForestClassifier(),
8888
"Nystroem-SVM": make_pipeline(
89-
Nystroem(gamma=0.015, n_components=1000), LinearSVC(C=100)
89+
Nystroem(gamma=0.015, n_components=1000), LinearSVC(C=100, dual="auto")
9090
),
9191
"SampledRBF-SVM": make_pipeline(
92-
RBFSampler(gamma=0.015, n_components=1000), LinearSVC(C=100)
92+
RBFSampler(gamma=0.015, n_components=1000), LinearSVC(C=100, dual="auto")
9393
),
9494
"LogisticRegression-SAG": LogisticRegression(solver="sag", tol=1e-1, C=1e4),
9595
"LogisticRegression-SAGA": LogisticRegression(solver="saga", tol=1e-1, C=1e4),

‎build_tools/azure/debian_atlas_32bit_lock.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
#
55
# pip-compile --output-file=build_tools/azure/debian_atlas_32bit_lock.txt build_tools/azure/debian_atlas_32bit_requirements.txt
66
#
7-
attrs==22.2.0
7+
attrs==23.1.0
88
# via pytest
9-
coverage==7.2.2
9+
coverage==7.2.7
1010
# via pytest-cov
11-
cython==0.29.33
11+
cython==0.29.35
1212
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
13+
iniconfig==2.0.0
14+
# via pytest
1315
joblib==1.1.1
1416
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
15-
more-itertools==9.1.0
16-
# via pytest
17-
packaging==23.0
17+
packaging==23.1
1818
# via pytest
19-
pluggy==0.13.1
19+
pluggy==1.0.0
2020
# via pytest
2121
py==1.11.0
2222
# via pytest
23-
pytest==5.3.1
23+
pytest==7.1.2
2424
# via
2525
# -r build_tools/azure/debian_atlas_32bit_requirements.txt
2626
# pytest-cov
2727
pytest-cov==2.9.0
2828
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
2929
threadpoolctl==2.2.0
3030
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
31-
wcwidth==0.2.6
31+
tomli==2.0.1
3232
# via pytest

‎build_tools/azure/debian_atlas_32bit_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
cython
55
joblib==1.1.1 # min
66
threadpoolctl==2.2.0
7-
pytest==5.3.1 # min
7+
pytest==7.1.2 # min
88
pytest-cov==2.9.0 # min

‎build_tools/azure/install_pyodide.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
git clone https://github.com/emscripten-core/emsdk.git
6+
cd emsdk
7+
./emsdk install $EMSCRIPTEN_VERSION
8+
./emsdk activate $EMSCRIPTEN_VERSION
9+
source emsdk_env.sh
10+
cd -
11+
12+
pip install pyodide-build==$PYODIDE_VERSION pyodide-cli
13+
14+
pyodide build
15+
16+
ls -ltrh dist
17+
18+
pyodide venv pyodide-venv
19+
source pyodide-venv/bin/activate
20+
21+
pip install dist/*.whl
22+
pip list

‎build_tools/azure/posix-docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,6 @@ jobs:
129129
condition: and(succeeded(), eq(variables['COVERAGE'], 'true'),
130130
eq(variables['SELECTED_TESTS'], ''))
131131
displayName: 'Upload To Codecov'
132+
retryCountOnTaskFailure: 5
132133
env:
133134
CODECOV_TOKEN: $(CODECOV_TOKEN)

‎build_tools/azure/posix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,6 @@ jobs:
107107
condition: and(succeeded(), eq(variables['COVERAGE'], 'true'),
108108
eq(variables['SELECTED_TESTS'], ''))
109109
displayName: 'Upload To Codecov'
110+
retryCountOnTaskFailure: 5
110111
env:
111112
CODECOV_TOKEN: $(CODECOV_TOKEN)

0 commit comments

Comments
 (0)