MNT: Replace master with main

Author: pllim

.github/workflows/ci_tests.yml

@@ -3,12 +3,12 @@ name: CI
 on:
   push:
     branches:
-    - master
+    - main
     tags:
     - '*'
   pull_request:
     branches:
-    - master
+    - main
   schedule:
     # run every Monday at 5am UTC
     - cron: '0 5 * * 1'

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   analyze:

README.rst

@@ -12,7 +12,7 @@
     :target: https://github.com/astropy/astroquery/actions?query=workflow%3ACI
     :alt: Github Actions CI Status
 
-.. image:: https://codecov.io/gh/astropy/astroquery/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/astropy/astroquery/branch/main/graph/badge.svg
     :target: https://codecov.io/gh/astropy/astroquery
     :alt: Coverage results
 
@@ -67,11 +67,11 @@ or pip installed:
 
     $ pip install --pre astroquery
 
-and the 'bleeding edge' master version:
+and the 'bleeding edge' main version:
 
 .. code-block:: bash
 
-   $ pip install https://github.com/astropy/astroquery/archive/master.zip
+   $ pip install https://github.com/astropy/astroquery/archive/main.zip
 
 or cloned and installed from source:
 
@@ -96,7 +96,7 @@ and `query_region`.
 To report bugs and request features, please use the issue tracker.  Code
 contributions are very welcome, though we encourage you to follow the `API`_
 and `contributing guidelines
-<https://github.com/astropy/astroquery/blob/master/CONTRIBUTING.rst>`_ as much
+<https://github.com/astropy/astroquery/blob/main/CONTRIBUTING.rst>`_ as much
 as possible.
 
 List of Modules
@@ -182,8 +182,8 @@ Additional Links
 Maintained by `Adam Ginsburg`_ and `Brigitta Sipocz <https://github.com/bsipocz>`_ (`[email protected]`_)
 
 
-.. _Download Development ZIP: https://github.com/astropy/astroquery/zipball/master
-.. _Download Development TAR: https://github.com/astropy/astroquery/tarball/master
+.. _Download Development ZIP: https://github.com/astropy/astroquery/zipball/main
+.. _Download Development TAR: https://github.com/astropy/astroquery/tarball/main
 .. _Download Stable ZIP: https://github.com/astropy/astroquery/zipball/stable
 .. _Download Stable TAR: https://github.com/astropy/astroquery/tarball/stable
 .. _View on Github: https://github.com/astropy/astroquery/

astroquery/svo_fps/core.py

