MAINT: Update master to main after branch rename (numpygh-18544)

* Upload docs to main branch of neps/devdocs

* Update `master` to `main` to be consistent with current state of renaming

* Remove badges from README

* Replace remaining instances of `master` with `main`

* Add back logo

* Fix CircleCI branch checks

* Fix GA branch name

* master->main in issue templates.

* master->main for 2 links to numpy archive.

* Change master to main in NEP 23

Co-authored-by: Ross Barnowski <[email protected]>

Author: stefanv

.circleci/config.yml

@@ -91,7 +91,7 @@ jobs:
       -  run:
           name: deploy devdocs
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            if [ "${CIRCLE_BRANCH}" == "main" ]; then
               touch doc/build/html/.nojekyll
 
               ./tools/ci/push_docs_to_repo.py doc/build/html \
@@ -101,7 +101,7 @@ jobs:
                   --message "Docs build of $CIRCLE_SHA1" \
                   --force
             else
-              echo "Not on the master branch; skipping deployment"
+              echo "Not on the main branch; skipping deployment"
             fi
 
       - add_ssh_keys:
@@ -120,7 +120,7 @@ jobs:
       -  run:
           name: deploy neps
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            if [ "${CIRCLE_BRANCH}" == "main" ]; then
               touch doc/neps/_build/html/.nojekyll
 
               ./tools/ci/push_docs_to_repo.py doc/neps/_build/html \
@@ -130,5 +130,5 @@ jobs:
                   --message "Docs build of $CIRCLE_SHA1" \
                   --force
             else
-              echo "Not on the master branch; skipping deployment"
+              echo "Not on the main branch; skipping deployment"
             fi

.github/CONTRIBUTING.md

@@ -8,7 +8,7 @@ also include a brief, self-contained code example that demonstrates the problem.
 
 If you are reporting a segfault please include a GDB traceback, which you can
 generate by following
