From 009ea6da8ed524d01fa53a387285d7b873f687b7 Mon Sep 17 00:00:00 2001 From: Herbert Kruitbosch Date: Wed, 20 Jul 2016 15:07:52 +0200 Subject: [PATCH 1/2] better freetype version checking --- lib/matplotlib/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 06e20820cdff..bb119ff10504 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1570,7 +1570,15 @@ def _init_tests(): warnings.warn( "matplotlib 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.") + "Expect many image comparison failures below. " + "Expected freetype version {0}. " + "Found freetype version {1}." + "Freetype build type is {2}local".format( + ft2font.__freetype_version__, + LOCAL_FREETYPE_VERSION, + "" if ft2font.__freetype_build_type__ == 'local' else "not " + ) + ) try: import nose From 28061286afad826ba2584602445e9cde7b561eb6 Mon Sep 17 00:00:00 2001 From: Herbert Kruitbosch Date: Wed, 20 Jul 2016 20:28:34 +0200 Subject: [PATCH 2/2] space between sentences --- 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 bb119ff10504..6f69f8f46165 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1572,7 +1572,7 @@ def _init_tests(): "tests. Set local_freetype=True in setup.cfg and rebuild. " "Expect many image comparison failures below. " "Expected freetype version {0}. " - "Found freetype version {1}." + "Found freetype version {1}. " "Freetype build type is {2}local".format( ft2font.__freetype_version__, LOCAL_FREETYPE_VERSION,