@@ -62,7 +62,7 @@ def data_from_svo(self, query, cache=True, timeout=None,
 
     def get_filter_index(self, wavelength_eff_min=0*u.angstrom,
                          wavelength_eff_max=FLOAT_MAX*u.angstrom, **kwargs):
-        """Get master list (index) of all filters at SVO
+        """Get main list (index) of all filters at SVO
         Optional parameters can be given to get filters data for specified
         Wavelength Effective range from SVO
 

docs/conf.py

@@ -193,7 +193,7 @@ def __getattr__(cls, name):
     if versionmod.release:
         edit_on_github_branch = "v" + versionmod.version
     else:
-        edit_on_github_branch = "master"
+        edit_on_github_branch = "main"
 
     edit_on_github_source_root = ""
     edit_on_github_doc_root = "docs"

docs/index.rst

@@ -8,7 +8,7 @@ This is the documentation for the Astroquery coordinated package of `astropy
 
 Code and issue tracker are on `GitHub <https://github.com/astropy/astroquery>`_.
 
-If you use astroquery, please `cite <https://github.com/astropy/astroquery/blob/master/astroquery/CITATION>`__ the
+If you use astroquery, please `cite <https://github.com/astropy/astroquery/blob/main/astroquery/CITATION>`__ the
 paper `Ginsburg, Sipőcz, Brasseur et al 2019 <https://ui.adsabs.harvard.edu/abs/2019AJ....157...98G/abstract>`_.
 
 Introduction

docs/svo_fps/svo_fps.rst

@@ -14,8 +14,8 @@ Filter Profile Service (`SVO FPS <http://svo2.cab.inta-csic.es/theory/fps/>`_).
 It allows retrieval of filter data (index, transmission data, filter list, etc.)
 from the service as astropy tables.
 
-Get index (master list) of all Filters
---------------------------------------
+Get index (main list) of all Filters
+------------------------------------
 
 The filter index (all available filters with their properties) can be listed
 with `~astroquery.svo_fps.SvoFpsClass.get_filter_index`:
@@ -28,19 +28,19 @@ with `~astroquery.svo_fps.SvoFpsClass.get_filter_index`:
     <Table masked=True length=5139>
             name          dtype  unit
     -------------------- ------- ----
-    FilterProfileService  object     
-                filterID  object     
-          WavelengthUnit  object     
-           WavelengthUCD  object     
-              PhotSystem  object     
-            DetectorType  object     
-                    Band  object     
-              Instrument  object     
-                Facility  object     
-        ProfileReference  object     
-    CalibrationReference  object     
-             Description  object     
-                Comments  object     
+    FilterProfileService  object
+                filterID  object
+          WavelengthUnit  object
+           WavelengthUCD  object
+              PhotSystem  object
+            DetectorType  object
+                    Band  object
+              Instrument  object
+                Facility  object
+        ProfileReference  object
+    CalibrationReference  object
+             Description  object
+                Comments  object
           WavelengthMean float32   AA
            WavelengthEff float32   AA
            WavelengthMin float32   AA
@@ -51,14 +51,14 @@ with `~astroquery.svo_fps.SvoFpsClass.get_filter_index`:
           WavelengthPeak float32   AA
           WavelengthPhot float32   AA
                     FWHM float32   AA
-               PhotCalID  object     
-                  MagSys  object     
+               PhotCalID  object
+                  MagSys  object
                ZeroPoint float32   Jy
-           ZeroPointUnit  object     
-                    Mag0 float32     
-           ZeroPointType  object     
-               AsinhSoft float32     
-        TrasmissionCurve  object     
+           ZeroPointUnit  object
+                    Mag0 float32
+           ZeroPointType  object
+               AsinhSoft float32
+        TrasmissionCurve  object
 
 There are options to downselect based on the minimum
 and maximum effective wavelength (``wavelength_eff_min``
@@ -80,19 +80,19 @@ is of the same form as that from `~astroquery.svo_fps.SvoFpsClass.get_filter_ind
     <Table masked=True length=11>
             name          dtype  unit
     -------------------- ------- ----
-    FilterProfileService  object     
-                filterID  object     
-          WavelengthUnit  object     
-           WavelengthUCD  object     
-              PhotSystem  object     
-            DetectorType  object     
-                    Band  object     
-              Instrument  object     
-                Facility  object     
-        ProfileReference  object     
-    CalibrationReference  object     
-             Description  object     
-                Comments  object     
+    FilterProfileService  object
+                filterID  object
+          WavelengthUnit  object
+           WavelengthUCD  object
+              PhotSystem  object
+            DetectorType  object
+                    Band  object
+              Instrument  object
+                Facility  object
+        ProfileReference  object
+    CalibrationReference  object
+             Description  object
+                Comments  object
           WavelengthMean float32   AA
            WavelengthEff float32   AA
            WavelengthMin float32   AA
@@ -103,14 +103,14 @@ is of the same form as that from `~astroquery.svo_fps.SvoFpsClass.get_filter_ind
           WavelengthPeak float32   AA
           WavelengthPhot float32   AA
                     FWHM float32   AA
-               PhotCalID  object     
-                  MagSys  object     
+               PhotCalID  object
+                  MagSys  object
                ZeroPoint float32   Jy
-           ZeroPointUnit  object     
-                    Mag0 float32     
-           ZeroPointType  object     
-               AsinhSoft float32     
-        TrasmissionCurve  object 
+           ZeroPointUnit  object
+                    Mag0 float32
+           ZeroPointType  object
+               AsinhSoft float32
+        TrasmissionCurve  object
 
 
 Get transmission data for a specific Filter
@@ -127,7 +127,7 @@ transmission curve data using
     >>> data = SvoFps.get_transmission_data('2MASS/2MASS.H')
     >>> print(data)
     Wavelength Transmission
-        AA                 
+        AA
     ---------- ------------
     12890.0          0.0
     13150.0          0.0

docs/vo_conesearch/validator.rst

@@ -22,7 +22,7 @@ Currently, only Cone Search validation is done using
 :func:`~astroquery.vo_conesearch.validator.validate.check_conesearch_sites`,
 which utilizes underlying `astropy.io.votable.validator` library.
 
-A master list of all available Cone Search services is obtained from
+A main list of all available Cone Search services is obtained from
 ``astroquery.vo_conesearch.validator.conf.conesearch_master_list``,
 which is a URL query to STScI VAO Registry by default. However, by default,
 only the ones in ``astroquery.vo_conesearch.validator.conf.conesearch_urls``
@@ -92,7 +92,7 @@ Each Cone Search service is a
 `~astroquery.vo_conesearch.vos_catalog.VOSDatabase`
 (see :ref:`vo-sec-client-cat-manip` and :ref:`vo-sec-client-db-manip`).
 
-In the master registry, there are duplicate catalog titles with
+In the main registry, there are duplicate catalog titles with
 different access URLs, duplicate access URLs with different titles,
 duplicate catalogs with slightly different descriptions, etc.
 
@@ -162,7 +162,7 @@ Examples
 ^^^^^^^^
 
 Validate default Cone Search sites with multiprocessing and write results
-in the current directory. Reading the master registry can be slow, so the
+in the current directory. Reading the main registry can be slow, so the
 default timeout is internally set to 60 seconds for it.
 In addition, all VO table warnings from the registry are suppressed because
 we are not trying to validate the registry itself but the services it contains:
@@ -209,7 +209,7 @@ This is *not* recommended unless you know exactly what you are doing:
 >>> with validator_conf.set_temp('noncritical_warnings', new_warns):
 ...     validate.check_conesearch_sites()
 
-Validate *all* Cone Search services in the master registry
+Validate *all* Cone Search services in the main registry
 (this will take a while) and write results in ``'all'`` sub-directory:
 
 >>> validate.check_conesearch_sites(destdir='./all', url_list=None)

frontpage/make_frontpage.sh

@@ -5,17 +5,17 @@ echo ${CWD}
 # ALL of these must pass!
 cd .. && \
 git checkout gh-pages && \
-git checkout master -- README.rst && \
+git checkout main -- README.rst && \
 rst2html.py --stylesheet=stylesheets/styles.css,stylesheets/pygment_trac.css,stylesheets/normalize.css,stylesheets/ie.css --link-stylesheet README.rst index.html && \
 rm README.rst && \
 git reset && \
 git add index.html && \
 git commit -m "Index.html generated." && \
-git checkout master
+git checkout main
 
-git checkout master
-git checkout master
-git checkout master
+git checkout main
+git checkout main
+git checkout main
 
 echo $PWD
 echo $CWD

tox.ini

@@ -15,7 +15,7 @@ isolated_build = true
 # project-wide pinning of dependencies, e.g. if new versions of pytest do not
 # work correctly with pytest-astropy plugins. Most of the time the pinnings file
 # should be empty.
-pypi_filter = https://raw.githubusercontent.com/astropy/ci-helpers/master/pip_pinnings.txt
+pypi_filter = https://raw.githubusercontent.com/astropy/ci-helpers/main/pip_pinnings.txt
 
 # Pass through the following environment variables which are needed for the CI
 passenv = HOME WINDIR CI