Move local freetype building resp. to freetypy

matplotlib · mdboom · Nov 5, 2015 · Nov 5, 2015 · Nov 5, 2015 · Nov 5, 2015
commit 440fc5141107f6557360b01b3e78ecef23d056f5
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1536,11 +1536,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
@@ -14,6 +14,7 @@
 
 import nose
 import numpy as np
+import freetypy as ft
 
 import matplotlib as mpl
 import matplotlib.style
@@ -164,8 +165,6 @@ def wrapped_callable(*args, **kwargs):
 
 
 def check_freetype_version(ver):
-    import freetypy as ft
-
     if ver is None:
         return True
 
@@ -263,7 +262,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
@@ -20,53 +20,6 @@
 PY32min = (PY3min and sys.version_info[1] >= 2 or sys.version_info[0] > 3)
 
 
-def _get_home():
-    """Find user's home directory if possible.
-    Otherwise, returns None.
-
-    :see:
-        http://mail.python.org/pipermail/python-list/2005-February/325395.html
-    """
-    try:
-        if not PY3min and sys.platform == 'win32':
-            path = os.path.expanduser(b"~").decode(sys.getfilesystemencoding())
-        else:
-            path = os.path.expanduser("~")
-    except ImportError:
-        # This happens on Google App Engine (pwd module is not present).
-        pass
-    else:
-        if os.path.isdir(path):
-            return path
-    for evar in ('HOME', 'USERPROFILE', 'TMP'):
-        path = os.environ.get(evar)
-        if path is not None and os.path.isdir(path):
-            return path
-    return None
-
-
-def _get_xdg_cache_dir():
-    """
-    Returns the XDG cache directory, according to the `XDG
-    base directory spec
-    <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
-    """
-    path = os.environ.get('XDG_CACHE_HOME')
-    if path is None:
-        path = _get_home()
-        if path is not None:
-            path = os.path.join(path, '.cache', 'matplotlib')
-    return path
-
-
-# This is the version of FreeType to use when building a local
-# version.  It must match the value in
-# lib/matplotlib.__init__.py and also needs to be changed below in the
-# embedded windows build script (grep for "REMINDER" in this file)
-LOCAL_FREETYPE_VERSION = '2.6.1'
-# md5 hash of the freetype tarball
-LOCAL_FREETYPE_HASH = '348e667d728c597360e4a87c16556597'
-
 if sys.platform != 'win32':
     if not PY3min:
         from commands import getstatusoutput
@@ -107,9 +60,6 @@ def _get_xdg_cache_dir():
         options['basedirlist'] = [
             x.strip() for x in
             config.get("directories", "basedirlist").split(',')]
-
-    if config.has_option('test', 'local_freetype'):
-        options['local_freetype'] = config.getboolean("test", "local_freetype")
 else:
     config = None
 
@@ -284,21 +234,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.