Skip to content

Commit 5f2633b

Browse files
jjerphanjjerphan
committed
Merge branch 'main' into partition_node_indices
2 parents 1dee436 + 6a9c286 commit 5f2633b

File tree

781 files changed

+54003
-21933
lines changed

Some content is hidden

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

781 files changed

+54003
-21933
lines changed

‎.circleci/config.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,15 @@ jobs:
77
environment:
88
- OMP_NUM_THREADS: 2
99
- MKL_NUM_THREADS: 2
10-
- MINICONDA_PATH: ~/miniconda
1110
- CONDA_ENV_NAME: testenv
1211
- PYTHON_VERSION: 3.6
13-
- NUMPY_VERSION: 1.13.3
14-
- SCIPY_VERSION: 0.19.1
15-
- MATPLOTLIB_VERSION: 2.1.1
16-
# on conda, this is the latest for python 3.5
17-
# The following places need to be in sync with regard to Cython version:
18-
# - .circleci config file
19-
# - sklearn/_build_utils/__init__.py
20-
# - advanced installation guide
21-
- CYTHON_VERSION: 0.28.5
22-
- SCIKIT_IMAGE_VERSION: 0.13
12+
- NUMPY_VERSION: 'min'
13+
- SCIPY_VERSION: 'min'
14+
- MATPLOTLIB_VERSION: 'min'
15+
- CYTHON_VERSION: 'min'
16+
- SCIKIT_IMAGE_VERSION: 'min'
17+
- SPHINX_VERSION: 'min'
18+
- PANDAS_VERSION: 'min'
2319
steps:
2420
- checkout
2521
- run: ./build_tools/circle/checkout_merge_commit.sh
@@ -52,9 +48,15 @@ jobs:
5248
environment:
5349
- OMP_NUM_THREADS: 2
5450
- MKL_NUM_THREADS: 2
55-
- MINICONDA_PATH: ~/miniconda
5651
- CONDA_ENV_NAME: testenv
5752
- PYTHON_VERSION: 3
53+
- NUMPY_VERSION: 'latest'
54+
- SCIPY_VERSION: 'latest'
55+
- MATPLOTLIB_VERSION: 'latest'
56+
- CYTHON_VERSION: 'latest'
57+
- SCIKIT_IMAGE_VERSION: 'latest'
58+
- SPHINX_VERSION: 'min'
59+
- PANDAS_VERSION: 'latest'
5860
steps:
5961
- checkout
6062
- run: ./build_tools/circle/checkout_merge_commit.sh
@@ -101,13 +103,15 @@ jobs:
101103

102104
pypy3:
103105
docker:
104-
- image: pypy:3.6-7.2.0
106+
- image: condaforge/miniforge3
105107
steps:
106108
- restore_cache:
107109
keys:
108110
- pypy3-ccache-{{ .Branch }}
109111
- pypy3-ccache
112+
- run: apt-get -yq update && apt-get -yq install git ssh
110113
- checkout
114+
- run: conda init bash && source ~/.bashrc
111115
- run: ./build_tools/circle/build_test_pypy.sh
112116
- save_cache:
113117
key: pypy3-ccache-{{ .Branch }}-{{ .BuildNum }}
@@ -128,7 +132,7 @@ jobs:
128132
- run: ls -ltrh doc/_build/html/stable
129133
- deploy:
130134
command: |
131-
if [[ "${CIRCLE_BRANCH}" =~ ^master$|^[0-9]+\.[0-9]+\.X$ ]]; then
135+
if [[ "${CIRCLE_BRANCH}" =~ ^main$|^[0-9]+\.[0-9]+\.X$ ]]; then
132136
bash build_tools/circle/push_doc.sh doc/_build/html/stable
133137
fi
134138
@@ -158,6 +162,6 @@ workflows:
158162
filters:
159163
branches:
160164
only:
161-
- master
165+
- main
162166
jobs:
163167
- pypy3

