Skip to content

Commit 6337837

Browse files
committed
MNT: Replace master with main
1 parent 4c5b0be commit 6337837

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

CONTRIBUTING.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Overview
66

77
Each tutorial is a `Jupyter notebook <http://jupyter.org/>`_ file. Each notebook is saved in a separate directory within the ``tutorials/notebooks``
88
subdirectory in this project. For an example, let's look at the source notebook
9-
of the `FITS-header <https://github.com/astropy/astropy-tutorials/tree/master/tu
9+
of the `FITS-header <https://github.com/astropy/astropy-tutorials/tree/main/tu
1010
torials/notebooks/FITS-header/>`_ tutorial. Within
1111
``tutorials/notebooks/FITS-header``, there is a single Jupyter notebook file
1212
that contains the text and code for the tutorial, and any small data files used
@@ -76,7 +76,7 @@ Code
7676
* Variable names should be descriptive, e.g., ``galaxy_mass``, ``u_mag``
7777
* Use the print function explicitly to display information about variables
7878
* As much as possible, comply with `PEP8 <https://www.python.org/dev/peps/pep-0008/>`_.
79-
* As much as possible, comply with Jupyter notebook style guides - `STScI style guide <https://github.com/spacetelescope/style-guides/blob/master/guides/jupyter-notebooks.md>`_ and `Official Coding Style <https://jupyter.readthedocs.io/en/latest/development_guide/coding_style.html>`_.
79+
* As much as possible, comply with Jupyter notebook style guides - `STScI style guide <https://github.com/spacetelescope/style-guides/blob/main/guides/jupyter-notebooks.md>`_ and `Official Coding Style <https://jupyter.readthedocs.io/en/latest/development_guide/coding_style.html>`_.
8080
* Imports
8181
* Do not use ``from package import *``; import packages, classes, and
8282
functions explicitly
@@ -188,7 +188,7 @@ your ``requirements.txt`` file would look like:
188188
numpy>=1.13
189189
190190
To see an example, have a look at the FITS-header `requirements.txt file <https:
191-
//github.com/astropy/astropy-tutorials/blob/master/tutorials/notebooks/FITS-head
191+
//github.com/astropy/astropy-tutorials/blob/main/tutorials/notebooks/FITS-head
192192
er/requirements.txt>`_.
193193

194194
Push the notebook and other files from your local branch up to your fork of the

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can also get started quickly using `Binder <http://mybinder.org>`_ to run th
2222
your web browser within a remote server:
2323

2424
.. image:: http://mybinder.org/badge.svg
25-
:target: https://mybinder.org/v2/gh/astropy/astropy-tutorials/master?filepath=tutorials/notebooks
25+
:target: https://mybinder.org/v2/gh/astropy/astropy-tutorials/main?filepath=tutorials/notebooks
2626

2727

2828
Contributing tutorial material

scripts/convert.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def convert(self, remove_executed=False):
131131
return self._rst_path
132132

133133
# Initialize the resources dict - see:
134-
# https://github.com/jupyter/nbconvert/blob/master/nbconvert/nbconvertapp.py#L327
134+
# https://github.com/jupyter/nbconvert/blob/main/nbconvert/nbconvertapp.py#L327
135135
resources = {}
136136
resources['config_dir'] = '' # we don't need to specify config
137137
resources['unique_key'] = self.nb_name

scripts/tests/test_convert.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
tests_path = path.split(path.abspath(__file__))[0]
1111

1212
def test_convert_succeed():
13-
# With the current master version of nbconvert, we can allow errors
13+
# With the current main version of nbconvert, we can allow errors
1414
# per-cell. This notebook, even though it raises an exception, should still
1515
# execute fine:
1616
nbc = NBConverter(path.join(tests_path, 'test-succeed.ipynb'))

tutorials/_static/bootstrap_sandstone.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tutorials/astropy.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.. raw:: html
99

