8000 Fix small option for docs build with sphinx 1.3 by jenshnielsen · Pull Request #4233 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix small option for docs build with sphinx 1.3 #4233

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 17, 2015
Merged

Fix small option for docs build with sphinx 1.3 #4233

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
e33f456
Fix --small option for docs build with sphinx 1.3
jenshnielsen Mar 16, 2015
a312fc9
Sphinx 1.3.1 released fixing our issues
jenshnielsen Mar 17, 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==1.2.3
- pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow sphinx!=1.3.0
- 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
2 changes: 1 addition & 1 deletion doc/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def html(buildername='html'):
check_build()
copy_if_out_of_date('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')
if small_docs:
options = "-D plot_formats=\"[('png', 80)]\""
options = "-D plot_formats=png:80"
else:
options = ''
if warnings_as_errors:
Expand Down
15 changes: 12 additions & 3 deletions lib/matplotlib/sphinxext/plot_directive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
[(suffix, dpi), suffix, ...]

that determine the file format and the DPI. For entries whose
DPI was omitted, sensible defaults are chosen.
DPI was omitted, sensible defaults are chosen. When passing from
the command line through sphinx_build the list should be passed as
suffix:dpi,suffix:dpi, ....

plot_html_show_formats
Whether to show links to the files in HTML.
Expand Down Expand Up @@ -539,10 +541,17 @@ def render_figures(code, code_path, output_dir, output_base, context,
formats = []
plot_formats = config.plot_formats
if isinstance(plot_formats, six.string_types):
plot_formats = eval(plot_formats)
# String Sphinx < 1.3, Split on , to mimic
# Sphinx 1.3 and later. Sphinx 1.3 always
# returns a list.
plot_formats = plot_formats.split(',')
for fmt in plot_formats:
if isinstance(fmt, six.string_types):
formats.append((fmt, default_dpi.get(fmt, 80)))
if ':' in fmt:
suffix,dpi = fmt.split(':')
formats.append((str(suffix), int(dpi)))
else:
formats.append((fmt, default_dpi.get(fmt, 80)))
elif type(fmt) in (tuple, list) and len(fmt)==2:
formats.append((str(fmt[0]), int(fmt[1])))
else:
Expand Down
0