Skip to content

Commit 0115b43

Browse files
QuLogicQuLogic
authored
Merge pull request #21371 from tacaswell/rename_default_branch
Rename default branch
2 parents a1eef38 + 3fcb595 commit 0115b43

24 files changed

+80
-80
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ commands:
3131
git remote add upstream git://github.com/matplotlib/matplotlib.git
3232
fi
3333
git fetch upstream
34-
if [[ "$CIRCLE_BRANCH" != "master" ]] && \
34+
if [[ "$CIRCLE_BRANCH" != "main" ]] && \
3535
[[ "$CIRCLE_PR_NUMBER" != "" ]]; then
3636
echo "Merging ${CIRCLE_PR_NUMBER}"
3737
git pull --ff-only upstream "refs/pull/${CIRCLE_PR_NUMBER}/merge"
@@ -126,7 +126,7 @@ commands:
126126
export SOURCE_DATE_EPOCH="$(git log -1 --format=%at $(git describe --abbrev=0))"
127127
# Set release mode only when deploying to devdocs.
128128
if [ "$CIRCLE_PROJECT_USERNAME" = "matplotlib" ] && \
129-
[ "$CIRCLE_BRANCH" = "master" ] && \
129+
[ "$CIRCLE_BRANCH" = "main" ] && \
130130
[ "$CIRCLE_PR_NUMBER" = "" ]; then
131131
export RELEASE_TAG='-t release'
132132
fi

‎.circleci/deploy-docs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
set -e
44

