From 3cd34f68ce189eb5c401067f5ce40bafc3c600bd Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sat, 9 Aug 2014 16:43:54 -0400 Subject: [PATCH 1/5] TAG : version bump for RC3 Hopefully the final RC --- lib/matplotlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 25d7e04f3103..10e39c8633b3 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -106,7 +106,7 @@ import sys import distutils.version -__version__ = '1.4.x' +__version__ = '1.4.0rc3' __version__numpy__ = '1.6' # minimum required numpy version try: From 59ff34dc76262fd4ebc10b1591182b04901426cb Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sat, 9 Aug 2014 16:45:10 -0400 Subject: [PATCH 2/5] version bump back to 1.4.x --- lib/matplotlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 10e39c8633b3..25d7e04f3103 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -106,7 +106,7 @@ import sys import distutils.version -__version__ = '1.4.0rc3' +__version__ = '1.4.x' __version__numpy__ = '1.6' # minimum required numpy version try: From b8cb0b3af0dd65bbc90106b66e50d0eb1dbd6315 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Sun, 10 Aug 2014 11:08:01 +0100 Subject: [PATCH 3/5] backend_qt5.py Don't use six.u This code already does from __future__ import unicode_literal. Thus '+' will be a unicode string even in python 2 and there is no need for converting it into a unicode string. Infact this results in a TypeError because six.u assumes the input string to be ASCII only. See http://pythonhosted.org/six/#six.u --- lib/matplotlib/backends/backend_qt5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py index d05402764335..561da2223be5 100644 --- a/lib/matplotlib/backends/backend_qt5.py +++ b/lib/matplotlib/backends/backend_qt5.py @@ -381,7 +381,7 @@ def _get_key(self, event): key = key.lower() mods.reverse() - return six.u('+').join(mods + [key]) + return '+'.join(mods + [key]) def new_timer(self, *args, **kwargs): """ From 3d0e1941b964cd91b78a384e0df27a2823fdeac9 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Tue, 12 Aug 2014 10:35:42 +0100 Subject: [PATCH 4/5] Identification of freetype when 'freetype-config --ftversion' fails. --- setupext.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/setupext.py b/setupext.py index da25ab86fe55..7ded63c8ab79 100755 --- a/setupext.py +++ b/setupext.py @@ -935,10 +935,37 @@ def check(self): else: version = None + # Early versions of freetype grep badly inside freetype-config, + # so catch those cases. (tested with 2.5.3). + if 'No such file or directory\ngrep:' in version: + version = self.version_from_header() + return self._check_for_pkg_config( 'freetype2', 'ft2build.h', min_version='2.4', version=version) + def version_from_header(self): + version = 'Failed to identify version.' + ext = self.get_extension() + if ext is None: + return version + # Return the first version found in the include dirs. + for include_dir in ext.include_dirs: + header_fname = os.path.join(include_dir, 'freetype.h') + if os.path.exists(header_fname): + major, minor, patch = 0, 0, 0 + with open(header_fname, 'r') as fh: + for line in fh: + if line.startswith('#define FREETYPE_'): + value = line.rsplit(' ', 1)[1].strip() + if 'MAJOR' in line: + major = value + elif 'MINOR' in line: + minor = value + else: + patch = value + return '.'.join([major, minor, patch]) + def add_flags(self, ext): pkg_config.setup_extension( ext, 'freetype2', From 405c2deacbb973039b793bafee998a32c20e1934 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Fri, 15 Aug 2014 16:59:28 -0400 Subject: [PATCH 5/5] Merge pull request #3372 from ericdill/qt4compat DOC: Fixed the wording of the qt4_compat.py deprecation warning --- lib/matplotlib/backends/qt4_compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/backends/qt4_compat.py b/lib/matplotlib/backends/qt4_compat.py index e28a479c434d..b425e0290ba0 100644 --- a/lib/matplotlib/backends/qt4_compat.py +++ b/lib/matplotlib/backends/qt4_compat.py @@ -1,7 +1,7 @@ import warnings from matplotlib.cbook import mplDeprecation _warn_str = ("This module has been deprecated in 1.4 in favor " - "matplotlib.backends.qt_compat\n" + "of matplotlib.backends.qt_compat\n" "This module will be removed in 1.5, please update " "your imports.") # bulk-imports because we are pretending that file is this file