Merge pull request #4213 from jenshnielsen/fix_docs_build

tacaswell · tacaswell · commit 03b1b2bca748 · 2015-03-12T18:29:18.000-04:00
CI : test  docs build on Travis with Sphinx 1.3.0 Edit (Lock travis on 1.2.3 for now)
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
       env: BUILD_DOCS=true
 
 install:
-  - pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx
+  - pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx==1.2.3
   - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools gdb mencoder
   # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need
 
diff --git a/lib/matplotlib/sphinxext/tests/tinypages/conf.py b/lib/matplotlib/sphinxext/tests/tinypages/conf.py
@@ -14,6 +14,8 @@
 
 import sys
 from os.path import join as pjoin, abspath
+import sphinx
+from distutils.version import LooseVersion
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -99,7 +101,10 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+if LooseVersion(sphinx.__version__) >= LooseVersion('1.3'):
+    html_theme = 'classic'
+else:
+    html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
