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 468c3f4

Browse filesBrowse files
adrinjalaliglemaitrejeremiedbb
authored
MNT replace master with main (#19237)
* replace master with main * fix imbalanced-learn Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com> * asv default branch is `master` Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com> Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com> Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com>
1 parent 306826f commit 468c3f4
Copy full SHA for 468c3f4
Expand file treeCollapse file tree

29 files changed

+150
-151
lines changed
Open diff view settings
Collapse file

‎.circleci/config.yml‎

Copy file name to clipboardExpand all lines: .circleci/config.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
- run: ls -ltrh doc/_build/html/stable
133133
- deploy:
134134
command: |
135-
if [[ "${CIRCLE_BRANCH}" =~ ^master$|^[0-9]+\.[0-9]+\.X$ ]]; then
135+
if [[ "${CIRCLE_BRANCH}" =~ ^main$|^[0-9]+\.[0-9]+\.X$ ]]; then
136136
bash build_tools/circle/push_doc.sh doc/_build/html/stable
137137
fi
138138
@@ -162,6 +162,6 @@ workflows:
162162
filters:
163163
branches:
164164
only:
165-
- master
165+
- main
166166
jobs:
167167
- pypy3
Collapse file

‎.codecov.yml‎

Copy file name to clipboardExpand all lines: .codecov.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ 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%
Collapse file

‎.github/workflows/twitter.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/twitter.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Tweet the URL of a commit on @sklearn_commits whenever a push event
2-
# happens on the master branch
2+
# happens on the main branch
33
name: Twitter Push Notification
44

55

66
on:
77
push:
88
branches:
9-
- master
9+
- main
1010

1111

1212
jobs:
Collapse file

‎.github/workflows/wheels.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/wheels.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ on:
77
- cron: "42 3 */1 * *"
88
push:
99
branches:
10-
- master
10+
- main
1111
# Release branches
1212
- "[0-9]+.[0-9]+.X"
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616
- "[0-9]+.[0-9]+.X"
1717
# Manual run
1818
workflow_dispatch:
Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: type = cron OR commit_message =~ /\[icc-build\]/
3838

3939
# Manual trigger of linux/arm64 tests in PR without triggering the full
40-
# wheel building process for all the Python versions.
40+
# wheel building process for all the Python versions.
4141
- python: 3.9
4242
os: linux
4343
arch: arm64
@@ -48,7 +48,7 @@ jobs:
4848
# Linux environments to build the scikit-learn wheels for the ARM64
4949
# architecture and Python 3.6 and newer. This is used both at release time
5050
# with the manual trigger in the commit message in the release branch and as
51-
# a scheduled task to build the weekly dev build on the master branch. The
51+
# a scheduled task to build the weekly dev build on the main branch. The
5252
# weekly frequency is meant to avoid depleting the Travis CI credits too
5353
# fast.
5454
- python: 3.6
Collapse file

‎CONTRIBUTING.md‎

Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ documentation is no less important than improving the library itself. If you
1313
find a typo in the documentation, or have made improvements, do not hesitate to
1414
send an email to the mailing list or preferably submit a GitHub pull request.
1515
Documentation can be found under the
16-
[doc/](https://github.com/scikit-learn/scikit-learn/tree/master/doc) directory.
16+
[doc/](https://github.com/scikit-learn/scikit-learn/tree/main/doc) directory.
1717

1818
But there are many other ways to help. In particular answering queries on the
1919
[issue tracker](https://github.com/scikit-learn/scikit-learn/issues),
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ code-analysis:
6565
pylint -E -i y sklearn/ -d E1103,E0611,E1101
6666

6767
flake8-diff:
68-
git diff upstream/master -u -- "*.py" | flake8 --diff
68+
git diff upstream/main -u -- "*.py" | flake8 --diff
Collapse file

‎PULL_REQUEST_TEMPLATE.md‎

Copy file name to clipboardExpand all lines: PULL_REQUEST_TEMPLATE.md
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Thanks for contributing a pull request! Please ensure you have taken a look at
3-
the contribution guidelines: https://github.com/scikit-learn/scikit-learn/blob/master/CONTRIBUTING.md
3+
the contribution guidelines: https://github.com/scikit-learn/scikit-learn/blob/main/CONTRIBUTING.md
44
-->
55

66
#### Reference Issues/PRs
Collapse file

‎README.rst‎

Copy file name to clipboardExpand all lines: README.rst
+6-6Lines changed: 6 additions & 6 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
33
|Azure|_ |Travis|_ |Codecov|_ |CircleCI|_ |Nightly wheels|_ |PythonVersion|_ |PyPi|_ |DOI|_
44

5-
.. |Azure| image:: https://dev.azure.com/scikit-learn/scikit-learn/_apis/build/status/scikit-learn.scikit-learn?branchName=master
6-
.. _Azure: https://dev.azure.com/scikit-learn/scikit-learn/_build/latest?definitionId=1&branchName=master
5+
.. |Azure| image:: https://dev.azure.com/scikit-learn/scikit-learn/_apis/build/status/scikit-learn.scikit-learn?branchName=main
6+
.. _Azure: https://dev.azure.com/scikit-learn/scikit-learn/_build/latest?definitionId=1&branchName=main
77

8-
.. |Travis| image:: https://api.travis-ci.com/scikit-learn/scikit-learn.svg?branch=master
8+
.. |Travis| image:: https://api.travis-ci.com/scikit-learn/scikit-learn.svg?branch=main
99
.. _Travis: https://travis-ci.com/scikit-learn/scikit-learn
1010

11-
.. |Codecov| image:: https://codecov.io/github/scikit-learn/scikit-learn/badge.svg?branch=master&service=github
12-
.. _Codecov: https://codecov.io/github/scikit-learn/scikit-learn?branch=master
11+
.. |Codecov| image:: https://codecov.io/github/scikit-learn/scikit-learn/badge.svg?branch=main&service=github
12+
.. _Codecov: https://codecov.io/github/scikit-learn/scikit-learn?branch=main
1313

14-
.. |CircleCI| image:: https://circleci.com/gh/scikit-learn/scikit-learn/tree/master.svg?style=shield&circle-token=:circle-token
14+
.. |CircleCI| image:: https://circleci.com/gh/scikit-learn/scikit-learn/tree/main.svg?style=shield&circle-token=:circle-token
1515
.. _CircleCI: https://circleci.com/gh/scikit-learn/scikit-learn
1616

1717
.. |Nightly wheels| image:: https://github.com/scikit-learn/scikit-learn/workflows/Wheel%20builder/badge.svg?event=schedule
Collapse file

‎asv_benchmarks/asv.conf.json‎

Copy file name to clipboardExpand all lines: asv_benchmarks/asv.conf.json
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// The URL or local path of the source code repository for the
1313
// project being benchmarked
1414
"repo": "..",
15-
15+
1616
// The Python project's subdirectory in your repo. If missing or
1717
// the empty string, the project is assumed to be located at the root
1818
// of the repository.
@@ -28,9 +28,9 @@
2828
// "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"
2929
// ],
3030

31-
// List of branches to benchmark. If not provided, defaults to "master"
31+
// List of branches to benchmark. If not provided, defaults to "master
3232
// (for git) or "default" (for mercurial).
33-
// "branches": ["master"], // for git
33+
// "branches": ["main"], // for git
3434
// "branches": ["default"], // for mercurial
3535

3636
// The DVCS being used. If not set, it will be automatically

0 commit comments

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