Merge pull request #939 from xylar/master_to_main

Rename master --> main
MPAS-Dev · Dec 20, 2022 · 02c5273 · 02c5273
2 parents b30abfa + aeefb56
commit 02c5273
Show file tree

Hide file tree

Showing 126 changed files with 153 additions and 153 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,9 +18,9 @@ matrix:
     - name: "python-3.8"
       python: 3.8
       env: CONDA_ENV=py38
-    - name: "python-3.7-xarray-master"
+    - name: "python-3.7-xarray-main"
       python: 3.7
-      env: CONDA_ENV=py37-xarray-master
+      env: CONDA_ENV=py37-xarray-main
 
 env:
   global:

diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ used those components.
 
 <table><tr><td>All platforms:</td>
     <td>
-      <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6243&branchName=master">
-        <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/mpas-analysis-feedstock?branchName=master">
+      <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6243&branchName=main">
+        <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/mpas-analysis-feedstock?branchName=main">
       </a>
     </td>
   </tr>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -2,7 +2,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
     - develop
   tags:
     include:
@@ -11,7 +11,7 @@ trigger:
 pr:
   branches:
     include:
-    - master
+    - main
     - develop
 
 jobs:
@@ -93,7 +93,7 @@ jobs:
       if [[ "$(Build.SourceBranch)" == "refs/heads/develop" ]]; then
         export DOCS_VERSION="latest"
         deploy=True