‎.codecov.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,27 @@ coverage:
44
status:
55
project:
66
default:
7-
# Commits pushed to master should not make the overall
7+
# Commits pushed to main should not make the overall
88
# project coverage decrease by more than 1%:
99
target: auto
1010
threshold: 1%
1111
patch:
1212
default:
1313
# Be tolerant on slight code coverage diff on PRs to limit
1414
# noisy red coverage status on github PRs.
15-
# Note The coverage stats are still uploaded
15+
# Note: The coverage stats are still uploaded
1616
# to codecov so that PR reviewers can see uncovered lines
17-
# in the github diff if they install the codecov browser
18-
# extension:
19-
# https://github.com/codecov/browser-extension
2017
target: auto
2118
threshold: 1%
2219

20+
codecov:
21+
notify:
22+
# Prevent coverage status to upload multiple times for parallel and long
23+
# running CI pipelines. This configuration is particularly useful on PRs
24+
# to avoid confusion. Note that this value is set to the number of Azure
25+
# Pipeline jobs uploading coverage reports.
26+
after_n_builds: 6
27+
2328
ignore:
2429
- "sklearn/externals"
2530
- "sklearn/_build_utils"

‎.github/FUNDING.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: ['https://numfocus.org/donate-to-scikit-learn']

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,14 @@
11
blank_issues_enabled: false
2+
contact_links:
3+
- name: Discussions
4+
url: https://github.com/scikit-learn/scikit-learn/discussions
5+
about: Ask questions and discuss with other scikit-learn community members
6+
- name: Stack overflow
7+
url: https://stackoverflow.com/questions/tagged/scikit-learn
8+
about: Please ask and answer usage questions on stackoverflow
9+
- name: Mailing list
10+
url: https://mail.python.org/mailman/listinfo/scikit-learn
11+
about: General discussions and announcements on the mailing list
12+
- name: Gitter
13+
url: https://gitter.im/scikit-learn/scikit-learn
14+
about: Users and developers can sometimes be found on the gitter channel

.github/ISSUE_TEMPLATE/blank_template.md renamed to .github/ISSUE_TEMPLATE/other_template.md

File renamed without changes.

‎.github/ISSUE_TEMPLATE/usage_question.md‎

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

‎.github/labeler-module.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
module:cluster:
2+
- sklearn/cluster/**/*
3+
4+
module:common:
5+
- sklearn/common/**/*
6+
7+
module:compose:
8+
- sklearn/compose/**/*
9+
10+
module:covariance:
11+
- sklearn/covariance/**/*
12+
13+
module:cross_decomposition:
14+
- sklearn/cross_decomposition/**/*
15+
16+
module:datasets:
17+
- sklearn/datasets/**/*
18+
19+
module:decomposition:
20+
- sklearn/decomposition/**/*
21+
22+
module:ensemble:
23+
- sklearn/ensemble/**/*
24+
25+
module:feature_extraction:
26+
- sklearn/feature_extraction/**/*
27+
28+
module:feature_selection:
29+
- sklearn/feature_selection/**/*
30+
31+
module:gaussian_process:
32+
- sklearn/gaussian_process/**/*
33+
34+
module:impute:
35+
- sklearn/impute/**/*
36+
37+
module:inspection:
38+
- sklearn/inspection/**/*
39+
40+
module:linear_model:
41+
- sklearn/linear_model/**/*
42+
43+
module:manifold:
44+
- sklearn/manifold/**/*
45+
46+
module:metrics:
47+
- sklearn/metrics/**/*
48+
49+
module:mixture:
50+
- sklearn/mixture/**/*
51+
52+
module:model_selection:
53+
- sklearn/model_selection/**/*
54+
55+
module:naive_bayes:
56+
- sklearn/naive_bayes.py
57+
58+
module:neighbors:
59+
- sklearn/neighbors/**/*
60+
61+
module:neural_network:
62+
- sklearn/neural_network/**/*
63+
64+
module:pipeline:
65+
- sklearn/pipeline.py
66+
67+
module:preprocessing:
68+
- sklearn/preprocessing/**/*
69+
70+
module:semi_supervised:
71+
- sklearn/semi_supervised/**/*
72+
73+
module:svm:
74+
- sklearn/svm/**/*
75+
76+
module:tree:
77+
- sklearn/tree/**/*
78+
79+
module:utils:
80+
- sklearn/utils/**/*

