Skip to content

Commit

Permalink
Merge pull request #1976 from QuLogic/rename-master
Browse files Browse the repository at this point in the history
Rename master branch to main
  • Loading branch information
QuLogic authored Dec 24, 2021
2 parents 287acb0 + 71f466f commit 591fb54
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ installed using the pip installer::

pip install cartopy

To instead install the most recent version found on the GitHub master branch,
To instead install the most recent version found on the GitHub main branch,
use::

pip install git+https://github.com/SciTools/cartopy.git
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<a href="https://github.com/SciTools/cartopy/releases">
<img src="https://img.shields.io/github/tag/SciTools/cartopy.svg"
alt="Latest version" /></a>
<a href="https://github.com/SciTools/cartopy/commits/master">
<a href="https://github.com/SciTools/cartopy/commits/main">
<img src="https://img.shields.io/github/commits-since/SciTools/cartopy/latest.svg"
alt="Commits since last release" /></a>
<a href="https://github.com/SciTools/cartopy/graphs/contributors">
<img src="https://img.shields.io/github/contributors/SciTools/cartopy.svg"
alt="# contributors" /></a>
<a href="https://travis-ci.org/SciTools/cartopy/branches">
<img src="https://api.travis-ci.org/repositories/SciTools/cartopy.svg?branch=master"
<img src="https://api.travis-ci.org/repositories/SciTools/cartopy.svg?branch=main"
alt="Travis-CI" /></a>
<a href="https://zenodo.org/badge/latestdoi/5282596">
<img src="https://zenodo.org/badge/5282596.svg"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// List of branches to benchmark. If not provided, defaults to "master"
// (for git) or "default" (for mercurial).
// "branches": ["master"], // for git
"branches": ["main"],

// The tool to use to create environments. May be "conda",
// "virtualenv" or other value depending on the plugins in use.
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
# The encoding of source files.
# source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'index'
# The root toctree document (variable renamed in Sphinx 4.)
root_doc = master_doc = 'index'

# General information about the project.
project = 'cartopy'
Expand Down

0 comments on commit 591fb54

Please sign in to comment.