Renaming default branch to main.

dhermes · Jun 20, 2020 · 83964b3 · 83964b3
1 parent da4711c
commit 83964b3
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 46 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -5,7 +5,7 @@ build: false
 
 branches:
   only:
-    - master
+    - main
 
 matrix:
   fast_finish: true

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -60,6 +60,6 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - build
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ osx_image: xcode11.4 # This is latest as of May 19, 2020
 
 branches:
   only:
-    - master
+    - main
 
 addons:
   homebrew:

diff --git a/DEVELOPMENT.rst b/DEVELOPMENT.rst
@@ -101,7 +101,7 @@ QUADPACK subroutines depend on).
 QUADPACK is used to perform numerical quadrature to compute the length
 of a curve segment.
 
-.. _directory: https://github.com/dhermes/bezier/tree/master/src/fortran/quadpack
+.. _directory: https://github.com/dhermes/bezier/tree/main/src/fortran/quadpack
 .. _QUADPACK: https://en.wikipedia.org/wiki/QUADPACK
 
 ******************
@@ -261,12 +261,12 @@ To run the functional tests:
    $ PYTHONPATH=src/python/ python3.8 -m pytest tests/functional/
    $ PYTHONPATH=src/python/ pypy3     -m pytest tests/functional/
 
-.. _functional tests: https://github.com/dhermes/bezier/tree/master/tests/functional
+.. _functional tests: https://github.com/dhermes/bezier/tree/main/tests/functional
 
 For example, the following curve-curve intersection is a
 functional test case:
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/curves11_and_26.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/curves11_and_26.png
    :align: center
 
 and there is a `Curve-Curve Intersection`_ document which captures many of
@@ -276,17 +276,17 @@ the cases in the functional tests.
 
 A triangle-triangle intersection functional test case:
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/triangles1Q_and_2Q.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/triangles1Q_and_2Q.png
    :align: center
 
 a segment-box functional test case:
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/test_goes_through_box08.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/test_goes_through_box08.png
    :align: center
 
 and a "locate point on triangle" functional test case:
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/test_triangle3_and_point1.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/test_triangle3_and_point1.png
    :align: center
 
 Functional Test Data
@@ -304,10 +304,10 @@ This way, the test cases are programming language agnostic and can be
 repurposed. The `JSON schema`_ for these files are stored in the
 ``tests/functional/schema`` directory.
 
-.. _curves.json: https://github.com/dhermes/bezier/blob/master/tests/functional/curves.json
-.. _curve_intersections.json: https://github.com/dhermes/bezier/blob/master/tests/functional/curve_intersections.json
-.. _triangles.json: https://github.com/dhermes/bezier/blob/master/tests/functional/triangles.json
-.. _triangle_intersections.json: https://github.com/dhermes/bezier/blob/master/tests/functional/triangle_intersections.json
+.. _curves.json: https://github.com/dhermes/bezier/blob/main/tests/functional/curves.json
+.. _curve_intersections.json: https://github.com/dhermes/bezier/blob/main/tests/functional/curve_intersections.json
+.. _triangles.json: https://github.com/dhermes/bezier/blob/main/tests/functional/triangles.json
+.. _triangle_intersections.json: https://github.com/dhermes/bezier/blob/main/tests/functional/triangle_intersections.json
 .. _JSON schema: http://json-schema.org/
 
 ************
@@ -330,7 +330,7 @@ To check compliance:
 A few extensions and overrides have been specified in the `pylintrc`_
 configuration for ``bezier``.
 
-.. _pylintrc: https://github.com/dhermes/bezier/blob/master/pylintrc
+.. _pylintrc: https://github.com/dhermes/bezier/blob/main/pylintrc
 
 Docstring Style
 ===============
@@ -366,7 +366,7 @@ Documentation
 *************
 
 The documentation is built with `Sphinx`_ and automatically
-updated on `RTD`_ every time a commit is pushed to ``master``.
+updated on `RTD`_ every time a commit is pushed to ``main``.
 
 .. _Sphinx: http://www.sphinx-doc.org
 .. _RTD: https://readthedocs.org/
