Fix the things that broke when we renamed master -> main (#1605)

* bulk rename master -> main

* a bit of cleanup

* also update the benchmarks config

Author: kandersolar

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,8 +3,8 @@
  - [ ] Closes #xxxx
  - [ ] I am familiar with the [contributing guidelines](https://pvlib-python.readthedocs.io/en/latest/contributing.html)
  - [ ] Tests added
- - [ ] Updates entries in [`docs/sphinx/source/reference`](https://github.com/pvlib/pvlib-python/blob/master/docs/sphinx/source/reference) for API changes.
- - [ ] Adds description and name entries in the appropriate "what's new" file in [`docs/sphinx/source/whatsnew`](https://github.com/pvlib/pvlib-python/tree/master/docs/sphinx/source/whatsnew) for all changes. Includes link to the GitHub Issue with `` :issue:`num` `` or this Pull Request with `` :pull:`num` ``. Includes contributor name and/or GitHub username (link with `` :ghuser:`user` ``).
+ - [ ] Updates entries in [`docs/sphinx/source/reference`](https://github.com/pvlib/pvlib-python/blob/main/docs/sphinx/source/reference) for API changes.
+ - [ ] Adds description and name entries in the appropriate "what's new" file in [`docs/sphinx/source/whatsnew`](https://github.com/pvlib/pvlib-python/tree/main/docs/sphinx/source/whatsnew) for all changes. Includes link to the GitHub Issue with `` :issue:`num` `` or this Pull Request with `` :pull:`num` ``. Includes contributor name and/or GitHub username (link with `` :ghuser:`user` ``).
  - [ ] New code is fully documented. Includes [numpydoc](https://numpydoc.readthedocs.io/en/latest/format.html) compliant docstrings, examples, and comments where necessary.
  - [ ] Pull request is nearly complete and ready for detailed review.
  - [ ] Maintainer: Appropriate GitHub Labels (including `remote-data`) and Milestone are assigned to the Pull Request and linked Issue.

.github/workflows/asv_check.yml

@@ -4,7 +4,7 @@ name: asv
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 
 

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-    - master
+    - main
     tags:
     - "v*"
 

.github/workflows/pytest-remote-data.yml

@@ -1,5 +1,5 @@
 # A secondary test job that only runs the iotools tests if explicitly requested
-# (for pull requests) or on a push to the master branch.
+# (for pull requests) or on a push to the main branch.
 # Because the iotools tests require GitHub secrets, we need to be careful about 
 # malicious PRs accessing the secrets and exposing them externally.
 #
@@ -48,7 +48,7 @@ on:
     types: [labeled]
   push:
     branches:
-    - master
+    - main
 
 jobs:
   test:
@@ -68,7 +68,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         if: github.event_name == 'pull_request_target'
-        # pull_request_target runs in the context of the target branch (pvlib/master),
+        # pull_request_target runs in the context of the target branch (pvlib/main),
         # but what we need is the hypothetical merge commit from the PR:
         with:
           ref: "refs/pull/${{ github.event.number }}/merge"

.github/workflows/pytest.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-    - master
+    - main
 
 jobs:
   test:

README.md

@@ -17,7 +17,7 @@
 <tr>
   <td>License</td>
   <td>
-    <a href="https://github.com/pvlib/pvlib-python/blob/master/LICENSE">
+    <a href="https://github.com/pvlib/pvlib-python/blob/main/LICENSE">
     <img src="https://img.shields.io/pypi/l/pvlib.svg" alt="license" />
     </a>
 </td>
@@ -28,11 +28,11 @@
     <a href="http://pvlib-python.readthedocs.org/en/stable/">
     <img src="https://readthedocs.org/projects/pvlib-python/badge/?version=stable" alt="documentation build status" />
     </a>
-    <a href="https://github.com/pvlib/pvlib-python/actions/workflows/pytest.yml?query=branch%3Amaster">
-      <img src="https://github.com/pvlib/pvlib-python/actions/workflows/pytest.yml/badge.svg?branch=master" alt="GitHub Actions Testing Status" />
+    <a href="https://github.com/pvlib/pvlib-python/actions/workflows/pytest.yml?query=branch%3Amain">
+      <img src="https://github.com/pvlib/pvlib-python/actions/workflows/pytest.yml/badge.svg?branch=main" alt="GitHub Actions Testing Status" />
     </a>
     <a href="https://codecov.io/gh/pvlib/pvlib-python">
-    <img src="https://codecov.io/gh/pvlib/pvlib-python/branch/master/graph/badge.svg" alt="codecov coverage" />
+    <img src="https://codecov.io/gh/pvlib/pvlib-python/branch/main/graph/badge.svg" alt="codecov coverage" />
     </a>
   </td>
 </tr>

benchmarks/README.md

@@ -7,7 +7,7 @@ tests are run using
 
 The basic structure of the tests and how to run them is described below.
 We refer readers to the ASV documentation for more details. The AstroPy
-[documentation](https://github.com/astropy/astropy-benchmarks/tree/master)
+[documentation](https://github.com/astropy/astropy-benchmarks/tree/main)
 may also be helpful.
 
 The test configuration is described in [asv.conf.json](asv.conf.json).
@@ -23,7 +23,7 @@ For example, if your feature branch is named ``feature``, a useful asv
 run may be (from the same directory as `asv.conf.json`):
 
 ```
-$ asv run master..feature
+$ asv run main..feature
 ```
 
 This will generate timings for every commit between the two specified
@@ -87,7 +87,7 @@ $ asv preview
 Nightly benchmarking
 --------------------
 
-The benchmarks are run nightly for new commits to pvlib-python/master.
+The benchmarks are run nightly for new commits to pvlib-python/main.
 
 - Timing results: https://pvlib-benchmarker.github.io/pvlib-benchmarks/
 - Information on the process: https://github.com/pvlib-benchmarker/pvlib-benchmarks

benchmarks/asv.conf.json

@@ -29,7 +29,7 @@
 
     // List of branches to benchmark. If not provided, defaults to "master"
     // (for git) or "default" (for mercurial).
-    // "branches": ["master"], // for git
+    "branches": ["main"], // for git
     // "branches": ["default"],    // for mercurial
 
     // The DVCS being used.  If not set, it will be automatically

docs/sphinx/source/conf.py

@@ -431,7 +431,7 @@ def make_github_url(file_name):
     "/docs/sphinx/source/api.rst" or "generated/pvlib.atmosphere.alt2pres.rst"
     """
 
-    URL_BASE = "https://github.com/pvlib/pvlib-python/blob/master/"
+    URL_BASE = "https://github.com/pvlib/pvlib-python/blob/main/"
 
     # is it a gallery page?
     if any(d in file_name for d in sphinx_gallery_conf['gallery_dirs']):

docs/sphinx/source/contributing.rst

@@ -102,8 +102,8 @@ A pull request can also quickly become unmanageable if it proposes
 changes to the API in order to implement another feature. Consider
 clearly and concisely documenting all proposed API changes before
 implementing any code. Modifying
-`api.rst <https://github.com/pvlib/pvlib-python/blob/master/docs/sphinx/source/api.rst>`_
-and/or the latest `whatsnew file <https://github.com/pvlib/pvlib-python/tree/master/docs/sphinx/source/whatsnew>`_
+`api.rst <https://github.com/pvlib/pvlib-python/tree/main/docs/sphinx/source/reference>`_
+and/or the latest `whatsnew file <https://github.com/pvlib/pvlib-python/tree/main/docs/sphinx/source/whatsnew>`_
 can help formalize this process.
 
 Questions about related issues frequently come up in the process of
@@ -154,7 +154,7 @@ a timely manner is to:
    the issue with the appropriate milestone.
 #. Make a limited-scope pull request. It can be a lot of work to check all of
    the boxes in `pull request guidelines
-   <https://github.com/pvlib/pvlib-python/blob/master/.github/PULL_REQUEST_TEMPLATE.md>`_,
+   <https://github.com/pvlib/pvlib-python/blob/main/.github/PULL_REQUEST_TEMPLATE.md>`_,
    especially for pull requests with a lot of new primary code.
    See :ref:`pull-request-scope`.
 #. Tag pvlib community members or ``@pvlib`` when the pull
@@ -217,7 +217,7 @@ We typically use GitHub's
 "`squash and merge <https://help.github.com/articles/about-pull-request-merges/#squash-and-merge-your-pull-request-commits>`_"
 feature to merge your pull request into pvlib. GitHub will condense the
 commit history of your branch into a single commit when merging into
-pvlib-python/master (the commit history on your branch remains
+pvlib-python/main (the commit history on your branch remains
 unchanged). Therefore, you are free to make commits that are as big or
 small as you'd like while developing your pull request.
 
@@ -258,7 +258,7 @@ Read the Docs build it for you.  Building the docs locally requires installing
 pvlib python as an editable library (see :ref:`installation` for instructions).
 First, install the ``doc`` dependencies specified in the
 ``EXTRAS_REQUIRE`` section of
-`setup.py <https://github.com/pvlib/pvlib-python/blob/master/setup.py>`_.
+`setup.py <https://github.com/pvlib/pvlib-python/blob/main/setup.py>`_.
 An easy way to do this is with::
 
     pip install pvlib[doc]
@@ -288,7 +288,7 @@ Example Gallery
 
 The example gallery uses `sphinx-gallery <https://sphinx-gallery.github.io/>`_
 and is generated from script files in the
-`docs/examples <https://github.com/pvlib/pvlib-python/tree/master/docs/examples>`_
+`docs/examples <https://github.com/pvlib/pvlib-python/tree/main/docs/examples>`_
 directory.  sphinx-gallery will execute example files that start with
 ``plot_`` and capture the output.
 
@@ -325,7 +325,7 @@ Testing
 Developers **must** include comprehensive tests for any additions or
 modifications to pvlib. New unit test code should be placed in the
 corresponding test module in the
-`pvlib/tests <https://github.com/pvlib/pvlib-python/tree/master/pvlib/tests>`_
+`pvlib/tests <https://github.com/pvlib/pvlib-python/tree/main/pvlib/tests>`_
 directory.
 
 A pull request will automatically run the tests for you on a variety of
@@ -334,7 +334,7 @@ typically more efficient to run and debug the tests in your own local
 environment.
 
 To run the tests locally, install the ``test`` dependencies specified in the
-`setup.py <https://github.com/pvlib/pvlib-python/blob/master/setup.py>`_
+`setup.py <https://github.com/pvlib/pvlib-python/blob/main/setup.py>`_
 file. See :ref:`installation` instructions for more information.
 
 pvlib's unit tests can easily be run by executing ``pytest`` on the
@@ -492,7 +492,7 @@ tests are run using the `airspeed velocity
 performance tests for most contributions at this time. Pull request
 reviewers will provide further information if a performance test is
 necessary. See our `README
-<https://github.com/pvlib/pvlib-python/tree/master/benchmarks/README.md>`_
+<https://github.com/pvlib/pvlib-python/tree/main/benchmarks/README.md>`_
 for instructions on running the benchmarks.
 
 
@@ -507,4 +507,4 @@ contributing.html>`_ for inspiration.
 Code of Conduct
 ~~~~~~~~~~~~~~~
 All contributors are expected to adhere to the `Contributor Code of Conduct
-<https://github.com/pvlib/pvlib-python/blob/master/CODE_OF_CONDUCT.md#contributor-covenant-code-of-conduct>`_.
+<https://github.com/pvlib/pvlib-python/blob/main/CODE_OF_CONDUCT.md#contributor-covenant-code-of-conduct>`_.