Merge branch 'v2.x'

tacaswell · tacaswell · commit 9ab39e4a6e82 · 2015-12-24T13:01:21.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:
@@ -54,12 +59,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/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -151,6 +151,8 @@ def test_determinism():
     plots = []
     for i in range(3):
         check_call([sys.executable, '-R', '-c',
+                    'import matplotlib; '
+                    'matplotlib.use("svg"); '
                     'from matplotlib.tests.test_backend_svg '
                     'import _test_determinism;'
                     '_test_determinism("determinism.svg")'])
