Merge pull request #144 from CitrineInformatics/admin/rename-master-main

Replace all references to `master` with `main`

Author: maxhutch

.travis.yml

@@ -13,7 +13,7 @@ script:
 - flake8 gemd
 - cd docs; make html; cd ..;
 - touch ./docs/_build/html/.nojekyll
-- if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then bash ./scripts/validate-version-bump.sh; fi
+- if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "main" ]; then bash ./scripts/validate-version-bump.sh; fi
 deploy:
   - provider: pages
     skip_cleanup: true

CONTRIBUTING.md

@@ -21,30 +21,30 @@ For additional (non-binding) inspiration, check out the [Google Python Style Gui
 
 ## Branching strategy
 
-This project currently follows a [feature branch workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow) (i.e. _masterflow_):
- * Feature branches and bugfixes are branched off of master and then opened as PRs into master
+This project currently follows a [feature branch workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow):
+ * Feature branches and bugfixes are branched off of `main` and then opened as PRs into `main`
  * Every PR must contain a version bump following [semantic versioning](https://semver.org/)
- * Backport branches for historical versions are created as-needed off of master; backports are branched off of and merged into them
+ * Backport branches for historical versions are created as-needed off of `main`; backports are branched off of and merged into them
 
  During periods of rapid development activity, the branching strategy may change to accommodate it, but it will be kept up to date here.
 
 ## Release process
 
-The master branch **does not** continuously deploy to [pypi](https://pypi.org/project/gemd/).
+The `main` branch **does not** continuously deploy to [pypi](https://pypi.org/project/gemd/).
 Rather, releases are cut explicitly by using [GitHub's releases](https://github.com/CitrineInformatics/gemd-python/releases).
 To create a release:
  * Catalog the changes in order to inform release notes
    * To do this through the GitHub interface:
      * Navigate to the [GitHub compare page](https://github.com/CitrineInformatics/gemd-python/compare)
      * Set the `base` to the most recent tag (which corresponds to the most recent release)
-     * Set the `compare` to the commit you want to deploy, typically `master`
+     * Set the `compare` to the commit you want to deploy, typically `main`
    * You can use `git diff` as well, if you prefer
  * In another tab, navigate to the [GitHub release creation page](https://github.com/CitrineInformatics/gemd-python/releases/new)
- * Set the `Target` to the commit you want to deploy, typically `master`
+ * Set the `Target` to the commit you want to deploy, typically `main`
  * Set the `Tag version` to `v{x.y.z}` where `x.y.z` is the version in [setup.py](setup.py), e.g. `v1.2.3`
  * Set the `Release title` to "GEMD v{x.y.z} is released!"
  * Populate the release notes with a 1 or 2 sentence summary and `What's New`, `Improvements`, `Fixes`, and `Deprecated` sections, as appropriate
 
 Travis will trigger the deploy due to the addition of the tag.
-Only commits on the **master** or backports branches can be released, but it need not be the most recent commit on the branch.
+Only commits on the **main** or backports branches can be released, but it need not be the most recent commit on the branch.
 The tests contained within this repository are sufficient to verify a release. 

docs/source/depth/unit_parsing.rst

@@ -10,5 +10,5 @@ This file contains the most commonly used units and will grow over time.
 Requests for support of additional units can be made by opening an issue in the `GEMD-python repository`_ on github.
 
 .. _Pint: https://pint.readthedocs.io/en/0.9/
-.. _citrine_en.txt: https://github.com/CitrineInformatics/gemd-python/blob/master/gemd/units/citrine_en.txt
-.. _GEMD-python repository: https://github.com/CitrineInformatics/gemd-python
+.. _citrine_en.txt: https://github.com/CitrineInformatics/gemd-python/blob/main/gemd/units/citrine_en.txt
+.. _GEMD-python repository: https://github.com/CitrineInformatics/gemd-python

scripts/validate-version-bump.sh

@@ -21,34 +21,34 @@ extract_patch() {
 trap "$(set +eu)" EXIT
 
 CURRENT="$(extract_version $(cat setup.py))"
-MASTER="$(extract_version $(git show master:setup.py))"
+MAIN="$(extract_version $(git show main:setup.py))"
 
 CURRENT_MAJOR="$(extract_major ${CURRENT})"
 CURRENT_MINOR="$(extract_minor ${CURRENT})"
 CURRENT_PATCH="$(extract_patch ${CURRENT})"
 
-MASTER_MAJOR="$(extract_major ${MASTER})"
-MASTER_MINOR="$(extract_minor ${MASTER})"
-MASTER_PATCH="$(extract_patch ${MASTER})"
+MAIN_MAJOR="$(extract_major ${MAIN})"
+MAIN_MINOR="$(extract_minor ${MAIN})"
+MAIN_PATCH="$(extract_patch ${MAIN})"
 
-if [ "${CURRENT_MAJOR}" -gt "${MASTER_MAJOR}" ]; then
+if [ "${CURRENT_MAJOR}" -gt "${MAIN_MAJOR}" ]; then
   echo "major version bump"
   exit 0
-elif [ "${CURRENT_MAJOR}" -lt "${MASTER_MAJOR}" ]; then
+elif [ "${CURRENT_MAJOR}" -lt "${MAIN_MAJOR}" ]; then
   echo "error - major version decreased!"
   exit 1
 else
-  if [ "${CURRENT_MINOR}" -gt "${MASTER_MINOR}" ]; then
+  if [ "${CURRENT_MINOR}" -gt "${MAIN_MINOR}" ]; then
     echo "minor version bump"
     exit 0
-  elif [ "${CURRENT_MINOR}" -lt "${MASTER_MINOR}" ]; then
+  elif [ "${CURRENT_MINOR}" -lt "${MAIN_MINOR}" ]; then
     echo "error - minor version decreased!"
     exit 2
   else
-    if [ "${CURRENT_PATCH}" -gt "${MASTER_PATCH}" ]; then
+    if [ "${CURRENT_PATCH}" -gt "${MAIN_PATCH}" ]; then
       echo "patch version bump"
       exit 0
-    elif [ "${CURRENT_PATCH}" -lt "${MASTER_PATCH}" ]; then
+    elif [ "${CURRENT_PATCH}" -lt "${MAIN_PATCH}" ]; then
       echo "error - patch version decreased!"
       exit 3
     else

setup.py

@@ -2,7 +2,7 @@
 
 
 setup(name='gemd',
-      version='0.18.0',
+      version='0.18.1',
       url='http://github.com/CitrineInformatics/gemd-python',
       description="Python binding for Citrine's GEMD data model",
       author='Max Hutchinson',