Skip to content

MAINT: changes related to renaming default branch #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: numpydoc tests

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
test:
Expand Down
3 changes: 0 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
.. image:: https://travis-ci.org/numpy/numpydoc.png?branch=master
:target: https://travis-ci.org/numpy/numpydoc/

.. |docs| image:: https://readthedocs.org/projects/numpydoc/badge/?version=latest
:alt: Documentation Status
:scale: 100%
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
# The encoding of source files.
# source_encoding = 'utf-8-sig'

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

# General information about the project.
project = u'numpydoc'
Expand Down
2 changes: 1 addition & 1 deletion doc/example.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Source
======

.. literalinclude:: example.py
:caption: `example.py <http://github.com/numpy/numpydoc/blob/master/doc/example.py>`_
:caption: `example.py <http://github.com/numpy/numpydoc/blob/main/doc/example.py>`_
:language: python

Rendered
Expand Down
2 changes: 1 addition & 1 deletion numpydoc/tests/tinybuild/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
autosummary_generate = True
autodoc_default_options = {'inherited-members': None}
source_suffix = '.rst'
master_doc = 'index'
master_doc = 'index' # NOTE: will be changed to `root_doc` in sphinx 4
exclude_patterns = ['_build']
intersphinx_mapping = {
'python': ('https://docs.python.org/3', None),
Expand Down