‎.github/labeler.yml‎

Lines changed: 5 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,5 @@
1-
module:cluster:
2-
- sklearn/cluster/**/*
3-
4-
module:common:
5-
- sklearn/common/**/*
6-
7-
module:compose:
8-
- sklearn/compose/**/*
9-
10-
module:covariance:
11-
- sklearn/covariance/**/*
12-
13-
module:cross_decomposition:
14-
- sklearn/cross_decomposition/**/*
15-
16-
module:datasets:
17-
- sklearn/datasets/**/*
18-
19-
module:decomposition:
20-
- sklearn/decomposition/**/*
21-
22-
module:ensemble:
23-
- sklearn/ensemble/**/*
24-
25-
module:feature_extraction:
26-
- sklearn/feature_extraction/**/*
27-
28-
module:feature_selection:
29-
- sklearn/feature_selection/**/*
30-
31-
module:gaussian_process:
32-
- sklearn/gaussian_process/**/*
33-
34-
module:impute:
35-
- sklearn/impute/**/*
36-
37-
module:inspection:
38-
- sklearn/inspection/**/*
39-
40-
module:linear_model:
41-
- sklearn/linear_model/**/*
42-
43-
module:manifold:
44-
- sklearn/manifold/**/*
45-
46-
module:metrics:
47-
- sklearn/metrics/**/*
48-
49-
module:mixture:
50-
- sklearn/mixture/**/*
51-
52-
module:model_selection:
53-
- sklearn/model_selection/**/*
54-
55-
module:naive_bayes:
56-
- sklearn/naive_bayes.py
57-
58-
module:neighbors:
59-
- sklearn/neighbors/**/*
60-
61-
module:neural_network:
62-
- sklearn/neural_network/**/*
63-
64-
module:pipeline:
65-
- sklearn/pipeline.py
66-
67-
module:preprocessing:
68-
- sklearn/preprocessing/**/*
69-
70-
module:semi_supervised:
71-
- sklearn/semi_supervised/**/*
72-
73-
module:svm:
74-
- sklearn/svm/**/*
75-
76-
module:tree:
77-
- sklearn/tree/**/*
78-
79-
module:utils:
80-
- sklearn/utils/**/*
1+
labels:
2+
'Documentation':
3+
- '\bDOC\b'
4+
'Build / CI':
5+
- '\bCI\b'

‎.github/workflows/assign.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ on:
77
jobs:
88
one:
99
runs-on: ubuntu-latest
10+
if: >-
11+
(github.event.comment.body == 'take' ||
12+
github.event.comment.body == 'Take')
13+
&& !github.event.issue.assignee
1014
steps:
11-
- if: github.event.comment.body == 'take'
12-
name:
13-
run: |
14-
echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"
15-
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"assignees": ["${{ github.event.comment.user.login }}"]}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/assignees
16-
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X "DELETE" https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/help%20wanted
15+
- run: |
16+
echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"
17+
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"assignees": ["${{ github.event.comment.user.login }}"]}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/assignees
18+
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X "DELETE" https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/help%20wanted

‎.github/workflows/check-manifest.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: "Check Manifest"
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
7+
jobs:
8+
check:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: actions/setup-python@v2
13+
with:
14+
python-version: '3.9'
15+
- name: Install dependencies
16+
# scipy and cython are required to build sdist
17+
run: |
18+
python -m pip install --upgrade pip
19+
pip install check-manifest scipy cython
20+
- run: |
21+
check-manifest -v

0 commit comments

Comments
 (0)