8000 Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x · matplotlib/matplotlib@0680adb · GitHub
[go: up one dir, main page]

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 0680adb

Browse files
committed
Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
2 parents 622b897 + b65d2c4 commit 0680adb

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
sudo: false
22

3+
cache:
4+
directories:
5+
- $HOME/.ccache
6+
- $HOME/.cache/pip
7+
38
addons:
49
apt:
510
packages:
@@ -53,12 +58,15 @@ before_install:
5358
# Install into our own pristine virtualenv
5459
- virtualenv --python=python venv
5560
- source venv/bin/activate
61+
- export PATH=/usr/lib/ccache:$PATH
5662

5763
install:
64+
- ccache -s
5865
# Upgrade pip and setuptools. Mock has issues with the default version of
5966
# setuptools
6067
- |
6168
pip install --upgrade pip
69+
pip install --upgrade wheel
6270
pip install --upgrade setuptools
6371
# Install only from travis wheelhouse
6472
- if [ -z "$PRE" ]; then

lib/matplotlib/sphinxext/plot_directive.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ def run(arguments, content, options, state_machine, state, lineno):
825825
options=opts,
826826
images=images,
827827
source_code=source_code,
828-
html_show_formats=config.plot_html_show_formats and not nofigs,
828+
html_show_formats=config.plot_html_show_formats and len(images),
829829
caption=caption)
830830

831831
total_lines.extend(result.split("\n"))

lib/matplotlib/tests/test_subplots.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ def test_exceptions():
113113
message='.*sharex\ argument\ to\ subplots',
114114
category=UserWarning)
115115
assert_raises(ValueError, plt.subplots, 2, 2, -1)
116-
# uncomment this for 1.5
117-
# assert_raises(ValueError, plt.subplots, 2, 2, 0)
116+
assert_raises(ValueError, plt.subplots, 2, 2, 0)
118117
assert_raises(ValueError, plt.subplots, 2, 2, 5)
119118

120119

0 commit comments

Comments
 (0)
0