Skip to content

Commit aeb79ca

Browse files
jjerphanjjerphan
committed
Merge branch 'main' into pairwise-distances-radius-neighborhood
2 parents 37b61e3 + 998e8f2 commit aeb79ca

File tree

306 files changed

+4661
-3987
lines changed

Some content is hidden

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

306 files changed

+4661
-3987
lines changed

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@
1919

2020
# PR 20502: Runs Black on examples
2121
70a185ae59b4362633d18b0d0083abb1b6f7370c
22+
23+
# PR 22474: Update to Black 22.1.0
24+
1fc86b6aacd89da44a3b4e8abf7c3e2ba4336ffe

‎.github/workflows/assign.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77
jobs:
88
one:
99
runs-on: ubuntu-latest
10+
# Note that string comparisons is not case sensitive.
1011
if: >-
11-
(github.event.comment.body == 'take' ||
12-
github.event.comment.body == 'Take')
13-
&& !github.event.issue.assignee
12+
startsWith(github.event.comment.body, '/take')
13+
&& !github.event.issue.assignee
1414
steps:
1515
- run: |
1616
echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"

‎.github/workflows/check-changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
echo "If you see this error and there is already a changelog entry,"
6262
echo "check that the PR number is correct."
6363
echo ""
64-
echo "If you believe that this PR does no warrant a changelog"
65-
echo "entry, say so in a comment so that a maintainer will label "
64+
echo "If you believe that this PR does not warrant a changelog"
65+
echo "entry, say so in a comment so that a maintainer will label"
6666
echo "the PR with 'No Changelog Needed' to bypass this check."
6767
exit 1
6868
fi

‎.github/workflows/check-manifest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66

77
jobs:
88
check:
9+
# Don't run on forks
10+
if: github.repository == 'scikit-learn/scikit-learn'
11+
912
runs-on: ubuntu-latest
1013
steps:
1114
- uses: actions/checkout@v2

‎.github/workflows/wheels.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ jobs:
4949
matrix:
5050
include:
5151
# Window 64 bit
52-
- os: windows-latest
52+
# Note: windows-2019 is needed for older Python versions:
53+
# https://github.com/scikit-learn/scikit-learn/issues/22530
54+
- os: windows-2019
5355
python: 37
5456
bitness: 64
5557
platform_id: win_amd64
56-
- os: windows-latest
58+
- os: windows-2019
5759
python: 38
5860
bitness: 64
5961
platform_id: win_amd64

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ _configtest.o.d
7575
# Used by mypy
7676
.mypy_cache/
7777

78+
# virtualenv from advanced installation guide
79+
sklearn-env/
80+
7881
# files generated from a template
7982
sklearn/_loss/_loss.pyx
8083
sklearn/utils/_seq_dataset.pyx

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: end-of-file-fixer
77
- id: trailing-whitespace
88
- repo: https://github.com/psf/black
9-
rev: 21.6b0
9+
rev: 22.1.0
1010
hooks:
1111
- id: black
1212
- repo: https://gitlab.com/pycqa/flake8

‎README.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
.. |PythonMinVersion| replace:: 3.7
3636
.. |NumPyMinVersion| replace:: 1.14.6
3737
.. |SciPyMinVersion| replace:: 1.1.0
38-
.. |JoblibMinVersion| replace:: 0.11
38+
.. |JoblibMinVersion| replace:: 1.0.0
3939
.. |ThreadpoolctlMinVersion| replace:: 2.0.0
4040
.. |MatplotlibMinVersion| replace:: 2.2.3
4141
.. |Scikit-ImageMinVersion| replace:: 0.14.5
@@ -89,7 +89,7 @@ User installation
8989
~~~~~~~~~~~~~~~~~
9090

9191
If you already have a working installation of numpy and scipy,
92-
the easiest way to install scikit-learn is using ``pip`` ::
92+
the easiest way to install scikit-learn is using ``pip``::
9393

9494
pip install -U scikit-learn
9595

@@ -184,6 +184,8 @@ Communication
184184

185185
- Mailing list: https://mail.python.org/mailman/listinfo/scikit-learn
186186
- Gitter: https://gitter.im/scikit-learn/scikit-learn
187+
- Blog: https://blog.scikit-learn.org
188+
- Calendar: https://blog.scikit-learn.org/calendar/
187189
- Twitter: https://twitter.com/scikit_learn
188190
- Twitter (commits): https://twitter.com/sklearn_commits
189191
- Stack Overflow: https://stackoverflow.com/questions/tagged/scikit-learn
@@ -193,6 +195,7 @@ Communication
193195
- YouTube: https://www.youtube.com/channel/UCJosFjYm0ZYVUARxuOZqnnw/playlists
194196
- Facebook: https://www.facebook.com/scikitlearnofficial/
195197
- Instagram: https://www.instagram.com/scikitlearnofficial/
198+
- TikTok: https://www.tiktok.com/@scikit.learn
196199

197200
Citation
198201
~~~~~~~~

‎azure-pipelines.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
versionSpec: '3.9'
4646
- bash: |
4747
# Include pytest compatibility with mypy
48-
pip install pytest flake8 mypy==0.782 black==21.6b0
48+
pip install pytest flake8 mypy==0.782 black==22.1.0
4949
displayName: Install linters
5050
- bash: |
5151
black --check --diff .
@@ -190,7 +190,7 @@ jobs:
190190
PANDAS_VERSION: 'none'
191191
THREADPOOLCTL_VERSION: 'min'
192192
COVERAGE: 'false'
193-
# Linux + Python 3.7 build with OpenBLAS and without SITE_JOBLIB
193+
# Linux + Python 3.7 build with OpenBLAS
194194
py37_conda_defaults_openblas:
195195
DISTRIB: 'conda'
196196
CONDA_CHANNEL: 'defaults' # Anaconda main channel
@@ -206,6 +206,7 @@ jobs:
206206
pylatest_pip_openblas_pandas:
207207
DISTRIB: 'conda-pip-latest'
208208
PYTHON_VERSION: '3.9'
209+
PYTEST_VERSION: '6.2.5'
209210
CHECK_PYTEST_SOFT_DEPENDENCY: 'true'
210211
TEST_DOCSTRINGS: 'true'
211212
CHECK_WARNINGS: 'true'
@@ -273,7 +274,8 @@ jobs:
273274
PYTHON_VERSION: '3.7'
274275
CHECK_WARNINGS: 'true'
275276
PYTHON_ARCH: '64'
276-
PYTEST_VERSION: '*'
277+
# Unpin when pytest stalling issue is fixed
278+
PYTEST_VERSION: '6.2.5'
277279
COVERAGE: 'true'
278280
# Temporary fix for setuptools to use disutils from standard lib
279281
# https://github.com/numpy/numpy/issues/17216

‎benchmarks/bench_hist_gradient_boosting_threading.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def one_run(n_threads, n_samples):
239239

240240

241241
max_threads = os.cpu_count()
242-
n_threads_list = [2 ** i for i in range(8) if (2 ** i) < max_threads]
242+
n_threads_list = [2**i for i in range(8) if (2**i) < max_threads]
243243
n_threads_list.append(max_threads)
244244

245245
sklearn_scores = []

0 commit comments

Comments
 (0)