Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 03b1b2b

Browse filesBrowse files
committed
Merge pull request #4213 from jenshnielsen/fix_docs_build
CI : test docs build on Travis with Sphinx 1.3.0 Edit (Lock travis on 1.2.3 for now)
2 parents e987a86 + 5f4f974 commit 03b1b2b
Copy full SHA for 03b1b2b

File tree

Expand file treeCollapse file tree

2 files changed

+7
-2
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+7
-2
lines changed
Open diff view settings
Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ matrix:
2424
env: BUILD_DOCS=true
2525

2626
install:
27-
- pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx
27+
- pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx==1.2.3
2828
- sudo apt-get update && sudo apt-get -qq install inkscape libav-tools gdb mencoder
2929
# We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need
3030

Collapse file

‎lib/matplotlib/sphinxext/tests/tinypages/conf.py‎

Copy file name to clipboardExpand all lines: lib/matplotlib/sphinxext/tests/tinypages/conf.py
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
import sys
1616
from os.path import join as pjoin, abspath
17+
import sphinx
18+
from distutils.version import LooseVersion
1719

1820
# If extensions (or modules to document with autodoc) are in another directory,
1921
# add these directories to sys.path here. If the directory is relative to the
@@ -99,7 +101,10 @@
99101

100102
# The theme to use for HTML and HTML Help pages. See the documentation for
101103
# a list of builtin themes.
102-
html_theme = 'default'
104+
if LooseVersion(sphinx.__version__) >= LooseVersion('1.3'):
105+
html_theme = 'classic'
106+
else:
107+
html_theme = 'default'
103108

104109
# Theme options are theme-specific and customize the look and feel of a theme
105110
# further. For a list of options available for each theme, see the

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.