Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

tacaswell · tacaswell · commit 0680adb6a440 · 2015-12-24T12:59:37.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,10 @@
 sudo: false
 
+cache:
+  directories:
+    - $HOME/.ccache
+    - $HOME/.cache/pip
+
 addons:
   apt:
     packages:
@@ -53,12 +58,15 @@ before_install:
   # Install into our own pristine virtualenv
   - virtualenv --python=python venv
   - source venv/bin/activate
+  - export PATH=/usr/lib/ccache:$PATH
 
 install:
+  - ccache -s
   # Upgrade pip and setuptools. Mock has issues with the default version of
   # setuptools
   - |
     pip install --upgrade pip
+    pip install --upgrade wheel
     pip install --upgrade setuptools
   # Install only from travis wheelhouse
   - if [ -z "$PRE" ]; then
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -825,7 +825,7 @@ def run(arguments, content, options, state_machine, state, lineno):
             options=opts,
             images=images,
             source_code=source_code,
-            html_show_formats=config.plot_html_show_formats and not nofigs,
+            html_show_formats=config.plot_html_show_formats and len(images),
             caption=caption)
 
         total_lines.extend(result.split("\n"))
diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py
@@ -113,8 +113,7 @@ def test_exceptions():
                                 message='.*sharex\ argument\ to\ subplots',
                                 category=UserWarning)
         assert_raises(ValueError, plt.subplots, 2, 2, -1)
-        # uncomment this for 1.5
-        # assert_raises(ValueError, plt.subplots, 2, 2, 0)
+        assert_raises(ValueError, plt.subplots, 2, 2, 0)
         assert_raises(ValueError, plt.subplots, 2, 2, 5)
 
 
