Merge pull request #6857 from jenshnielsen/travis_cache

mdboom · web-flow · commit 875e539f1998 · 2016-08-01T15:03:27.000-04:00
Enable cache on Travis
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1398,13 +1398,12 @@ def findfont(prop, fontext='ttf'):
 else:
     _fmcache = None
 
-    if not 'TRAVIS' in os.environ:
-        cachedir = get_cachedir()
-        if cachedir is not None:
-            if six.PY3:
-                _fmcache = os.path.join(cachedir, 'fontList.py3k.cache')
-            else:
-                _fmcache = os.path.join(cachedir, 'fontList.cache')
+    cachedir = get_cachedir()
+    if cachedir is not None:
+        if six.PY3:
+            _fmcache = os.path.join(cachedir, 'fontList.py3k.cache')
+        else:
+            _fmcache = os.path.join(cachedir, 'fontList.cache')
 
     fontManager = None
 
