matplotlib
diff --git a/‎lib/matplotlib/font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+9-4Lines changed: 9 additions & 4 deletions b/‎lib/matplotlib/font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+9-4Lines changed: 9 additions & 4 deletions
diff --git a/‎setup.py
Copy file name to clipboardExpand all lines: setup.py
+1Lines changed: 1 addition & 0 deletions b/‎setup.py
Copy file name to clipboardExpand all lines: setup.py
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎setupext.py
Copy file name to clipboardExpand all lines: setupext.py
+18Lines changed: 18 additions & 0 deletions b/‎setupext.py
Copy file name to clipboardExpand all lines: setupext.py
+18Lines changed: 18 additions & 0 deletions
@@ -1405,10 +1405,9 @@ def findfont(prop, fontext='ttf'):
 else:
     _fmcache = None
 
-    if not 'TRAVIS' in os.environ:
-        cachedir = get_cachedir()
-        if cachedir is not None:
-            _fmcache = os.path.join(cachedir, 'fontList.json')
+    cachedir = get_cachedir()
+    if cachedir is not None:
+        _fmcache = os.path.join(cachedir, 'fontList.json')
 
     fontManager = None
 
@@ -1419,8 +1418,14 @@ def findfont(prop, fontext='ttf'):
 
     def _rebuild():
         global fontManager
+        import lockfile
+
         fontManager = FontManager()
+
         if _fmcache:
+            with lockfile.Lockfile(_fmcache):
+                json_dump(fontManager, _fmcache)
+
             json_dump(fontManager, _fmcache)
         verbose.report("generated new fontManager")
 
 
@@ -68,6 +68,7 @@
     setupext.Numpy(),
     setupext.Dateutil(),
     setupext.Pytz(),
+    setupext.Lockfile(),
     setupext.Cycler(),
     setupext.Tornado(),
     setupext.Pyparsing(),
 
@@ -1171,6 +1171,24 @@ def get_install_requires(self):
         return ['pytz']
 
 
+class LockFile(SetupPackage):
+    name = 'lockfile'
+
+    def check(self):
+        try:
+            import lockfile
+        except ImportError:
+            return (
+                'lockfile was not found. '
+                'pip will attempt to install it '
+                'after matplotlib.')
+
+        return 'using lockfile version %s' % lockfile.__version__
+
+    def get_install_requires(self):
+        return ['lockfile']
+
+
 class Cycler(SetupPackage):
     name = "cycler"