From a32cb095b0d3455ca33f6589ef893fd1213868c7 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 8 Jun 2016 18:03:01 +0100 Subject: [PATCH 1/2] Make sure that loose version is used for version check This fix is on 1.5.x but not on 2.x seems like something went wrong in the merge --- lib/matplotlib/tests/test_axes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index ad83a74d2bd5..dfc2c7a5abb9 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -88,7 +88,7 @@ def test_formatter_ticker(): @image_comparison(baseline_images=["formatter_large_small"]) def test_formatter_large_small(): - if tuple(map(int, np.__version__.split('.'))) >= (1, 11, 0): + if LooseVersion(np.__version__) >= LooseVersion('1.11.0'): raise KnownFailureTest("Fall out from a fixed numpy bug") # github issue #617, pull #619 fig, ax = plt.subplots(1) From b27e9780a6ad6321362262ac7316bc0f61edf266 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 9 Jun 2016 09:04:57 +0100 Subject: [PATCH 2/2] Remember to import LooseVersion --- lib/matplotlib/tests/test_axes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index dfc2c7a5abb9..b295307f4783 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -4,6 +4,7 @@ import six from six.moves import xrange from itertools import chain +from distutils.version import LooseVersion import io from nose.tools import assert_equal, assert_raises, assert_false, assert_true