Skip to content

Commit d9e52df

Browse files
authored
Merge pull request #188 from xylar/master_to_main
Rename master --> main
2 parents 7188ef9 + 1771d74 commit d9e52df

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Geometric Features
22

3-
[![Build Status](https://dev.azure.com/MPAS-Dev/geometric_features%20testing/_apis/build/status/MPAS-Dev.geometric_features?branchName=master)](https://dev.azure.com/MPAS-Dev/geometric_features%20testing/_build/latest?definitionId=3&branchName=master)
3+
[![Build Status](https://dev.azure.com/MPAS-Dev/geometric_features%20testing/_apis/build/status/MPAS-Dev.geometric_features?branchName=main)](https://dev.azure.com/MPAS-Dev/geometric_features%20testing/_build/latest?definitionId=3&branchName=main)
44

55
This repository houses definitions of geometric features. These features
66
can include regions, transects, and points, described in geojson format.

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
6565
REPO_PATH=$PWD
6666
67-
if [[ "$(Build.SourceBranch)" == "refs/heads/master" ]]; then
67+
if [[ "$(Build.SourceBranch)" == "refs/heads/main" ]]; then
6868
export DOCS_VERSION="stable"
6969
deploy=True
7070
elif [[ "$(Build.SourceBranch)" == refs/tags/* ]]; then

docs/versions.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Versions
44
================ ===============
55
Documentation On GitHub
66
================ ===============
7-
`stable`_ `master`_
7+
`stable`_ `main`_
88
`v0.1.7`_ `0.1.7`_
99
`v0.1.8`_ `0.1.8`_
1010
`v0.1.9`_ `0.1.9`_
@@ -22,7 +22,7 @@ Documentation On GitHub
2222
================ ===============
2323

2424
.. _`stable`: ../stable/index.html
25-
.. _`master`: https://github.com/MPAS-Dev/geometric_features/tree/master
25+
.. _`main`: https://github.com/MPAS-Dev/geometric_features/tree/main
2626
.. _`v0.1.7`: ../0.1.7/index.html
2727
.. _`0.1.7`: https://github.com/MPAS-Dev/geometric_features/tree/0.1.7
2828
.. _`v0.1.8`: ../0.1.8/index.html

feature_creation_scripts/arctic_ocean_regions/arctic_ocean_regions_partII.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def main():
121121
# make a geometric features object that knows about the geometric data
122122
# cache up a couple of directories
123123
gf = GeometricFeatures(cacheLocation='../../geometric_data',
124-
remoteBranchOrTag='master')
124+
remoteBranchOrTag='main')
125125

126126
fc = FeatureCollection()
127127

feature_creation_scripts/transport_transects/flipOSNAP_renameArcticTransectsTag.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
gf = GeometricFeatures(cacheLocation='../../geometric_data',
10-
remoteBranchOrTag='master')
10+
remoteBranchOrTag='main')
1111

1212
fcNew = FeatureCollection()
1313

geometric_features/test/test_set_group_name.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def verify_groupName(destfile, groupName):
5252

5353
# test via shell script
5454
gf = GeometricFeatures(cacheLocation=str(self.datadir),
55-
remoteBranchOrTag='master')
55+
remoteBranchOrTag='main')
5656
fc = gf.read(componentName, objectType, [featureName])
5757
fc.set_group_name(groupName)
5858
assert fc.otherProperties['groupName'] == groupName, \

0 commit comments

Comments
 (0)