1010
<a href="../_static/{{ nb_name }}/{{ nb_name }}.ipynb"><button id="download">Download tutorial notebook</button></a>
11-
<a href="https://beta.mybinder.org/v2/gh/astropy/astropy-tutorials/master?filepath=/tutorials/notebooks/{{ nb_name }}/{{ nb_name }}.ipynb"><button id="binder">Interactive tutorial notebook</button></a>
11+
<a href="https://beta.mybinder.org/v2/gh/astropy/astropy-tutorials/main?filepath=/tutorials/notebooks/{{ nb_name }}/{{ nb_name }}.ipynb"><button id="binder">Interactive tutorial notebook</button></a>
1212

1313
<div id="spacer"></div>
1414

@@ -31,7 +31,7 @@
3131
<div id="spacer"></div>
3232

3333
<a href="../_static/{{ nb_name }}/{{ nb_name }}.ipynb"><button id="download">Download tutorial notebook</button></a>
34-
<a href="https://beta.mybinder.org/v2/gh/astropy/astropy-tutorials/master?filepath=/tutorials/notebooks/{{ nb_name }}/{{ nb_name }}.ipynb"><button id="binder">Interactive tutorial notebook</button></a>
34+
<a href="https://beta.mybinder.org/v2/gh/astropy/astropy-tutorials/main?filepath=/tutorials/notebooks/{{ nb_name }}/{{ nb_name }}.ipynb"><button id="binder">Interactive tutorial notebook</button></a>
3535

3636
{% endblock %}
3737

tutorials/dev.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Documentation on tutorials infrastructure
88
Overview
99
--------
1010

11-
Tutorials are written as Jupyter notebooks on the ``master`` branch of the
11+
Tutorials are written as Jupyter notebooks on the ``main`` branch of the
1212
``astropy/astropy-tutorials`` repository in ``tutorials/notebooks/``. These
1313
notebook files do not contain output in order to simplify version-controlling
1414
the files.
@@ -22,7 +22,7 @@ We use `CircleCI <https://circleci.com>`_ to do the Sphinx build, which is then
2222
pushed to the ``gh-pages`` branch of the repository and served by GitHub. The
2323
notebooks are first converted to RST files during the Sphinx build by doing the
2424
conversion at the end of the `Sphinx configuration file
25-
<https://github.com/astropy/astropy-tutorials/blob/master/tutorials/conf.py>`_.
25+
<https://github.com/astropy/astropy-tutorials/blob/main/tutorials/conf.py>`_.
2626

2727
Why not use nbsphinx?
2828
---------------------
@@ -73,7 +73,7 @@ Building the tutorials page locally
7373
-----------------------------------
7474

7575
For this, you can use the `Makefile
76-
<https://github.com/astropy/astropy-tutorials/blob/master/Makefile>`_ at the
76+
<https://github.com/astropy/astropy-tutorials/blob/main/Makefile>`_ at the
7777
top-level of the tutorials repository. From the root level of the cloned or
7878
downloaded repository::
7979

@@ -131,7 +131,7 @@ Marking a cell with an intentional error
131131

132132
Edit the cell metadata of the cell in which you would like to raise an exception
133133
and add the following to the top-level JSON: ``"tags": ["raises-exception"]``
134-
This tag is recognized by the latest (master) version of nbconvert.
134+
This tag is recognized by the latest (main) version of nbconvert.
135135

136136
Automatically Strip Output and Notebook Metadata
137137
------------------------------------------------

tutorials/themes/tutorials-theme/globaltoc.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
id="dLabelGlobalToc"
44
data-toggle="dropdown"
55
data-target="#"
6-
href="{{ pathto(master_doc) }}">{{ theme_navbar_site_name }} <b class="caret"></b></a>
6+
href="{{ pathto(main_doc) }}">{{ theme_navbar_site_name }} <b class="caret"></b></a>
77
<ul class="dropdown-menu globaltoc"
88
role="menu"
99
aria-labelledby="dLabelGlobalToc">{{ toctree(maxdepth=theme_globaltoc_depth|toint, collapse=False, includehidden=theme_globaltoc_includehidden|tobool) }}</ul>

0 commit comments

Comments
 (0)