From 9c36bfd9555b06ec187e3496cbad5b8b5ad26fdd Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Tue, 16 Feb 2016 14:06:59 +0000 Subject: [PATCH 1/4] Adjust tol in patheffects tests to pass on my mac OSX10.11 homebrew python --- lib/matplotlib/tests/test_patheffects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py index c9ff921a1a2b..7fd3f37ea9a8 100644 --- a/lib/matplotlib/tests/test_patheffects.py +++ b/lib/matplotlib/tests/test_patheffects.py @@ -113,7 +113,7 @@ def test_SimplePatchShadow_offset(): assert_equal(pe._offset, (4, 5)) -@image_comparison(baseline_images=['collection'], tol=0.013 if on_win else 0) +@image_comparison(baseline_images=['collection'], tol=0.015) def test_collection(): x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100)) data = np.sin(x) + np.cos(y) From f4ff4c854fff37f3b1d7896a4c5da40a0dbb12a6 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Sun, 20 Mar 2016 22:57:15 +0000 Subject: [PATCH 2/4] adjust tol in test trisurf3d to pass on my mac --- lib/mpl_toolkits/tests/test_mplot3d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py index 86f62af9fd8f..3eaa8fd74821 100644 --- a/lib/mpl_toolkits/tests/test_mplot3d.py +++ b/lib/mpl_toolkits/tests/test_mplot3d.py @@ -149,7 +149,7 @@ def test_text3d(): ax.set_zlabel('Z axis') -@image_comparison(baseline_images=['trisurf3d'], remove_text=True) +@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.03) def test_trisurf3d(): n_angles = 36 n_radii = 8 From 32f8c0f7dd552b831871e69765cd4be8a5f3e7ae Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Sun, 20 Mar 2016 22:57:49 +0000 Subject: [PATCH 3/4] Adjust tol in test_axes:sepcgram to pass on my mac --- lib/matplotlib/tests/test_axes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index da643f96b94f..4c2aa3b1feb4 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -2766,7 +2766,7 @@ def test_subplot_key_hash(): @image_comparison(baseline_images=['specgram_freqs', 'specgram_freqs_linear'], remove_text=True, extensions=['png'], - tol=0.07 if on_win else 0.03) + tol=0.07) def test_specgram_freqs(): '''test axes.specgram in default (psd) mode with sinusoidal stimuli''' n = 10000 @@ -2867,7 +2867,7 @@ def test_specgram_noise(): @image_comparison(baseline_images=['specgram_magnitude_freqs', 'specgram_magnitude_freqs_linear'], remove_text=True, extensions=['png'], - tol=0.07 if on_win else 0.03) + tol=0.07) def test_specgram_magnitude_freqs(): '''test axes.specgram in magnitude mode with sinusoidal stimuli''' n = 10000 @@ -2969,7 +2969,7 @@ def test_specgram_magnitude_noise(): @image_comparison(baseline_images=['specgram_angle_freqs'], remove_text=True, extensions=['png'], - tol=0.007 if on_win else 0) + tol=0.007) def test_specgram_angle_freqs(): '''test axes.specgram in angle mode with sinusoidal stimuli''' n = 10000 From 598dce8d0ff95f862b7b28533979bfad46509e58 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Sat, 2 Apr 2016 11:33:49 +0100 Subject: [PATCH 4/4] Remove unused on_win --- lib/matplotlib/tests/test_axes.py | 2 -- lib/matplotlib/tests/test_patheffects.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 4c2aa3b1feb4..13b0480579ae 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -29,8 +29,6 @@ import warnings from matplotlib.cbook import IgnoredKeywordWarning -import sys -on_win = (sys.platform == 'win32') # Note: Some test cases are run twice: once normally and once with labeled data # These two must be defined in the same test function or need to have diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py index 7fd3f37ea9a8..b9ece19b36ef 100644 --- a/lib/matplotlib/tests/test_patheffects.py +++ b/lib/matplotlib/tests/test_patheffects.py @@ -17,9 +17,6 @@ import mock from nose.tools import assert_equal -import sys -on_win = (sys.platform == 'win32') - @image_comparison(baseline_images=['patheffect1'], remove_text=True) def test_patheffect1():