Permalink
Browse files

Suppress sphinx warnings in the tutorials. Fixed pyparsing version to…

… 2.1.9

The update from pyparsing to 2.1.9 to 2.1.10 created a yet to be resolved bug in doxylink. This is a workaround until doxylink gets updated.
  • Loading branch information...
1 parent 19e5381 commit 3dacb6d2966448c5f2fb65f1e81b1ccb175c45fb @SergioRAgostinho SergioRAgostinho committed Dec 21, 2016
Showing with 6 additions and 6 deletions.
  1. +1 −1 .travis.sh
  2. +5 −5 doc/tutorials/content/conf.py
View
@@ -92,7 +92,7 @@ function doc ()
if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then exit; fi
# Add installed doxygen to path and install sphinx
export PATH=$DOXYGEN_DIR/bin:$PATH
- pip install --user sphinx sphinxcontrib-doxylink
+ pip install --user sphinx pyparsing==2.1.9 sphinxcontrib-doxylink
# Configure
mkdir $BUILD_DIR && cd $BUILD_DIR
cmake -DDOXYGEN_USE_SHORT_NAMES=OFF \
@@ -6,8 +6,8 @@
# -- General configuration -----------------------------------------------------
# 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.pngmath', 'sphinxcontrib.doxylink.doxylink']
-pngmath_dvipng_args = ['-gamma 1.5', '-D 110', '-bg Transparent']
+extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink.doxylink']
+imgmath_dvipng_args = ['-gamma', '1.5', '-D', '110', '-bg', 'Transparent']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -84,7 +84,7 @@
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
-html_title = None
+# html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
html_short_title = 'Home'
@@ -129,8 +129,8 @@
}
html_show_copyright = False
html_show_sphinx = False
-html_add_permalinks = None
-needs_sphinx = 1.0
+html_add_permalinks = u''
+needs_sphinx = u'1.1'
file_insertion_enabled = True
raw_enabled = True

0 comments on commit 3dacb6d

Please sign in to comment.