55
if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" ] || \
6-
[ "$CIRCLE_BRANCH" != "master" ] || \
6+
[ "$CIRCLE_BRANCH" != "main" ] || \
77
[[ "$CIRCLE_PULL_REQUEST" == https://github.com/matplotlib/matplotlib/pull/* ]]; then
88
echo "Not uploading docs for ${CIRCLE_SHA1}"\
9-
"from non-master branch (${CIRCLE_BRANCH})"\
9+
"from non-main branch (${CIRCLE_BRANCH})"\
1010
"or pull request (${CIRCLE_PULL_REQUEST})"\
1111
"or non-Matplotlib org (${CIRCLE_PROJECT_USERNAME})."
1212
exit

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ consider the following points:
2121
- Help with git and github is available at
2222
https://matplotlib.org/devel/gitwash/development_workflow.html.
2323
24-
- Do not create the PR out of master, but out of a separate branch.
24+
- Do not create the PR out of main, but out of a separate branch.
2525
2626
- The PR title should summarize the changes, for example "Raise ValueError on
2727
non-numeric input to set_xlim". Avoid non-descriptive titles such as

‎.github/workflows/cibuildwheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build CI wheels
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- v[0-9]+.[0-9]+.x
88
tags:
99
- v*

‎.github/workflows/pr_welcome.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232
3333
We strive to be a welcoming and open project. Please follow our
3434
[Code of
35-
Conduct](https://github.com/matplotlib/matplotlib/blob/master/CODE_OF_CONDUCT.md).
35+
Conduct](https://github.com/matplotlib/matplotlib/blob/main/CODE_OF_CONDUCT.md).

‎README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
.. |GitHubActions| image:: https://github.com/matplotlib/matplotlib/workflows/Tests/badge.svg
88
.. _GitHubActions: https://github.com/matplotlib/matplotlib/actions?query=workflow%3ATests
99

10-
.. |AzurePipelines| image:: https://dev.azure.com/matplotlib/matplotlib/_apis/build/status/matplotlib.matplotlib?branchName=master
11-
.. _AzurePipelines: https://dev.azure.com/matplotlib/matplotlib/_build/latest?definitionId=1&branchName=master
10+
.. |AzurePipelines| image:: https://dev.azure.com/matplotlib/matplotlib/_apis/build/status/matplotlib.matplotlib?branchName=main
11+
.. _AzurePipelines: https://dev.azure.com/matplotlib/matplotlib/_build/latest?definitionId=1&branchName=main
1212

13-
.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/matplotlib/matplotlib?branch=master&svg=true
13+
.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/matplotlib/matplotlib?branch=main&svg=true
1414
.. _AppVeyor: https://ci.appveyor.com/project/matplotlib/matplotlib
1515

16-
.. |Codecov| image:: https://codecov.io/github/matplotlib/matplotlib/badge.svg?branch=master&service=github
17-
.. _Codecov: https://codecov.io/github/matplotlib/matplotlib?branch=master
16+
.. |Codecov| image:: https://codecov.io/github/matplotlib/matplotlib/badge.svg?branch=main&service=github
17+
.. _Codecov: https://codecov.io/github/matplotlib/matplotlib?branch=main
1818

1919
.. |LGTM| image:: https://img.shields.io/lgtm/grade/python/github/matplotlib/matplotlib.svg?logo=lgtm&logoWidth=18
2020
.. _LGTM: https://lgtm.com/projects/g/matplotlib/matplotlib

‎doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ def linkcode_resolve(domain, info):
634634
return None
635635

636636
version = parse(matplotlib.__version__)
637-
tag = 'master' if version.is_devrelease else f'v{version.public}'
637+
tag = 'main' if version.is_devrelease else f'v{version.public}'
638638
return ("https://github.com/matplotlib/matplotlib/blob"
639639
f"/{tag}/lib/{fn}{linespec}")
640640
else:

‎doc/devel/MEP/MEP19.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ great!]:
6767

6868
**Documentation**
6969

70-
Documentation of master is now built by travis and uploaded to https://matplotlib.org/devdocs/index.html
70+
Documentation of main is now built by travis and uploaded to https://matplotlib.org/devdocs/index.html
7171

7272
@NelleV, I believe, generates the docs automatically and posts them on
7373
the web to chart MEP10 progress.

‎doc/devel/MEP/template.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MEPs go through a number of phases in their lifetime:
2424

2525
- **Progress**: Consensus was reached and implementation work has begun.
2626

27-
- **Completed**: The implementation has been merged into master.
27+
- **Completed**: The implementation has been merged into main.
2828

2929
- **Superseded**: This MEP has been abandoned in favor of another
3030
approach.

‎doc/devel/coding_guide.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ When making a PR, pay attention to:
3434

3535
.. rst-class:: checklist
3636

37-
* :ref:`Target the master branch <pr-branch-selection>`.
37+
* :ref:`Target the main branch <pr-branch-selection>`.
3838
* Adhere to the :ref:`coding_guidelines`.
3939
* Update the :ref:`documentation <pr-documentation>` if necessary.
4040
* Aim at making the PR as "ready-to-go" as you can. This helps to speed up
@@ -78,7 +78,7 @@ Organizational topics:
7878
.. rst-class:: checklist
7979

8080
* Make sure all :ref:`automated tests <pr-automated-tests>` pass.
81-
* The PR should :ref:`target the master branch <pr-branch-selection>`.
81+
* The PR should :ref:`target the main branch <pr-branch-selection>`.
8282
* Tag with descriptive :ref:`labels <pr-labels>`.
8383
* Set the :ref:`milestone <pr-milestones>`.
8484
* Keep an eye on the :ref:`number of commits <pr-squashing>`.
@@ -145,7 +145,7 @@ Milestones
145145
Setting a milestone does not imply or guarantee that a PR will be merged for that
146146
release, but if it were to be merged what release it would be in.
147147

148-
All of these PRs should target the master branch. The milestone tag triggers
148+
All of these PRs should target the main branch. The milestone tag triggers
149149
an :ref:`automatic backport <automated-backports>` for milestones which have
150150
a corresponding branch.
151151

@@ -267,7 +267,7 @@ Current branches
267267
----------------
268268
The current active branches are
269269

270-
*master*
270+
*main*
271271
The current development version. Future minor releases (*v3.N.0*) will be
272272
branched from this. Supports Python 3.7+.
273273

@@ -285,7 +285,7 @@ The current active branches are
285285
Branch selection for pull requests
286286
----------------------------------
287287

288-
Generally, all pull requests should target the master branch.
288+
Generally, all pull requests should target the main branch.
289289

290290
Other branches are fed through :ref:`automatic <automated-backports>` or
291291
:ref:`manual <manual-backports>`. Directly
@@ -344,7 +344,7 @@ When doing backports please copy the form used by meeseekdev,
344344
conflicts make note of them and how you resolved them in the commit
345345
message.
346346

347-
We do a backport from master to v2.2.x assuming:
347+
We do a backport from main to v2.2.x assuming:
348348

349349
* ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo
350350

@@ -376,4 +376,4 @@ and then continue the cherry pick:
376376
git cherry-pick --continue
377377
378378
Use your discretion to push directly to upstream or to open a PR; be
379-
sure to push or PR against the ``v2.2.x`` upstream branch, not ``master``!
379+
sure to push or PR against the ``v2.2.x`` upstream branch, not ``main``!

0 commit comments

Comments
 (0)