8000 Fix test docs build on Travis with Sphinx 1.3.0 Edit (Lock travis on 1.2.3 for now) by jenshnielsen · Pull Request #4213 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix test docs build on Travis with Sphinx 1.3.0 Edit (Lock travis on 1.2.3 for now) #4213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2015
Merged

Fix test docs build on Travis with Sphinx 1.3.0 Edit (Lock travis on 1.2.3 for now) #4213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4019d7
Fix changed theme name in Sphinx 1.3
jenshnielsen Mar 12, 2015
5f4f974
Restrict Travis to Sphinx 1.2.3 for now
jenshnielsen Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 6 additions & 1 deletion lib/matplotlib/sphinxext/tests/tinypages/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0