Skip to content

Commit b7bbf45

Browse files
authored
MAINT: changes related to renaming default branch (#314)
* Update CI config. * Rm travis badge from readme. * Fix link to GH. * Rm master_doc - default is index anyways. * Add back master_doc w/ note.
1 parent 6d7eaf7 commit b7bbf45

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: numpydoc tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010
test:

README.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
.. image:: https://travis-ci.org/numpy/numpydoc.png?branch=master
2-
:target: https://travis-ci.org/numpy/numpydoc/
3-
41
.. |docs| image:: https://readthedocs.org/projects/numpydoc/badge/?version=latest
52
:alt: Documentation Status
63
:scale: 100%

doc/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
# The encoding of source files.
6464
# source_encoding = 'utf-8-sig'
6565

66-
# The master toctree document.
67-
master_doc = 'index'
66+
# The root toctree document
67+
master_doc = 'index' # NOTE: will be changed to `root_doc` in sphinx 4
6868

6969
# General information about the project.
7070
project = u'numpydoc'

doc/example.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Source
88
======
99

1010
.. literalinclude:: example.py
11-
:caption: `example.py <http://github.com/numpy/numpydoc/blob/master/doc/example.py>`_
11+
:caption: `example.py <http://github.com/numpy/numpydoc/blob/main/doc/example.py>`_
1212
:language: python
1313

1414
Rendered

numpydoc/tests/tinybuild/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
autosummary_generate = True
1414
autodoc_default_options = {'inherited-members': None}
1515
source_suffix = '.rst'
16-
master_doc = 'index'
16+
master_doc = 'index' # NOTE: will be changed to `root_doc` in sphinx 4
1717
exclude_patterns = ['_build']
1818
intersphinx_mapping = {
1919
'python': ('https://docs.python.org/3', None),

0 commit comments

Comments
 (0)