@@ -452,11 +452,11 @@ On AppVeyor, the binary extension is built and tested with both 32-bit and
 .. _CircleCI: https://circleci.com/gh/dhermes/bezier
 .. _Travis CI: https://travis-ci.org/dhermes/bezier
 .. _AppVeyor: https://ci.appveyor.com/project/dhermes/bezier
-.. _CircleCI config: https://github.com/dhermes/bezier/blob/master/.circleci/config.yml
-.. _Travis config: https://github.com/dhermes/bezier/blob/master/.travis.yml
-.. _AppVeyor config: https://github.com/dhermes/bezier/blob/master/.appveyor.yml
+.. _CircleCI config: https://github.com/dhermes/bezier/blob/main/.circleci/config.yml
+.. _Travis config: https://github.com/dhermes/bezier/blob/main/.travis.yml
+.. _AppVeyor config: https://github.com/dhermes/bezier/blob/main/.appveyor.yml
 .. _python-multi Dockerfile: https://github.com/dhermes/python-multi/blob/master/src/Dockerfile
-.. _bezier Dockerfile: https://github.com/dhermes/bezier/blob/master/scripts/docker/bezier.Dockerfile
+.. _bezier Dockerfile: https://github.com/dhermes/bezier/blob/main/scripts/docker/bezier.Dockerfile
 .. _multibuild: https://github.com/matthew-brett/multibuild
 .. _discontinued: https://github.com/numpy/numpy/issues/11625
 
@@ -470,7 +470,7 @@ reasons:
 
 * The documentation and README (which acts as the landing page text on
   PyPI) will be updated with links scoped to the versioned tag (rather
-  than ``master``). This update occurs via the ``doc_template_release.py``
+  than ``main``). This update occurs via the ``doc_template_release.py``
   script.
 * Several badges on the documentation landing page (``index.rst``) are
   irrelevant to a fixed version (such as the "latest" version of the
@@ -509,7 +509,7 @@ Supported Python Versions
 
 Supported versions can be found in the ``noxfile.py`` `config`_.
 
-.. _config: https://github.com/dhermes/bezier/blob/master/noxfile.py
+.. _config: https://github.com/dhermes/bezier/blob/main/noxfile.py
 
 Versioning
 ==========

diff --git a/DEVELOPMENT.rst.template b/DEVELOPMENT.rst.template
@@ -366,7 +366,7 @@ Documentation
 *************
 
 The documentation is built with `Sphinx`_ and automatically
-updated on `RTD`_ every time a commit is pushed to ``master``.
+updated on `RTD`_ every time a commit is pushed to ``main``.
 
 .. _Sphinx: http://www.sphinx-doc.org
 .. _RTD: https://readthedocs.org/
@@ -470,7 +470,7 @@ reasons:
 
 * The documentation and README (which acts as the landing page text on
   PyPI) will be updated with links scoped to the versioned tag (rather
-  than ``master``). This update occurs via the ``doc_template_release.py``
+  than ``main``). This update occurs via the ``doc_template_release.py``
   script.
 * Several badges on the documentation landing page (``index.rst``) are
   irrelevant to a fixed version (such as the "latest" version of the

diff --git a/README.rst b/README.rst
@@ -19,7 +19,7 @@ This library provides:
 
 Dive in and take a look!
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/triangles6Q_and_7Q.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/triangles6Q_and_7Q.png
    :align: center
 
 Why B |eacute| zier?
@@ -28,17 +28,17 @@ Why B |eacute| zier?
 A B |eacute| zier curve (and triangle, etc.) is a parametric curve
 that uses the `Bernstein basis`_:
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/bernstein_basis.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/bernstein_basis.png
    :align: center
 
 to define a curve as a linear combination:
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/bezier_defn.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/bezier_defn.png
    :align: center
 
 This comes from the fact that the weights sum to one:
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/sum_to_unity.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/sum_to_unity.png
    :align: center
 
 This can be generalized to higher order by considering three, four, etc.
@@ -146,7 +146,7 @@ intersections):
    >>> _ = ax.set_xlim(-0.125, 1.125)
    >>> _ = ax.set_ylim(-0.0625, 0.625)
 
