TST: update test images

- update to mpl20 style - re-generate as needed - bump threshold on pngsuite test
matplotlib · efiring · Aug 31, 2017 · Jul 30, 2017 · Aug 29, 2017 · Aug 29, 2017
commit 25090305364130cb6dd46c9bbc3a8d5c53d3b8b7
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow.pdf b/lib/matplotlib/tests/baseline_images/test_axes/imshow.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow.png b/lib/matplotlib/tests/baseline_images/test_axes/imshow.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg b/lib/matplotlib/tests/baseline_images/test_axes/imshow.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.png b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_clip.png b/lib/matplotlib/tests/baseline_images/test_image/image_clip.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg b/lib/matplotlib/tests/baseline_images/test_image/image_clip.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_cliprect.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_cliprect.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_cliprect.png b/lib/matplotlib/tests/baseline_images/test_image/image_cliprect.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_cliprect.svg b/lib/matplotlib/tests/baseline_images/test_image/image_cliprect.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_interps.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_interps.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_interps.png b/lib/matplotlib/tests/baseline_images/test_image/image_interps.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_interps.svg b/lib/matplotlib/tests/baseline_images/test_image/image_interps.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow.pdf b/lib/matplotlib/tests/baseline_images/test_image/imshow.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow.png b/lib/matplotlib/tests/baseline_images/test_image/imshow.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow.svg b/lib/matplotlib/tests/baseline_images/test_image/imshow.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png b/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png
diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.pdf b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_image/zoom_and_clip_upper_origin.png b/lib/matplotlib/tests/baseline_images/test_image/zoom_and_clip_upper_origin.png
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.pdf b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.png b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.png
diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.svg b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect2.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png b/lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -833,7 +833,7 @@ def test_nonfinite_limits():
 
 
 @image_comparison(baseline_images=['imshow', 'imshow'],
-                  remove_text=True)
+                  remove_text=True, style='mpl20')
 def test_imshow():
     # Create a NxN image
     N = 100
@@ -855,7 +855,7 @@ def test_imshow():
     ax.imshow("r", data=data)
 
 
-@image_comparison(baseline_images=['imshow_clip'])
+@image_comparison(baseline_images=['imshow_clip'], style='mpl20')
 def test_imshow_clip():
     # As originally reported by Gellule Xg <[email protected]>
 

diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -34,7 +34,7 @@
 needs_pillow = pytest.mark.xfail(not HAS_PIL, reason='Test requires Pillow')
 
 
-@image_comparison(baseline_images=['image_interps'])
+@image_comparison(baseline_images=['image_interps'], style='mpl20')
 def test_image_interps():
     'make the basic nearest, bilinear and bicubic interps'
     X = np.arange(100)
@@ -248,7 +248,7 @@ def test_cursor_data():
     assert z is None, "Did not get None, got %d" % z
 
 
-@image_comparison(baseline_images=['image_clip'])
+@image_comparison(baseline_images=['image_clip'], style='mpl20')
 def test_image_clip():
     d = [[1, 2], [3, 4]]
 
@@ -258,7 +258,7 @@ def test_image_clip():
     im.set_clip_path(patch)
 
 
-@image_comparison(baseline_images=['image_cliprect'])
+@image_comparison(baseline_images=['image_cliprect'], style='mpl20')
 def test_image_cliprect():
     import matplotlib.patches as patches
 
@@ -271,7 +271,8 @@ def test_image_cliprect():
     rect = patches.Rectangle(xy=(1,1), width=2, height=2, transform=im.axes.transData)
     im.set_clip_path(rect)
 
-@image_comparison(baseline_images=['imshow'], remove_text=True)
+
+@image_comparison(baseline_images=['imshow'], remove_text=True, style='mpl20')
 def test_imshow():
     import numpy as np
     import matplotlib.pyplot as plt
@@ -334,7 +335,10 @@ def test_image_edges():
 
     assert g != 100, 'Expected a non-green edge - but sadly, it was.'
 
-@image_comparison(baseline_images=['image_composite_background'], remove_text=True)
+
+@image_comparison(baseline_images=['image_composite_background'],
+                  remove_text=True,
+                  style='mpl20')
 def test_image_composite_background():
     fig = plt.figure()
     ax = fig.add_subplot(111)
