Merge pull request matplotlib#21371 from tacaswell/rename_default_branch

Rename default branch

Author: QuLogic

.circleci/config.yml

@@ -31,7 +31,7 @@ commands:
               git remote add upstream git://github.com/matplotlib/matplotlib.git
             fi
             git fetch upstream
-            if [[ "$CIRCLE_BRANCH" != "master" ]] && \
+            if [[ "$CIRCLE_BRANCH" != "main" ]] && \
                [[ "$CIRCLE_PR_NUMBER" != "" ]]; then
               echo "Merging ${CIRCLE_PR_NUMBER}"
               git pull --ff-only upstream "refs/pull/${CIRCLE_PR_NUMBER}/merge"
@@ -126,7 +126,7 @@ commands:
             export SOURCE_DATE_EPOCH="$(git log -1 --format=%at $(git describe --abbrev=0))"
             # Set release mode only when deploying to devdocs.
             if [ "$CIRCLE_PROJECT_USERNAME" = "matplotlib" ] && \
-               [ "$CIRCLE_BRANCH" = "master" ] && \
+               [ "$CIRCLE_BRANCH" = "main" ] && \
                [ "$CIRCLE_PR_NUMBER" = "" ]; then
               export RELEASE_TAG='-t release'
             fi

.circleci/deploy-docs.sh

@@ -3,10 +3,10 @@
 set -e
 
 if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" ] || \
-        [ "$CIRCLE_BRANCH" != "master" ] || \
+        [ "$CIRCLE_BRANCH" != "main" ] || \
         [[ "$CIRCLE_PULL_REQUEST" == https://github.com/matplotlib/matplotlib/pull/* ]]; then
     echo "Not uploading docs for ${CIRCLE_SHA1}"\
-         "from non-master branch (${CIRCLE_BRANCH})"\
+         "from non-main branch (${CIRCLE_BRANCH})"\
          "or pull request (${CIRCLE_PULL_REQUEST})"\
          "or non-Matplotlib org (${CIRCLE_PROJECT_USERNAME})."
     exit

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@ consider the following points:
 - Help with git and github is available at
   https://matplotlib.org/devel/gitwash/development_workflow.html.
 
-- Do not create the PR out of master, but out of a separate branch.
+- Do not create the PR out of main, but out of a separate branch.
 
 - The PR title should summarize the changes, for example "Raise ValueError on
   non-numeric input to set_xlim".  Avoid non-descriptive titles such as

.github/workflows/cibuildwheel.yml

@@ -3,7 +3,7 @@ name: Build CI wheels
 on:
   push:
     branches:
-      - master
+      - main
       - v[0-9]+.[0-9]+.x
     tags:
       - v*

.github/workflows/pr_welcome.yml

@@ -32,4 +32,4 @@ jobs:
 
           We strive to be a welcoming and open project. Please follow our
           [Code of
-          Conduct](https://github.com/matplotlib/matplotlib/blob/master/CODE_OF_CONDUCT.md).
+          Conduct](https://github.com/matplotlib/matplotlib/blob/main/CODE_OF_CONDUCT.md).

README.rst

@@ -7,14 +7,14 @@
 .. |GitHubActions| image:: https://github.com/matplotlib/matplotlib/workflows/Tests/badge.svg
 .. _GitHubActions: https://github.com/matplotlib/matplotlib/actions?query=workflow%3ATests
 
-.. |AzurePipelines| image:: https://dev.azure.com/matplotlib/matplotlib/_apis/build/status/matplotlib.matplotlib?branchName=master
-.. _AzurePipelines: https://dev.azure.com/matplotlib/matplotlib/_build/latest?definitionId=1&branchName=master
+.. |AzurePipelines| image:: https://dev.azure.com/matplotlib/matplotlib/_apis/build/status/matplotlib.matplotlib?branchName=main
+.. _AzurePipelines: https://dev.azure.com/matplotlib/matplotlib/_build/latest?definitionId=1&branchName=main
 
-.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/matplotlib/matplotlib?branch=master&svg=true
+.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/matplotlib/matplotlib?branch=main&svg=true
 .. _AppVeyor: https://ci.appveyor.com/project/matplotlib/matplotlib
 
-.. |Codecov| image:: https://codecov.io/github/matplotlib/matplotlib/badge.svg?branch=master&service=github
-.. _Codecov: https://codecov.io/github/matplotlib/matplotlib?branch=master
+.. |Codecov| image:: https://codecov.io/github/matplotlib/matplotlib/badge.svg?branch=main&service=github
+.. _Codecov: https://codecov.io/github/matplotlib/matplotlib?branch=main
 
 .. |LGTM| image:: https://img.shields.io/lgtm/grade/python/github/matplotlib/matplotlib.svg?logo=lgtm&logoWidth=18
 .. _LGTM: https://lgtm.com/projects/g/matplotlib/matplotlib

doc/conf.py

@@ -634,7 +634,7 @@ def linkcode_resolve(domain, info):
             return None
 
         version = parse(matplotlib.__version__)
-        tag = 'master' if version.is_devrelease else f'v{version.public}'
+        tag = 'main' if version.is_devrelease else f'v{version.public}'
         return ("https://github.com/matplotlib/matplotlib/blob"
                 f"/{tag}/lib/{fn}{linespec}")
 else:

doc/devel/MEP/MEP19.rst

@@ -67,7 +67,7 @@ great!]:
 
 **Documentation**
 
-Documentation of master is now built by travis and uploaded to https://matplotlib.org/devdocs/index.html
+Documentation of main is now built by travis and uploaded to https://matplotlib.org/devdocs/index.html
 
 @NelleV, I believe, generates the docs automatically and posts them on
 the web to chart MEP10 progress.

doc/devel/MEP/template.rst

@@ -24,7 +24,7 @@ MEPs go through a number of phases in their lifetime:
 
 - **Progress**: Consensus was reached and implementation work has begun.
 
-- **Completed**: The implementation has been merged into master.
+- **Completed**: The implementation has been merged into main.
 
 - **Superseded**: This MEP has been abandoned in favor of another
   approach.

doc/devel/coding_guide.rst

@@ -34,7 +34,7 @@ When making a PR, pay attention to:
 
 .. rst-class:: checklist
 
-* :ref:`Target the master branch <pr-branch-selection>`.
+* :ref:`Target the main branch <pr-branch-selection>`.
 * Adhere to the :ref:`coding_guidelines`.
 * Update the :ref:`documentation <pr-documentation>` if necessary.
 * Aim at making the PR as "ready-to-go" as you can. This helps to speed up
@@ -78,7 +78,7 @@ Organizational topics:
 .. rst-class:: checklist
 
 * Make sure all :ref:`automated tests <pr-automated-tests>` pass.
-* The PR should :ref:`target the master branch <pr-branch-selection>`.
+* The PR should :ref:`target the main branch <pr-branch-selection>`.
 * Tag with descriptive :ref:`labels <pr-labels>`.
 * Set the :ref:`milestone <pr-milestones>`.
 * Keep an eye on the :ref:`number of commits <pr-squashing>`.
@@ -145,7 +145,7 @@ Milestones
   Setting a milestone does not imply or guarantee that a PR will be merged for that
   release, but if it were to be merged what release it would be in.
 
-  All of these PRs should target the master branch. The milestone tag triggers
+  All of these PRs should target the main branch. The milestone tag triggers
   an :ref:`automatic backport <automated-backports>` for milestones which have
   a corresponding branch.
 
@@ -267,7 +267,7 @@ Current branches
 ----------------
 The current active branches are
 
-*master*
+*main*
   The current development version. Future minor releases (*v3.N.0*) will be
   branched from this. Supports Python 3.7+.
 
@@ -285,7 +285,7 @@ The current active branches are
 Branch selection for pull requests
 ----------------------------------
 
-Generally, all pull requests should target the master branch.
+Generally, all pull requests should target the main branch.
 
 Other branches are fed through :ref:`automatic <automated-backports>` or
 :ref:`manual <manual-backports>`. Directly
@@ -344,7 +344,7 @@ When doing backports please copy the form used by meeseekdev,
 conflicts make note of them and how you resolved them in the commit
 message.
 
-We do a backport from master to v2.2.x assuming:
+We do a backport from main to v2.2.x assuming:
 
 * ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo
 
@@ -376,4 +376,4 @@ and then continue the cherry pick:
    git cherry-pick --continue
 
 Use your discretion to push directly to upstream or to open a PR; be
-sure to push or PR against the ``v2.2.x`` upstream branch, not ``master``!
+sure to push or PR against the ``v2.2.x`` upstream branch, not ``main``!