-.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/curves1_and_13.png
+.. image:: https://raw.githubusercontent.com/dhermes/bezier/main/docs/images/curves1_and_13.png
    :align: center
 
 For API-level documentation, check out the B |eacute| zier Python
@@ -196,19 +196,19 @@ details, see `the LICENSE`_.
 .. _Curves: https://bezier.readthedocs.io/en/latest/python/reference/bezier.curve.html
 .. _Triangles: https://bezier.readthedocs.io/en/latest/python/reference/bezier.triangle.html
 .. _package: https://bezier.readthedocs.io/en/latest/python/reference/bezier.html
-.. _DEVELOPMENT doc: https://github.com/dhermes/bezier/blob/master/DEVELOPMENT.rst
-.. _the LICENSE: https://github.com/dhermes/bezier/blob/master/LICENSE
+.. _DEVELOPMENT doc: https://github.com/dhermes/bezier/blob/main/DEVELOPMENT.rst
+.. _the LICENSE: https://github.com/dhermes/bezier/blob/main/LICENSE
 
 .. |docs| image:: https://readthedocs.org/projects/bezier/badge/?version=latest
    :target: https://bezier.readthedocs.io/en/latest/
    :alt: Documentation Status
-.. |circle-build| image:: https://img.shields.io/circleci/project/github/dhermes/bezier/master.svg?maxAge=3600&logo=circleci&label=Linux
+.. |circle-build| image:: https://img.shields.io/circleci/project/github/dhermes/bezier/main.svg?maxAge=3600&logo=circleci&label=Linux
    :target: https://circleci.com/gh/dhermes/bezier
    :alt: CircleCI Build
-.. |travis-build| image:: https://img.shields.io/travis/dhermes/bezier/master.svg?maxAge=3600&logo=travis&label=macOS
+.. |travis-build| image:: https://img.shields.io/travis/dhermes/bezier/main.svg?maxAge=3600&logo=travis&label=macOS
    :target: https://travis-ci.org/dhermes/bezier
    :alt: Travis Build
-.. |appveyor-build| image:: https://img.shields.io/appveyor/ci/dhermes/bezier/master.svg?maxAge=3600&logo=appveyor&label=Windows
+.. |appveyor-build| image:: https://img.shields.io/appveyor/ci/dhermes/bezier/main.svg?maxAge=3600&logo=appveyor&label=Windows
    :target: https://ci.appveyor.com/project/dhermes/bezier
    :alt: AppVeyor CI Build
 .. |pypi| image:: https://img.shields.io/pypi/v/bezier.svg

diff --git a/docs/conf.py b/docs/conf.py
@@ -78,7 +78,7 @@
 #
 # source_encoding = "utf-8-sig"
 
-# The master toctree document.
+# The primary toctree document.
 master_doc = "index"
 
 # General information about the project.

diff --git a/docs/index.rst b/docs/index.rst
@@ -250,15 +250,15 @@ License
 ``bezier`` is made available under the Apache 2.0 License. For more
 details, see `the LICENSE`_.
 
-.. _the LICENSE: https://github.com/dhermes/bezier/blob/master/LICENSE
+.. _the LICENSE: https://github.com/dhermes/bezier/blob/main/LICENSE
 
-.. |circle-build| image:: https://img.shields.io/circleci/project/github/dhermes/bezier/master.svg?maxAge=3600&logo=circleci&label=Linux
+.. |circle-build| image:: https://img.shields.io/circleci/project/github/dhermes/bezier/main.svg?maxAge=3600&logo=circleci&label=Linux
    :target: https://circleci.com/gh/dhermes/bezier
    :alt: CircleCI Build
-.. |travis-build| image:: https://img.shields.io/travis/dhermes/bezier/master.svg?maxAge=3600&logo=travis&label=macOS
+.. |travis-build| image:: https://img.shields.io/travis/dhermes/bezier/main.svg?maxAge=3600&logo=travis&label=macOS
    :target: https://travis-ci.org/dhermes/bezier
    :alt: Travis Build