@@ -344,7 +348,9 @@ def test_image_composite_background():
     ax.set_facecolor((1, 0, 0, 0.5))
     ax.set_xlim([0, 12])
 
-@image_comparison(baseline_images=['image_composite_alpha'], remove_text=True)
+
+@image_comparison(baseline_images=['image_composite_alpha'],
+                  remove_text=True)
 def test_image_composite_alpha():
     """
     Tests that the alpha value is recognized and correctly applied in the
@@ -370,7 +376,9 @@ def test_image_composite_alpha():
     ax.set_ylim([5, 0])
 
 
-@image_comparison(baseline_images=['rasterize_10dpi'], extensions=['pdf','svg'], remove_text=True)
+@image_comparison(baseline_images=['rasterize_10dpi'],
+                  extensions=['pdf', 'svg'],
+                  remove_text=True, style='mpl20')
 def test_rasterize_dpi():
     # This test should check rasterized rendering with high output resolution.
     # It plots a rasterized line and a normal image with implot. So it will catch
@@ -403,7 +411,8 @@ def test_rasterize_dpi():
     rcParams['savefig.dpi'] = 10
 
 
-@image_comparison(baseline_images=['bbox_image_inverted'], remove_text=True)
+@image_comparison(baseline_images=['bbox_image_inverted'], remove_text=True,
+                  style='mpl20')
 def test_bbox_image_inverted():
     # This is just used to produce an image to feed to BboxImage
     image = np.arange(100).reshape((10, 10))
@@ -449,7 +458,8 @@ def test_get_window_extent_for_AxisImage():
 
 @image_comparison(baseline_images=['zoom_and_clip_upper_origin'],
                   remove_text=True,
-                  extensions=['png'])
+                  extensions=['png'],
+                  style='mpl20')
 def test_zoom_and_clip_upper_origin():
     image = np.arange(100)
     image = image.reshape((10, 10))
@@ -727,7 +737,7 @@ def test_imshow_endianess():
 
 
 @image_comparison(baseline_images=['imshow_masked_interpolation'],
-                  remove_text=True, style='default')
+                  remove_text=True, style='mpl20')
 def test_imshow_masked_interpolation():
 
     cm = copy(plt.get_cmap('viridis'))

diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
@@ -27,7 +27,8 @@ def test_patheffect1():
     ax1.grid(True, linestyle="-", path_effects=pe)
 
 
-@image_comparison(baseline_images=['patheffect2'], remove_text=True)
+@image_comparison(baseline_images=['patheffect2'], remove_text=True,
+                  style='mpl20')
 def test_patheffect2():
 
     ax2 = plt.subplot(111)

diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
@@ -42,7 +42,8 @@ def test_simple():
 
 
 @image_comparison(baseline_images=['multi_pickle'],
-                  extensions=['png'], remove_text=True)
+                  extensions=['png'], remove_text=True,
+                  style='mpl20')
 def test_complete():
     fig = plt.figure('Figure with a label?', figsize=(10, 6))
 

diff --git a/lib/matplotlib/tests/test_png.py b/lib/matplotlib/tests/test_png.py
@@ -17,7 +17,7 @@
 
 
 @image_comparison(baseline_images=['pngsuite'], extensions=['png'],
-                  tol=0.02 if on_win else 0)
+                  tol=0.03)
 def test_pngsuite():
     dirname = os.path.join(
         os.path.dirname(__file__),

diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png
diff --git a/lib/mpl_toolkits/tests/test_axes_grid.py b/lib/mpl_toolkits/tests/test_axes_grid.py
@@ -7,7 +7,8 @@
 
 @image_comparison(baseline_images=['imagegrid_cbar_mode'],
                   extensions=['png'],
-                  remove_text=True)
+                  remove_text=True,
+                  style='mpl20')
 def test_imagegrid_cbar_mode_edge():
     X, Y = np.meshgrid(np.linspace(0, 6, 30), np.linspace(0, 6, 30))
     arr = np.sin(X) * np.cos(Y) + 1j*(np.sin(3*Y) * np.cos(Y/2.))