From f146998e2bf6db54dae926ceec57d2baa6003ea0 Mon Sep 17 00:00:00 2001

From: Elliott Sales de Andrade <quantum.analyst@gmail.com>

Date: Tue, 23 Jan 2018 20:22:05 -0500

Subject: [PATCH 2/4] Increase tolerances for FreeType 2.7.1.

Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>

---

 lib/matplotlib/testing/decorators.py    | 2 +-

 lib/matplotlib/tests/test_axes.py       | 5 ++---

 lib/matplotlib/tests/test_mathtext.py   | 4 ++--

 lib/matplotlib/tests/test_patches.py    | 3 +--

 lib/matplotlib/tests/test_streamplot.py | 3 +--

 lib/mpl_toolkits/tests/test_mplot3d.py  | 2 +-

 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py

index c5e069b31..ebd68cfab 100644

--- a/lib/matplotlib/testing/decorators.py

+++ b/lib/matplotlib/testing/decorators.py

@@ -406,7 +406,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol,

     return decorator

-def image_comparison(baseline_images, extensions=None, tol=0,

+def image_comparison(baseline_images, extensions=None, tol=0.1,

                      freetype_version=None, remove_text=False,

                      savefig_kwarg=None,

                      # Default of mpl_test_settings fixture and cleanup too.

diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py

index 7164d0cec..6492cc140 100644

--- a/lib/matplotlib/tests/test_axes.py

+++ b/lib/matplotlib/tests/test_axes.py

@@ -671,8 +671,7 @@ def test_polar_rlabel_position():

     ax.tick_params(rotation='auto')

-@image_comparison(baseline_images=['polar_theta_wedge'], style='default',

-                  tol=0.01 if six.PY2 else 0)

+@image_comparison(baseline_images=['polar_theta_wedge'], style='default')

 def test_polar_theta_limits():

     r = np.arange(0, 3.0, 0.01)

     theta = 2*np.pi*r

@@ -4679,7 +4678,7 @@ def test_rc_spines():

 @image_comparison(baseline_images=['rc_grid'], extensions=['png'],

-                  savefig_kwarg={'dpi': 40})

+                  savefig_kwarg={'dpi': 40}, tol=0.2)

 def test_rc_grid():

     fig = plt.figure()

     rc_dict0 = {

diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py

index 7ef77ce6a..b8c9c9e8b 100644

--- a/lib/matplotlib/tests/test_mathtext.py

+++ b/lib/matplotlib/tests/test_mathtext.py

@@ -174,7 +174,7 @@ def baseline_images(request, fontset, index):

                          ['cm', 'stix', 'stixsans', 'dejavusans',

                           'dejavuserif'])

 @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)

-@image_comparison(baseline_images=None)

+@image_comparison(baseline_images=None, tol=0.31)

 def test_mathtext_rendering(baseline_images, fontset, index, test):

     matplotlib.rcParams['mathtext.fontset'] = fontset

     fig = plt.figure(figsize=(5.25, 0.75))

@@ -188,7 +188,7 @@ def test_mathtext_rendering(baseline_images, fontset, index, test):

                          ['cm', 'stix', 'stixsans', 'dejavusans',

                           'dejavuserif'])

 @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)

-@image_comparison(baseline_images=None, extensions=['png'])

+@image_comparison(baseline_images=None, extensions=['png'], tol=0.3)

 def test_mathfont_rendering(baseline_images, fontset, index, test):

     matplotlib.rcParams['mathtext.fontset'] = fontset

     fig = plt.figure(figsize=(5.25, 0.75))

diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py

index 20ffa6b08..81737c84d 100644

--- a/lib/matplotlib/tests/test_patches.py

+++ b/lib/matplotlib/tests/test_patches.py

@@ -267,9 +267,8 @@ def test_wedge_movement():

         assert getattr(w, attr) == new_v

-# png needs tol>=0.06, pdf tol>=1.617

 @image_comparison(baseline_images=['wedge_range'],

-                  remove_text=True, tol=1.65 if on_win else 0)

+                  remove_text=True)

 def test_wedge_range():

     ax = plt.axes()

diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py

index 1d7e09fef..48f1e0683 100644

--- a/lib/matplotlib/tests/test_streamplot.py

+++ b/lib/matplotlib/tests/test_streamplot.py

@@ -40,8 +40,7 @@ def test_startpoints():

     plt.plot(start_x, start_y, 'ok')

-@image_comparison(baseline_images=['streamplot_colormap'],

-                  tol=.02)

+@image_comparison(baseline_images=['streamplot_colormap'])

 def test_colormap():

     X, Y, U, V = velocity_field()

     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,

diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py

index c157433c7..c13f3be2f 100644

--- a/lib/mpl_toolkits/tests/test_mplot3d.py

+++ b/lib/mpl_toolkits/tests/test_mplot3d.py

@@ -658,7 +658,7 @@ class TestVoxels(object):

     @image_comparison(

         baseline_images=['voxels-xyz'],

         extensions=['png'],

-        tol=0.01

+        tol=0.02

     )

     def test_xyz(self):

         fig, ax = plt.subplots(subplot_kw={"projection": "3d"})

-- 

2.14.3