From e4019d77e42d1e138a126a0f2349ed196305da47 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 12 Mar 2015 09:17:23 +0000 Subject: [PATCH 1/2] Fix changed theme name in Sphinx 1.3 Set the theme name to default or classic depending on the version of Sphinx used --- lib/matplotlib/sphinxext/tests/tinypages/conf.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/sphinxext/tests/tinypages/conf.py b/lib/matplotlib/sphinxext/tests/tinypages/conf.py index 22217fc97f75..d2d26c18eceb 100644 --- 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 From 5f4f974321a52780b3a42fa5e991cb7abe77a057 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 12 Mar 2015 17:27:34 +0000 Subject: [PATCH 2/2] Restrict Travis to Sphinx 1.2.3 for now We have a few isseus with 1.3 that still needs to be fixed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ce94e3d17cc..fa968ff92c62 100644 --- 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