Unverified Commit 0352909e authored by Peter Eastman's avatar Peter Eastman Committed by GitHub
Browse files

Changes to work with recent versions of Sphinx (#3138)

* Changes to work with recent versions of Sphinx

* Updated Sphinx version used for CI
parent 96cdfc0b
......@@ -13,7 +13,7 @@ dependencies:
- swig
- doxygen 1.8.14
- pip:
- sphinx==2.3.1
- sphinxcontrib-bibtex<2.0.0
- sphinx==4.0.2
- sphinxcontrib-bibtex
- sphinxcontrib-lunrsearch
- sphinxcontrib-autodoc_doxygen
\ No newline at end of file
......@@ -9,8 +9,11 @@ extensions = ['sphinx.ext.mathjax', 'sphinx.ext.ifconfig', 'sphinx.ext.autosumma
'sphinxcontrib.lunrsearch']
autosummary_generate = True
autodoc_default_flags = ['members', 'inherited-members']
autodoc_member_order = 'bysource'
autodoc_default_options = {
'members': True,
'inherited-members': True,
'member-order': 'bysource'
}
source_suffix = '.rst'
master_doc = 'index'
......
......@@ -47,6 +47,5 @@ def doctree_resolved(app, doctree, docname):
node.replace(emphnode, nodes.Text(linktext))
def setup(app):
app.override_domain(CustomStandardDomain)
app.connect('doctree-resolved', doctree_resolved)
......@@ -27,6 +27,7 @@ sys.path.append(os.path.abspath('../sphinx'))
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.mathjax', 'sphinxcontrib.bibtex', 'autonumber', 'samepage', 'caption', 'numsec']
bibtex_bibfiles = ['references.bib']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment