rename default branch to main

.travis.yml

@@ -51,5 +51,5 @@ deploy:
     secure: YXA8LYIyAZ5HA2In4H/vUaCaVow9HbvKNT/TTT9OaH91Fszspr1uFo9mRQLNJlBViGgy2SaqNQITzlRdFyIcDstqRGPDQUw3xNIKvZ7YuHIzG1TVWNVpJsZf2ha1+JxozPTS2c2tlrS/LR7N4hYVtLOipaYAK2ucmB8sDu4dkws=
   on:
     tags: true
-    branch: master
+    branch: main
     repo: AndrewAnnex/SpiceyPy

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to SpiceyPy will be documented here
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project tries to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.1.2] - 2020-09-??
+### Changed
+- main branch is now the default branch
+
 ## [3.1.1] - 2020-05-25
 ### Fixed
 - missing get_spice.py in manifest

CONTRIBUTING.md

@@ -72,7 +72,7 @@ Here is the general process for making a code contribution to SpiceyPy. SpiceyPy
 
 1. Create your own fork of the project
 2. Make the changes in your fork on a new branch
-3. Make a pull request that should be a single commit onto the master branch with a detailed commit message.
+3. Make a pull request that should be a single commit onto the main branch with a detailed commit message.
 
 Commit messages should start with a title line followed by a newline followed by a markdown-formatted list of changes.
 

README.rst

@@ -10,18 +10,18 @@ SpiceyPy is a Python wrapper for the NAIF C SPICE Toolkit (N66), written using c
 | |Windows Build Status| |                   |        |                 | |JOSS|     |              |
 +------------------------+-------------------+--------+-----------------+------------+--------------+
 
-.. |Travis Build Status| image:: https://img.shields.io/travis/AndrewAnnex/SpiceyPy/master?logo=travis
+.. |Travis Build Status| image:: https://img.shields.io/travis/AndrewAnnex/SpiceyPy/main?logo=travis
    :alt: Travis - Build Status
    :target: https://travis-ci.org/AndrewAnnex/SpiceyPy
-.. |Windows Build Status| image:: https://img.shields.io/appveyor/build/AndrewAnnex/SpiceyPy/master?logo=appveyor
+.. |Windows Build Status| image:: https://img.shields.io/appveyor/build/AndrewAnnex/SpiceyPy/main?logo=appveyor
    :alt: Appveyor - Build Status
    :target: https://ci.appveyor.com/project/AndrewAnnex/spiceypy
-.. |Coverage Status| image:: https://img.shields.io/codecov/c/github/AndrewAnnex/SpiceyPy/master?logo=codecov
+.. |Coverage Status| image:: https://img.shields.io/codecov/c/github/AndrewAnnex/SpiceyPy/main?logo=codecov
    :alt: Codecov - Test Coverage
    :target: https://codecov.io/gh/AndrewAnnex/SpiceyPy
-.. |Docs| image:: https://img.shields.io/readthedocs/spiceypy/master
+.. |Docs| image:: https://img.shields.io/readthedocs/spiceypy/main
    :alt: Readthedocs - Documentation
-   :target: http://spiceypy.readthedocs.org/en/master/
+   :target: http://spiceypy.readthedocs.org/en/main/
 .. |Join the chat| image:: https://img.shields.io/gitter/room/andrewannex/spiceypy
    :alt: Gitter - Chat room
    :target: https://gitter.im/AndrewAnnex/SpiceyPy
@@ -99,7 +99,7 @@ NAIF. <https://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/index.html>`__
 Please refer to C and IDL documentation available on the NAIF website
 for in-depth explanations. Each function docstring has a link to the
 corresponding C function in the NAIF docs at a minimum.
-SpiceyPy documentation contains the NAIF authored `Lessons <https://spiceypy.readthedocs.io/en/master/lessonindex.html>`__ for step-by-step tutorials with code examples. 
+SpiceyPy documentation contains the NAIF authored `Lessons <https://spiceypy.readthedocs.io/en/main/lessonindex.html>`__ for step-by-step tutorials with code examples. 
 
 How to Help
 -----------

appveyor.yml

@@ -84,9 +84,9 @@ deploy_script:
   # upload to pypi for windows
   - set PATH=%BK_PATH%
   - set HOME=%USERPROFILE%