-      elif [[ "$(Build.SourceBranch)" == "refs/heads/master" ]]; then
+      elif [[ "$(Build.SourceBranch)" == "refs/heads/main" ]]; then
         export DOCS_VERSION="stable"
         deploy=True
       elif [[ "$(Build.SourceBranch)" == refs/tags/* ]]; then
@@ -141,7 +141,7 @@ jobs:
     displayName: build and deploy docs
 
 - job:
-  displayName: xarray-master
+  displayName: xarray-main
   pool:
     vmImage: 'ubuntu-latest'
   strategy:

diff --git a/docs/tutorials/dev_add_task.rst b/docs/tutorials/dev_add_task.rst
@@ -1110,7 +1110,7 @@ described in this tutorial:
     #
     # Additional copyright and license information can be found in the LICENSE file
     # distributed with this code, or at
-    # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+    # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
     import xarray as xr
     import numpy as np
     import scipy.sparse

diff --git a/docs/tutorials/dev_getting_started.rst b/docs/tutorials/dev_getting_started.rst
@@ -357,7 +357,7 @@ We configure MPAS-Analysis is with Python ``cfg`` (also called ``ini``) files:
    [execute]
    ...
 
-The `default config file <https://github.com/MPAS-Dev/MPAS-Analysis/blob/master/mpas_analysis/default.cfg>`_
+The `default config file <https://github.com/MPAS-Dev/MPAS-Analysis/blob/main/mpas_analysis/default.cfg>`_
 contains thousands of config options, which gives a lot of flexibility to
 MPAS-Analysis but can be more than bit overwhelming to new users and
 developers.

diff --git a/docs/tutorials/dev_understand_a_task.rst b/docs/tutorials/dev_understand_a_task.rst
@@ -33,13 +33,13 @@ first impression of how our simulation is doing.
 The primary output from MPAS-Ocean and MPAS-Seaice are monthly and daily
 averages of a large number of data fields.  Here are links to the list of:
 
-* `MPAS-Ocean monthly fields <https://github.com/E3SM-Project/E3SM/blob/master/components/mpas-ocean/cime_config/buildnml#L1082-L1290>`_
+* `MPAS-Ocean monthly fields <https://github.com/E3SM-Project/E3SM/blob/main/components/mpas-ocean/cime_config/buildnml#L1082-L1290>`_
 
-* `MPAS-Ocean daily fields <https://github.com/E3SM-Project/E3SM/blob/master/components/mpas-ocean/cime_config/buildnml#L1028-L1062>`_
+* `MPAS-Ocean daily fields <https://github.com/E3SM-Project/E3SM/blob/main/components/mpas-ocean/cime_config/buildnml#L1028-L1062>`_
 
-* `MPAS-Seaice monthly fields <https://github.com/E3SM-Project/E3SM/blob/master/components/mpas-seaice/cime_config/buildnml#L726-L823>`_
+* `MPAS-Seaice monthly fields <https://github.com/E3SM-Project/E3SM/blob/main/components/mpas-seaice/cime_config/buildnml#L726-L823>`_
 
-* `MPAS-Seaice daily fields <https://github.com/E3SM-Project/E3SM/blob/master/components/mpas-seaice/cime_config/buildnml#L695-L700>`_
+* `MPAS-Seaice daily fields <https://github.com/E3SM-Project/E3SM/blob/main/components/mpas-seaice/cime_config/buildnml#L695-L700>`_
 
 The components also produce a smaller amount of more specialized output, such
 as monthly maximum/minimum values.
@@ -871,7 +871,7 @@ here is the full analysis task as described in this tutorial:
     #
     # Additional copyright and license information can be found in the LICENSE file
     # distributed with this code, or at
-    # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+    # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
     import xarray as xr
     import numpy as np
 

diff --git a/docs/tutorials/getting_started.rst b/docs/tutorials/getting_started.rst
@@ -632,13 +632,13 @@ determine the cause of the error.  If not, please include them if you are
 
 .. _`Miniconda3 installer`: https://docs.conda.io/en/latest/miniconda.html
 .. _`conda-forge channel`: https://conda-forge.org/
-.. _`config file`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/master/configs
+.. _`config file`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/main/configs
 .. _`Ultra-low-res ocean and sea-ice dataset`: https://web.lcrc.anl.gov/public/e3sm/diagnostics/test_output/20200305.A_WCYCL1850.ne4_oQU480.anvil/20200305.A_WCYCL1850.ne4_oQU480.anvil.ocean_seaice.tar.gz
-.. _`full list of files`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/master/mpas_analysis/obs/analysis_input_files
+.. _`full list of files`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/main/mpas_analysis/obs/analysis_input_files
 .. _`diagnostics web server`: https://web.lcrc.anl.gov/public/e3sm/diagnostics/
-.. _`default config file`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/master/mpas_analysis/default.cfg
-.. _`example config file`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/master/example.cfg
-.. _`E3SM example config file`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/master/example_e3sm.cfg
+.. _`default config file`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/main/mpas_analysis/default.cfg
+.. _`example config file`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/main/example.cfg
+.. _`E3SM example config file`: https://github.com/MPAS-Dev/MPAS-Analysis/blob/main/example_e3sm.cfg
 .. _`ncclimo`: http://nco.sourceforge.net/nco.html#ncclimo-netCDF-Climatology-Generator
 .. _`this example output`: https://mpas-dev.github.io/MPAS-Analysis/examples/QU480
 .. _`posting an issue`: https://github.com/MPAS-Dev/MPAS-Analysis/issues
diff --git a/docs/users_guide/tasks/regionalTSDiagrams.rst b/docs/users_guide/tasks/regionalTSDiagrams.rst
@@ -213,4 +213,4 @@ Example Result
    :width: 500 px
    :align: center
 
-.. _`antarctic_ocean_regions`: https://github.com/MPAS-Dev/geometric_features/tree/master/feature_creation_scripts/antarctic_ocean_regions
+.. _`antarctic_ocean_regions`: https://github.com/MPAS-Dev/geometric_features/tree/main/feature_creation_scripts/antarctic_ocean_regions
diff --git a/docs/users_guide/tasks/timeSeriesOceanRegions.rst b/docs/users_guide/tasks/timeSeriesOceanRegions.rst
@@ -135,4 +135,4 @@ Example Result
    :width: 500 px
    :align: center
 
-.. _`antarctic_ocean_regions`: https://github.com/MPAS-Dev/geometric_features/tree/master/feature_creation_scripts/antarctic_ocean_regions
+.. _`antarctic_ocean_regions`: https://github.com/MPAS-Dev/geometric_features/tree/main/feature_creation_scripts/antarctic_ocean_regions
diff --git a/docs/versions.rst b/docs/versions.rst
@@ -4,7 +4,7 @@ Versions
 ================ ===============
 Documentation    On GitHub
 ================ ===============
-`stable`_        `master`_
+`stable`_        `main`_
 `latest`_        `develop`_
 `v1.2.6`_        `1.2.6`_
 `v1.2.7`_        `1.2.7`_
@@ -36,7 +36,7 @@ Documentation    On GitHub
 .. _`v1.7.1`: ../1.7.1/index.html
 .. _`v1.7.2`: ../1.7.2/index.html
 .. _`v1.8.0`: ../1.8.0/index.html
-.. _`master`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/master
+.. _`main`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/main
 .. _`develop`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/develop
 .. _`1.2.6`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.2.6
 .. _`1.2.7`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.2.7

diff --git a/download_analysis_data.py b/download_analysis_data.py
@@ -8,7 +8,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 
 from __future__ import absolute_import, division, print_function, \
     unicode_literals

diff --git a/licenses/_headers/header-css b/licenses/_headers/header-css
@@ -8,7 +8,7 @@
 /
 / Additional copyright and license information can be found in the LICENSE file
 / distributed with this code, or at
-/ https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+/ https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 / */
 
 
diff --git a/licenses/_headers/header-html b/licenses/_headers/header-html
@@ -8,7 +8,7 @@
   -
   - Additional copyright and license information can be found in the LICENSE
   - file distributed with this code, or at
-  - https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+  - https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
   -->
 
 
diff --git a/licenses/_headers/header-ncl b/licenses/_headers/header-ncl
@@ -7,4 +7,4 @@
 ;
 ; Additional copyright and license information can be found in the LICENSE file
 ; distributed with this code, or at
-; https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+; https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
diff --git a/licenses/_headers/header-py b/licenses/_headers/header-py
@@ -7,4 +7,4 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
diff --git a/licenses/_headers/license-bump-copyright.sh b/licenses/_headers/license-bump-copyright.sh
@@ -15,7 +15,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 
 source license-setup.sh
 

diff --git a/licenses/_headers/license-prepend-missing.sh b/licenses/_headers/license-prepend-missing.sh
@@ -15,7 +15,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 #
 # Get the source dir and ignore variables
 source license-setup.sh

diff --git a/licenses/_headers/license-setup.sh b/licenses/_headers/license-setup.sh
@@ -15,7 +15,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 
 SOURCE_DIR="../.."
 

diff --git a/mpas_analysis/__main__.py b/mpas_analysis/__main__.py
@@ -8,7 +8,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 
 """
 Runs MPAS-Analysis via a configuration file (e.g. `analysis.cfg`)

diff --git a/mpas_analysis/analysis_task_template.py b/mpas_analysis/analysis_task_template.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 """
 This is an example analysis task to be used as a template for new tasks.
 It should be copied into one of the component folders (`ocean`, `sea_ice`,
@@ -275,7 +275,7 @@ def setup_and_check(self):
 
         # Each analysis task generates one or more plots and writes out an
         # associated xml file for each plot.  Once all tasks have finished,
-        # the "master" task will run through all the tasks and look at
+        # the "main" task will run through all the tasks and look at
         # xmlFileNames to find out what XML files were written out.  Each task
         # should provide a list of files in the order that the corresponding
         # images should appear on the webpage.

diff --git a/mpas_analysis/download_data.py b/mpas_analysis/download_data.py
@@ -8,7 +8,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 
 """
 Entry points for downloading data for MPAS-Analysis

diff --git a/mpas_analysis/obs/make_obs_readme_bibtex.py b/mpas_analysis/obs/make_obs_readme_bibtex.py
@@ -8,7 +8,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 
 """
 This script is used to automatically generate a README.md file describing each

diff --git a/mpas_analysis/ocean/climatology_map_antarctic_melt.py b/mpas_analysis/ocean/climatology_map_antarctic_melt.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import os
 import csv
 import xarray as xr

diff --git a/mpas_analysis/ocean/climatology_map_argo.py b/mpas_analysis/ocean/climatology_map_argo.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 """
 Analysis tasks for comparing Global climatology maps against Argo data.
 """
@@ -331,7 +331,7 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
         Parameters
         ----------
         parentTask :  ``AnalysisTask``
-            The parent (master) task for this subtask
+            The parent (main) task for this subtask
 
         seasons : list of str
            A list of seasons (keys in ``constants.monthDictionary``) over

diff --git a/mpas_analysis/ocean/climatology_map_bsf.py b/mpas_analysis/ocean/climatology_map_bsf.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import xarray as xr
 import numpy as np
 import scipy.sparse

diff --git a/mpas_analysis/ocean/climatology_map_eke.py b/mpas_analysis/ocean/climatology_map_eke.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import xarray as xr
 from pyremap import LatLonGridDescriptor
 

diff --git a/mpas_analysis/ocean/climatology_map_mld.py b/mpas_analysis/ocean/climatology_map_mld.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import xarray as xr
 import numpy as np
 from pyremap import LatLonGridDescriptor

diff --git a/mpas_analysis/ocean/climatology_map_mld_min_max.py b/mpas_analysis/ocean/climatology_map_mld_min_max.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 from mpas_analysis.shared import AnalysisTask
 
 from mpas_analysis.shared.climatology import RemapMpasClimatologySubtask

diff --git a/mpas_analysis/ocean/climatology_map_ohc_anomaly.py b/mpas_analysis/ocean/climatology_map_ohc_anomaly.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import xarray as xr
 import numpy as np
 

diff --git a/mpas_analysis/ocean/climatology_map_schmidtko.py b/mpas_analysis/ocean/climatology_map_schmidtko.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 """
 Analysis tasks for comparing climatology maps of Antarctic seafloor fields
 against observations from Schmidtko et al. (2014, DOI: 10.1126/science.1256117)
@@ -203,7 +203,7 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
         Parameters
         ----------
         parentTask :  ``AnalysisTask``
-            The parent (master) task for this subtask
+            The parent (main) task for this subtask
 
         seasons : list of str
            A list of seasons (keys in ``constants.monthDictionary``) over

diff --git a/mpas_analysis/ocean/climatology_map_sose.py b/mpas_analysis/ocean/climatology_map_sose.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 """
 Analysis tasks for comparing Antarctic climatology maps against observations
 and reanalysis data.

diff --git a/mpas_analysis/ocean/climatology_map_ssh.py b/mpas_analysis/ocean/climatology_map_ssh.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import xarray as xr
 from pyremap import LatLonGridDescriptor
 

diff --git a/mpas_analysis/ocean/climatology_map_sss.py b/mpas_analysis/ocean/climatology_map_sss.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import xarray as xr
 import datetime
 from pyremap import LatLonGridDescriptor

diff --git a/mpas_analysis/ocean/climatology_map_sst.py b/mpas_analysis/ocean/climatology_map_sst.py
@@ -7,7 +7,7 @@
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
+# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/main/LICENSE
 import xarray as xr
 import datetime