Move local freetype building resp. to freetypy

mdboom · mdboom · commit 47a4870a72dd · 2015-11-05T13:41:42.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1503,11 +1503,11 @@ def _init_tests():
     # tests.  This must match the value in `setupext.py`
     LOCAL_FREETYPE_VERSION = '2.6.1'
 
-    from matplotlib import ft2font
-    if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
-        ft2font.__freetype_build_type__ != 'local'):
+    import freetypy as ft
+    if (ft.__freetype_version__ != LOCAL_FREETYPE_VERSION or
+        ft.__freetype_build_type__ != 'local'):
         warnings.warn(
-            "matplotlib is not built with the correct FreeType version to run "
+            "freetypy is not built with the correct FreeType version to run "
             "tests.  Set local_freetype=True in setup.cfg and rebuild. "
             "Expect many image comparison failures below.")
 
diff --git a/lib/matplotlib/font_util.py b/lib/matplotlib/font_util.py
@@ -14,7 +14,7 @@
 
 import numpy as np
 
-from matplotlib import ceil
+from math import ceil
 
 
 def draw_glyph_to_bitmap(image, x, y, glyph):
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -13,6 +13,7 @@
 
 import nose
 import numpy as np
+import freetypy as ft
 
 import matplotlib as mpl
 import matplotlib.style
@@ -123,8 +124,6 @@ def wrapped_function(*args, **kwargs):
 
 
 def check_freetype_version(ver):
-    import freetypy as ft
-
     if ver is None:
         return True
 
@@ -224,7 +223,7 @@ def do_test():
                         if not check_freetype_version(self._freetype_version):
                             raise KnownFailureTest(
                                 "Mismatched version of freetype.  Test requires '%s', you have '%s'" %
-                                (self._freetype_version, ft2font.__freetype_version__))
+                                (self._freetype_version, ft.__freetype_version__))
                         raise
 
                 yield (do_test,)
diff --git a/setup.cfg.template b/setup.cfg.template
@@ -8,13 +8,6 @@
 # This can be a single directory or a comma-delimited list of directories.
 #basedirlist = /usr
 
-[test]
-# If you plan to develop matplotlib and run or add to the test suite,
-# set this to True.  It will download and build a specific version of
-# FreeType, and then use that to build the ft2font extension.  This
-# ensures that test images are exactly reproducible.
-#local_freetype = False
-
 [status]
 # To suppress display of the dependencies and their versions
 # at the top of the build log, uncomment the following line:
diff --git a/setupext.py b/setupext.py
@@ -4,7 +4,6 @@
 from distutils import version
 from distutils.core import Extension
 import glob
-import io
 import multiprocessing
 import os
 import re
@@ -20,13 +19,6 @@
 PY3 = (sys.version_info[0] >= 3)
 
 
-# This is the version of FreeType to use when building a local
-# version.  It must match the value in
-# lib/matplotlib.__init__.py
-LOCAL_FREETYPE_VERSION = '2.6.1'
-# md5 hash of the freetype tarball
-LOCAL_FREETYPE_HASH = '348e667d728c597360e4a87c16556597'
-
 if sys.platform != 'win32':
     if sys.version_info[0] < 3:
         from commands import getstatusoutput
@@ -64,9 +56,6 @@
         options['basedirlist'] = [
             x.strip() for x in
             config.get("directories", "basedirlist").split(',')]
-
-    if config.has_option('test', 'local_freetype'):
-        options['local_freetype'] = config.get("test", "local_freetype")
 else:
     config = None
 
@@ -223,21 +212,6 @@ def make_extension(name, files, *args, **kwargs):
     return ext
 
 
-def get_file_hash(filename):
-    """
-    Get the MD5 hash of a given filename.
-    """
-    import hashlib
-    BLOCKSIZE = 1 << 16
-    hasher = hashlib.md5()
-    with open(filename, 'rb') as fd:
-        buf = fd.read(BLOCKSIZE)
-        while len(buf) > 0:
-            hasher.update(buf)
-            buf = fd.read(BLOCKSIZE)
-    return hasher.hexdigest()
-
-
 class PkgConfig(object):
     """
     This is a class for communicating with pkg-config.
