Skip to content

Commit

Permalink
Merge pull request #134 from pllim/replace-with-main
Browse files Browse the repository at this point in the history
MNT: Replace master with main
  • Loading branch information
pllim authored Mar 9, 2021
2 parents 8fed923 + 0ad2b4f commit 06460f8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Publish distribution 📦 to PyPI
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
6 changes: 3 additions & 3 deletions docs/astrowidgets/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ A more detailed description of the interface and the :ref:`api-docs` are availab
Example Notebooks
-----------------

* `astrowidgets using the Ginga backend <https://github.com/astropy/astrowidgets/blob/master/example_notebooks/ginga_widget.ipynb>`_
* `Using named markers to keep track of logically related markers <https://github.com/astropy/astrowidgets/blob/master/example_notebooks/named_markers.ipynb>`_
* `Demonstration of GUI interactions <https://github.com/astropy/astrowidgets/blob/master/example_notebooks/gui_interactions.ipynb>`_
* `astrowidgets using the Ginga backend <https://github.com/astropy/astrowidgets/blob/main/example_notebooks/ginga_widget.ipynb>`_
* `Using named markers to keep track of logically related markers <https://github.com/astropy/astrowidgets/blob/main/example_notebooks/named_markers.ipynb>`_
* `Demonstration of GUI interactions <https://github.com/astropy/astrowidgets/blob/main/example_notebooks/gui_interactions.ipynb>`_


2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
# if versionmod.version.release:
# edit_on_github_branch = "v" + versionmod.version.version
# else:
# edit_on_github_branch = "master"
# edit_on_github_branch = "main"

# edit_on_github_source_root = ""
# edit_on_github_doc_root = "docs"
Expand Down

0 comments on commit 06460f8

Please sign in to comment.