Unverified Commit a885a6ae authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #2080 from peastman/sphinx

Changes to work correctly with latest version of Sphinx
parents 65a1f936 428fb836
...@@ -182,7 +182,7 @@ script: ...@@ -182,7 +182,7 @@ script:
- python devtools/run-ctest.py --start-time $START_TIME - python devtools/run-ctest.py --start-time $START_TIME
- if [[ ! -z "${DOCS_DEPLOY}" && "${DOCS_DEPLOY}" = "true" ]]; then - if [[ ! -z "${DOCS_DEPLOY}" && "${DOCS_DEPLOY}" = "true" ]]; then
pip install sphinx==1.5.6 sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen; pip install sphinx sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen;
make sphinxhtml; make sphinxhtml;
make sphinxpdf; make sphinxpdf;
make C++ApiDocs PythonApiDocs; make C++ApiDocs PythonApiDocs;
......
from docutils.parsers.rst import roles from docutils.parsers.rst import roles
from docutils.nodes import Text, reference, section from docutils.nodes import Text, reference, section, label
from sphinx.roles import XRefRole from sphinx.roles import XRefRole
class autonumber(Text): class autonumber(label):
pass pass
class autonumber_ref(reference): class autonumber_ref(reference):
pass pass
def autonumber_role(name, rawtext, text, lineno, inliner, options={}, content=[]): def autonumber_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
return ([autonumber(text)], []) return ([autonumber(text=text)], [])
def doctree_resolved(app, doctree, docname): def doctree_resolved(app, doctree, docname):
index = {}; index = {};
...@@ -68,4 +68,3 @@ def setup(app): ...@@ -68,4 +68,3 @@ def setup(app):
app.add_role('autonumref', XRefRole(nodeclass=autonumber_ref)) app.add_role('autonumref', XRefRole(nodeclass=autonumber_ref))
app.connect('doctree-resolved', doctree_resolved) app.connect('doctree-resolved', doctree_resolved)
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