-[these instructions.](https://github.com/numpy/numpy/blob/master/doc/source/dev/development_environment.rst#debugging)
+[these instructions.](https://github.com/numpy/numpy/blob/main/doc/source/dev/development_environment.rst#debugging)
 
 ## Contributing code
 

.github/ISSUE_TEMPLATE/bug-report.md

@@ -20,7 +20,7 @@ import numpy as np
 
 <!-- If you are reporting a segfault please include a GDB traceback, which you
 can generate by following
-https://github.com/numpy/numpy/blob/master/doc/source/dev/development_environment.rst#debugging -->
+https://github.com/numpy/numpy/blob/main/doc/source/dev/development_environment.rst#debugging -->
 
 <!-- Full error message, if any (starting from line Traceback: ...) -->
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -12,5 +12,5 @@ post your idea on the [numpy-discussion mailing list]
 (https://mail.python.org/mailman/listinfo/numpy-discussion) to explain your
 reasoning in addition to opening an issue or pull request. You can also check
 out our [Contributor Guide]
-(https://github.com/numpy/numpy/blob/master/doc/source/dev/index.rst) if you
+(https://github.com/numpy/numpy/blob/main/doc/source/dev/index.rst) if you
 need more information. -->

.github/ISSUE_TEMPLATE/post-install.md

@@ -15,7 +15,7 @@ labels: 32 - Installation
 
 <!-- If you are reporting a segfault please include a GDB traceback, which you
 can generate by following
-https://github.com/numpy/numpy/blob/master/doc/source/dev/development_environment.rst#debugging -->
+https://github.com/numpy/numpy/blob/main/doc/source/dev/development_environment.rst#debugging -->
 
 <!-- Full error message, if any (starting from line Traceback: ...) -->
 

.github/workflows/build_test.yml

@@ -3,11 +3,11 @@ name: Build_Test
 on:
   push:
     branches:
-      - master
+      - main
       - maintenance/**
   pull_request:
     branches:
-      - master
+      - main
       - maintenance/**
 
 defaults:

README.md

@@ -1,12 +1,5 @@
 # <img alt="NumPy" src="/branding/logo/primary/numpylogo.svg" height="60">
 
-[![Travis CI](https://img.shields.io/travis/com/numpy/numpy/master?label=Travis%20CI)](
-    https://travis-ci.com/github/numpy/numpy)
-[![Azure](https://dev.azure.com/numpy/numpy/_apis/build/status/azure-pipeline%20numpy.numpy)](
-    https://dev.azure.com/numpy/numpy/_build/latest?definitionId=5)
-[![codecov](https://codecov.io/gh/numpy/numpy/branch/master/graph/badge.svg)](
-    https://codecov.io/gh/numpy/numpy)
-
 NumPy is the fundamental package needed for scientific computing with Python.
 
 - **Website:** https://www.numpy.org

benchmarks/README.rst

@@ -50,7 +50,7 @@ Compare change in benchmark results to another version/commit/branch::
 
     python runtests.py --bench-compare v1.6.2 bench_core
     python runtests.py --bench-compare 8bf4e9b bench_core
-    python runtests.py --bench-compare master bench_core
+    python runtests.py --bench-compare main bench_core
 
 All of the commands above display the results in plain text in
 the console, and the results are not saved for comparison with

doc/DISTUTILS.rst.txt

@@ -472,7 +472,7 @@ by these modules during the build process are ready to be compiled. This
 form of generic typing is also supported for C header files (preprocessed
 to produce ``.h`` files).
 
-.. _conv_template.py: https://github.com/numpy/numpy/blob/master/numpy/distutils/conv_template.py
+.. _conv_template.py: https://github.com/numpy/numpy/blob/main/numpy/distutils/conv_template.py
 
 Useful functions in ``numpy.distutils.misc_util``
 -------------------------------------------------

doc/HOWTO_RELEASE.rst.txt

@@ -18,7 +18,7 @@ Source tree
 
 NumPy Docs
 ----------
-- https://github.com/numpy/numpy/blob/master/doc/HOWTO_RELEASE.rst.txt
+- https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt
 
 
 SciPy.org wiki
@@ -35,7 +35,7 @@ Supported platforms and versions
 ================================
 :ref:`NEP 29 <NEP29>` outlines which Python versions
 are supported; For the first half of 2020, this will be Python >= 3.6. We test
-NumPy against all these versions every time we merge code to master.  Binary
+NumPy against all these versions every time we merge code to main.  Binary
 installers may be available for a subset of these versions (see below).
 
 OS X
@@ -185,7 +185,7 @@ A typical release schedule is one beta, two release candidates and a final
 release.  It's best to discuss the timing on the mailing list first, in order
 for people to get their commits in on time, get doc wiki edits merged, etc.
 After a date is set, create a new maintenance/x.y.z branch, add new empty
-release notes for the next version in the master branch and update the Trac
+release notes for the next version in the main branch and update the Trac
 Milestones.
 
 
@@ -336,8 +336,8 @@ to public keyservers, with a command such as::
     gpg --send-keys <yourkeyid>
 
 
-Update the version of the master branch
----------------------------------------
+Update the version of the main branch
+-------------------------------------
 Increment the release number in setup.py. Release candidates should have "rc1"
 (or "rc2", "rcN") appended to the X.Y.Z format.
 
@@ -492,5 +492,5 @@ After the final release is announced, a few administrative tasks are left to be
 done:
 
   - Forward port changes in the release branch to release notes and release
-    scripts, if any, to master branch.
+    scripts, if any, to main branch.
   - Update the Milestones in Trac.

doc/RELEASE_WALKTHROUGH.rst.txt

@@ -29,7 +29,7 @@ appended to ``doc/release/1.19.0-notes.rst`` for patch release, though not for
 new releases like ``1.19.0``, as the changelogs for ``*.0`` releases tend to be
 excessively long. The ``doc/source/release.rst`` file should also be updated
 with a link to the new release notes. These changes should be committed to the
-maintenance branch, and later will be forward ported to master. The changelog
+maintenance branch, and later will be forward ported to main. The changelog
 should be reviewed for name duplicates or short names and the ``.mailmap`` file
 updated if needed.
 
@@ -292,7 +292,7 @@ python-announce-list is BCC so that replies will not be sent to that list.
 Post-Release Tasks
 ------------------
 
-Checkout master and forward port the documentation changes::
+Checkout main and forward port the documentation changes::
 
     $ git checkout -b post-1.19.0-release-update
     $ git checkout maintenance/1.19.x doc/source/release/1.19.0-notes.rst
@@ -301,7 +301,7 @@ Checkout master and forward port the documentation changes::
     $ gvim doc/source/release.rst  # Add link to new notes
     $ git add doc/changelog/1.19.0-changelog.rst doc/source/release/1.19.0-notes.rst
     $ git status  # check status before commit
-    $ git commit -a -m"REL: Update master after 1.19.0 release."
+    $ git commit -a -m"REL: Update main after 1.19.0 release."
     $ git push origin HEAD
 
 Go to github and make a PR.

doc/TESTS.rst.txt

@@ -278,7 +278,7 @@ minor variations, it can be helpful to create a base class containing
 all the common tests, and then create a subclass for each variation.
 Several examples of this technique exist in NumPy; below are excerpts
 from one in `numpy/linalg/tests/test_linalg.py
-<https://github.com/numpy/numpy/blob/master/numpy/linalg/tests/test_linalg.py>`__::
+<https://github.com/numpy/numpy/blob/main/numpy/linalg/tests/test_linalg.py>`__::
 
   class LinalgTestCase:
       def test_single(self):

doc/neps/nep-0000.rst

@@ -278,7 +278,7 @@ References and Footnotes
 
 .. [1] This historical record is available by the normal git commands
    for retrieving older revisions, and can also be browsed on
-   `GitHub <https://github.com/numpy/numpy/tree/master/doc/neps>`_.
+   `GitHub <https://github.com/numpy/numpy/tree/main/doc/neps>`_.
 
 .. [2] The URL for viewing NEPs on the web is
    https://www.numpy.org/neps/.

doc/neps/nep-0001-npy-format.rst

@@ -292,7 +292,7 @@ included in the 1.9.0 release of numpy.
 Specifically, the file format.py in this directory implements the
 format as described here.
 
-    https://github.com/numpy/numpy/blob/master/numpy/lib/format.py
+    https://github.com/numpy/numpy/blob/main/numpy/lib/format.py
 
 
 References

doc/neps/nep-0016-abstract-array.rst

@@ -141,7 +141,7 @@ Notes:
 In practice, either way we'd only do the full test after first
 checking for well-known types like ``ndarray``, ``list``, etc. `This
 is how NumPy currently checks for other double-underscore attributes
-<https://github.com/numpy/numpy/blob/master/numpy/core/src/private/get_attr_string.h>`__
+<https://github.com/numpy/numpy/blob/main/numpy/core/src/private/get_attr_string.h>`__
 and the same idea applies here to either approach. So these numbers
 won't affect the common case, just the case where we actually have an
 ``AbstractArray``, or else another third-party object that will end up

doc/neps/nep-0023-backwards-compatibility.rst

@@ -95,10 +95,10 @@ that can be used to assess such impact include:
   analysis tools to determine where and how the functionality is used.
 - Test prominent downstream libraries against a development build of NumPy
   containing the proposed change to get real-world data on its impact.
-- Make a change in master and revert it before release if it causes problems.
-  We encourage other packages to test against NumPy's master branch and if
-  that's too burdensome, then at least to test pre-releases. This often
-  turns up issues quickly.
+- Make a change on the main branch and revert it before release if it
+  causes problems.  We encourage other packages to test against
+  NumPy's main branch and if that's too burdensome, then at least to
+  test pre-releases. This often turns up issues quickly.
 
 Alternatives to deprecations
 ````````````````````````````
@@ -279,8 +279,8 @@ introduced for v1.11.0 and turned into a hard error for v1.12.0.
 
 This change was disruptive, however it did catch real bugs in, e.g., SciPy and
 scikit-learn.  Overall the change was worth the cost, and introducing it in
-master first to allow testing, then removing it again before a release, is a
-useful strategy.
+the main branch first to allow testing, then removing it again before
+a release, is a useful strategy.
 
 Similar deprecations that also look like good examples of
 cleanups/improvements:

doc/neps/nep-0024-missing-data-2.rst

@@ -14,7 +14,7 @@ Abstract
 --------
 
 *Context: this NEP was written as an alternative to NEP 12, which at the time of writing
-had an implementation that was merged into the NumPy master branch.*
+had an implementation that was merged into the NumPy main branch.*
 
 The principle of this NEP is to separate the APIs for masking and for missing values, according to
 

doc/neps/nep-0025-missing-data-3.rst

@@ -14,7 +14,7 @@ Abstract
 
 *Context: this NEP was written as an additional alternative to NEP 12 (NEP 24
 is another alternative), which at the time of writing had an implementation
-that was merged into the NumPy master branch.*
+that was merged into the NumPy main branch.*
 
 To try and make more progress on the whole missing values/masked arrays/...
 debate, it seems useful to have a more technical discussion of the pieces

doc/neps/nep-0026-missing-data-summary.rst

@@ -17,7 +17,7 @@ The debate about how NumPy should handle missing data, a subject with
 many preexisting approaches, requirements, and conventions, has been long and
 contentious. There has been more than one proposal for how to implement
 support into NumPy, and there is a testable implementation which is
-merged into NumPy's current master. The vast number of emails and differing
+merged into NumPy's current main. The vast number of emails and differing
 points of view has made it difficult for interested parties to understand
 the issues and be comfortable with the direction NumPy is going.
 
@@ -565,7 +565,7 @@ Recommendations for Moving Forward
   we're going to have to figure out how to experiment with such
   changes out-of-core if NumPy is to continue to evolve without
   forking -- might as well do it now. The existing code can live in
-  master, disabled, or it can live in a branch -- it'll still be there
+  the main branch, be disabled, or live its own branch -- it'll still be there
   once we know what we're doing.
 
 **Mark** thinks we should:
@@ -576,8 +576,8 @@ Recommendations for Moving Forward
 A more detailed rationale for this recommendation is:
 
 * A solid preliminary NA-mask implementation is currently in NumPy
-  master. This implementation has been extensively tested
-  against scipy and other third-party packages, and has been in master
+  main. This implementation has been extensively tested
+  against scipy and other third-party packages, and has been in main
   in a stable state for a significant amount of time.
 * This implementation integrates deeply with the core, providing an
   interface which is usable in the same way R's NA support is. It

doc/neps/nep-0036-fair-play.rst

@@ -48,7 +48,7 @@ identifying the problematic release, locating alterations,
 and determining an appropriate course of action.
 
 During a community call on `October 16th, 2019
-<https://github.com/numpy/archive/blob/master/status_meetings/status-2019-10-16.md>`__
+<https://github.com/numpy/archive/blob/main/status_meetings/status-2019-10-16.md>`__
 the community resolved to draft guidelines on the distribution of
 modified NumPy versions.
 

doc/neps/nep-0046-sponsorship-guidelines.rst

@@ -240,7 +240,7 @@ Discussion
 References and Footnotes
 ------------------------
 
-- `Inside NumPy: preparing for the next decade <https://github.com/numpy/archive/blob/master/content/inside_numpy_presentation_SciPy2019.pdf>`__ presentation at SciPy'19 discussing the impact of the first NumPy grant.
+- `Inside NumPy: preparing for the next decade <https://github.com/numpy/archive/blob/main/content/inside_numpy_presentation_SciPy2019.pdf>`__ presentation at SciPy'19 discussing the impact of the first NumPy grant.
 - `Issue  <https://github.com/numpy/numpy/issues/13393>`__ and
   `email <https://mail.python.org/pipermail/numpy-discussion/2019-April/079371.html>`__
   where IBM offered a $5,000 bounty for VSX SIMD support

doc/source/conf.py

@@ -94,6 +94,7 @@ class PyTypeObject(ctypes.Structure):
 # The suffix of source filenames.
 source_suffix = '.rst'
 
+# Will change to `root_doc` in Sphinx 4
 master_doc = 'index'
 
 # General substitutions.
@@ -442,7 +443,7 @@ def linkcode_resolve(domain, info):
         linespec = ""
 
     if 'dev' in numpy.__version__:
-        return "https://github.com/numpy/numpy/blob/master/numpy/%s%s" % (
+        return "https://github.com/numpy/numpy/blob/main/numpy/%s%s" % (
            fn, linespec)
     else:
         return "https://github.com/numpy/numpy/blob/v%s/numpy/%s%s" % (