diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 67e25221..46a1c9ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: numpydoc tests on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: test: diff --git a/README.rst b/README.rst index 776d7d57..3460a600 100644 --- a/README.rst +++ b/README.rst @@ -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% diff --git a/doc/conf.py b/doc/conf.py index 1f39b915..db152ffb 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -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' diff --git a/doc/example.rst b/doc/example.rst index 0c6adfb5..37ab664b 100644 --- a/doc/example.rst +++ b/doc/example.rst @@ -8,7 +8,7 @@ Source ====== .. literalinclude:: example.py - :caption: `example.py `_ + :caption: `example.py `_ :language: python Rendered diff --git a/numpydoc/tests/tinybuild/conf.py b/numpydoc/tests/tinybuild/conf.py index 8b16cdd2..a31380ac 100644 --- a/numpydoc/tests/tinybuild/conf.py +++ b/numpydoc/tests/tinybuild/conf.py @@ -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),