-.. |appveyor-build| image:: https://img.shields.io/appveyor/ci/dhermes/bezier/master.svg?maxAge=3600&logo=appveyor&label=Windows
+.. |appveyor-build| image:: https://img.shields.io/appveyor/ci/dhermes/bezier/main.svg?maxAge=3600&logo=appveyor&label=Windows
    :target: https://ci.appveyor.com/project/dhermes/bezier
    :alt: AppVeyor CI Build
 .. |pypi| image:: https://img.shields.io/pypi/v/bezier.svg

diff --git a/scripts/check_doc_templates.py b/scripts/check_doc_templates.py
@@ -39,7 +39,7 @@
 DEVELOPMENT_TEMPLATE = os.path.join(_ROOT_DIR, "DEVELOPMENT.rst.template")
 DEVELOPMENT_FILE = os.path.join(_ROOT_DIR, "DEVELOPMENT.rst")
 RTD_VERSION = "latest"
-REVISION = "master"
+REVISION = "main"
 PLAIN_CODE_BLOCK = ".. code-block:: python"
 SPHINX_CODE_BLOCK1 = """\
 .. testsetup:: getting-started
@@ -143,23 +143,23 @@
    :alt: Documentation Status
 """
 CIRCLECI_BADGE = (
-    "https://img.shields.io/circleci/project/github/dhermes/bezier/master.svg?"
+    "https://img.shields.io/circleci/project/github/dhermes/bezier/main.svg?"
     "maxAge=3600&logo=circleci&label=Linux"
 )
 CIRCLECI_BADGE_RELEASE = (
     "https://raw.githubusercontent.com/dhermes/bezier/{version}/"
     "docs/circleci-passing.svg?sanitize=true"
 )
 TRAVIS_BADGE = (
-    "https://img.shields.io/travis/dhermes/bezier/master.svg?"
+    "https://img.shields.io/travis/dhermes/bezier/main.svg?"
     "maxAge=3600&logo=travis&label=macOS"
 )
 TRAVIS_BADGE_RELEASE = (
     "https://raw.githubusercontent.com/dhermes/bezier/{version}/"
     "docs/travis-passing.svg?sanitize=true"
 )
 APPVEYOR_BADGE = (
-    "https://img.shields.io/appveyor/ci/dhermes/bezier/master.svg?"
+    "https://img.shields.io/appveyor/ci/dhermes/bezier/main.svg?"
     "maxAge=3600&logo=appveyor&label=Windows"
 )
 APPVEYOR_BADGE_RELEASE = (
@@ -273,7 +273,7 @@ def populate_readme(revision, rtd_version, **extra_kwargs):
 
     Args:
         revision (str): The branch, commit, etc. being referred to (e.g.
-            ``master``).
+            ``main``).
         rtd_version (str): The version to use for RTD (Read the Docs) links
             (e.g. ``latest``).
         extra_kwargs (Dict[str, str]): Over-ride for template arguments.

diff --git a/scripts/doc_template_release.py b/scripts/doc_template_release.py
@@ -19,7 +19,7 @@
 * ``docs/python/binary-extension.rst``
 * ``DEVELOPMENT.rst``
 
-that are not intended to be checked into ``master`` (except maybe
+that are not intended to be checked into ``main`` (except maybe
 to be reverted after a release).
 
 This changes will cause ``nox -s lint`` to fail because it will make

diff --git a/scripts/upload_coveralls.sh b/scripts/upload_coveralls.sh
@@ -21,8 +21,8 @@ if [[ -z "${CIRCLE_BRANCH}" ]]; then
     exit 1
 fi
 
-if [[ "${CIRCLE_BRANCH}" != "master" ]]; then
-    echo "Coverage upload only happens on master"
+if [[ "${CIRCLE_BRANCH}" != "main" ]]; then
+    echo "Coverage upload only happens on main"
     echo "Currently on ${CIRCLE_BRANCH}, doing nothing"
     exit
 fi