8000 Merge remote-tracking branch 'upstream/main' into remove_typedef_usage · thomasjpfan/scikit-learn@e1b3768 · GitHub
[go: up one dir, main page]
Skip to content

Commit e1b3768

Browse files
thomasjpfanthomasjpfan
committed
Merge remote-tracking branch 'upstream/main' into remove_typedef_usage
2 parents c357102 + ae943bd commit e1b3768

File tree

266 files changed

+5275
-6284
lines changed

Some content is hidden

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

266 files changed

+5275
-6284
lines changed

‎.github/workflows/build-docs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
OMP_NUM_THREADS: 2
3838
MKL_NUM_THREADS: 2
3939
CONDA_ENV_NAME: testenv
40+
# Sphinx race condition in doc-min-dependencies is causing job to stall
41+
# Here we run the job serially
42+
SPHINX_NUMJOBS: 1
4043
LOCK_FILE: build_tools/github/doc_min_dependencies_linux-64_conda.lock
4144

4245
- name: Upload documentation

‎.github/workflows/wheels.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
# Manual run
1818
workflow_dispatch:
1919

20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
22+
cancel-in-progress: true
23+
2024
jobs:
2125
# Check whether to build the wheels and the source tarball
2226
check_build_trigger:

‎COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2007-2021 The scikit-learn developers.
3+
Copyright (c) 2007-2022 The scikit-learn developers.
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

‎README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
.. |PandasMinVersion| replace:: 1.0.5
4343
.. |SeabornMinVersion| replace:: 0.9.0
4444
.. |PytestMinVersion| replace:: 5.0.1
45+
.. |PlotlyMinVersion| replace:: 5.9.0
4546

4647
.. image:: https://raw.githubusercontent.com/scikit-learn/scikit-learn/main/doc/logos/scikit-learn-logo.png
4748
:target: https://scikit-learn.org/
@@ -83,7 +84,7 @@ classes end with "Display") require Matplotlib (>= |MatplotlibMinVersion|).
8384
For running the examples Matpl 57AE otlib >= |MatplotlibMinVersion| is required.
8485
A few examples require scikit-image >= |Scikit-ImageMinVersion|, a few examples
8586
require pandas >= |PandasMinVersion|, some examples require seaborn >=
86-
|SeabornMinVersion|.
87+
|SeabornMinVersion| and plotly >= |PlotlyMinVersion|.
8788

8889
User installation
8990
~~~~~~~~~~~~~~~~~

‎asv_benchmarks/asv.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"scipy": [],
7777
"cython": [],
7878
"joblib": [],
79-
"threadpoolctl": []
79+
"threadpoolctl": [],
80+
"pandas": []
8081
},
8182

8283
// Combinations of libraries/python versions can be excluded/included

‎asv_benchmarks/benchmarks/cluster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def make_estimator(self, params):
3737
init=init,
3838
n_init=1,
3939
max_iter=max_iter,
40-
tol=-1,
40+
tol=0,
4141
random_state=0,
4242
)
4343

‎asv_benchmarks/benchmarks/decomposition.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def make_estimator(self, params):
5151
n_components=15,
5252
fit_algorithm=fit_algorithm,
5353
alpha=0.1,
54+
transform_alpha=1,
5455
max_iter=20,
5556
tol=1e-16,
5657
random_state=0,

‎azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ jobs:
278278
LOCK_FILE: ./build_tools/azure/py38_conda_forge_mkl_win-64_conda.lock
279279
CHECK_WARNINGS: 'true'
280280
COVERAGE: 'true'
281+
SKLEARN_ENABLE_DEBUG_CYTHON_DIRECTIVES: '1'
281282
SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '7' # non-default seed
282283
py38_pip_openblas_32bit:
283284
DISTRIB: 'pip-windows'

‎benchmarks/bench_plot_nmf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@ def __init__(
219219
tol=tol,
220220
max_iter=max_iter,
221221
random_state=random_state,
222-
alpha=alpha,
222+
alpha_W=alpha,
223+
alpha_H=alpha,
223224
l1_ratio=l1_ratio,
224225
)
225226
self.nls_max_iter = nls_max_iter

‎build_tools/azure/debian_atlas_32bit_lock.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
#
77
atomicwrites==1.4.1
88
# via pytest
9-
attrs==21.4.0
9+
attrs==22.1.0
1010
# via pytest
11-
cython==0.29.30
11+
cython==0.29.32
1212
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
1313
importlib-metadata==4.12.0
1414
# via pytest
1515
joblib==1.0.0
1616
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
17-
more-itertools==8.13.0
17+
more-itertools==8.14.0
1818
# via pytest
1919
packaging==21.3
2020
# via pytest

0 commit comments

Comments
 (0)
0