-  - ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "master") { Invoke-Expression "twine upload --skip-existing dist/*.whl" 2>$null } Else { write-output "Not on a tag on master, won't deploy to pypi"}
+  - ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "main") { Invoke-Expression "twine upload --skip-existing dist/*.whl" 2>$null } Else { write-output "Not on a tag on main, won't deploy to pypi"}
   - echo "Finished Artifact Deployment"
 notifications:
   - provider: Webhook
     url: https://webhooks.gitter.im/e/3a0242522a806d39ba2b
-    method: POST
+    method: POST

docs/insitu_sensing.rst

@@ -792,7 +792,7 @@ argument of the routine should be set to 'LT+S' (see aberration correction discu
 
 If desired, the position can then be turned into a unit vector using
 spiceypy.vhat function
-(https://spiceypy.readthedocs.io/en/master/documentation.html#spiceypy.spiceypy.vhat).
+(https://spiceypy.readthedocs.io/en/main/documentation.html#spiceypy.spiceypy.vhat).
 Putting it all together, we get:
 
 .. code-block:: python

docs/other_stuff.rst

@@ -372,7 +372,7 @@ The SpiceyPy package is documented in "readthedocs" website:
 
 ::
 
-      https://spiceypy.readthedocs.io/en/master/index.html
+      https://spiceypy.readthedocs.io/en/main/index.html
 
 Each API documentation page is in large part copied from the
 "Abstract" and" Brief_I/O" sections of the corresponding CSPICE

spiceypy/tests/gettestkernels.py

@@ -48,13 +48,13 @@ def cleanup_file(path):
 
 
 class CassiniKernels(object):
-    cassPck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/cpck05Mar2004.tpc"
-    satSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/130220AP_SE_13043_13073.bsp"
-    cassTourSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/130212AP_SK_13043_13058.bsp"
-    cassFk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/cas_v40.tf"
-    cassCk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/13056_13057ra.bc"
-    cassSclk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/cas00167.tsc"
-    cassIk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/cas_iss_v10.ti"
+    cassPck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/cpck05Mar2004.tpc"
+    satSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/130220AP_SE_13043_13073.bsp"
+    cassTourSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/130212AP_SK_13043_13058.bsp"
+    cassFk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/cas_v40.tf"
+    cassCk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/13056_13057ra.bc"
+    cassSclk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/cas00167.tsc"
+    cassIk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/cas_iss_v10.ti"
     cassPck = get_path_from_url(cassPck_url)
     satSpk = get_path_from_url(satSpk_url)
     cassTourSpk = get_path_from_url(cassTourSpk_url)
@@ -75,13 +75,13 @@ def cleanup_cassini_kernels():
 
 
 class ExtraKernels(object):
-    voyagerSclk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/vg200022.tsc"
-    earthTopoTf_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/earth_topo_050714.tf"
-    earthStnSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/earthstns_itrf93_050714.bsp"
-    earthHighPerPck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/earth_031228_231229_predict.bpc"
-    phobosDsk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/phobos_lores.bds"
-    marsSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/mar022-1.bsp"
-    mroFk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/mro_v15.tf"
+    voyagerSclk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/vg200022.tsc"
+    earthTopoTf_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/earth_topo_050714.tf"
+    earthStnSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/earthstns_itrf93_050714.bsp"
+    earthHighPerPck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/earth_031228_231229_predict.bpc"
+    phobosDsk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/phobos_lores.bds"
+    marsSpk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/mar022-1.bsp"
+    mroFk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/mro_v15.tf"
     voyagerSclk = get_path_from_url(voyagerSclk_url)
     earthTopoTf = get_path_from_url(earthTopoTf_url)
     earthStnSpk = get_path_from_url(earthStnSpk_url)
@@ -105,12 +105,12 @@ class CoreKernels(object):
     # note this gets updated
     currentLSK = "naif0012.tls"
     #
-    pck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/pck00010.tpc"
-    spk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/de405s_{}endian.bsp".format(
+    pck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/pck00010.tpc"
+    spk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/de405s_{}endian.bsp".format(
         sys.byteorder
     )
-    gm_pck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/gm_de431.tpc"
-    lsk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/master/{}".format(
+    gm_pck_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/gm_de431.tpc"
+    lsk_url = "https://raw.githubusercontent.com/AndrewAnnex/SpiceyPyTestKernels/main/{}".format(
         currentLSK
     )
     pck = get_path_from_url(pck_url)