TST: Increase tolerance on more arches

Not sure why this didn't hit Fedora when 3.10.0 was initially built, but
it is now during the F42 Mass Rebuild.

These tests are already covered by `arm64`-specific tolerances (aka
Apple Silicon), and while one or two won't need it, I've changed all of
these.

Additionally, instead of listing every single architecture, just
increase the tolerance on non-x86_64. Also, make a few tweaks to
existing conditions to make these all consistent.

Author: QuLogic

lib/matplotlib/tests/test_arrow_patches.py

@@ -12,7 +12,7 @@ def draw_arrow(ax, t, r):
 
 
 @image_comparison(['fancyarrow_test_image'],
-                  tol=0.012 if platform.machine() == 'arm64' else 0)
+                  tol=0.012 if platform.machine() != 'x86_64' else 0)
 def test_fancyarrow():
     # Added 0 to test division by zero error described in issue 3930
     r = [0.4, 0.3, 0.2, 0.1, 0]
@@ -68,7 +68,7 @@ def __prepare_fancyarrow_dpi_cor_test():
 
 
 @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
+                  tol=0.02 if platform.machine() != 'x86_64' else 0,
                   savefig_kwarg=dict(dpi=100))
 def test_fancyarrow_dpi_cor_100dpi():
     """
@@ -83,7 +83,7 @@ def test_fancyarrow_dpi_cor_100dpi():
 
 
 @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
+                  tol=0.02 if platform.machine() != 'x86_64' else 0,
                   savefig_kwarg=dict(dpi=200))
 def test_fancyarrow_dpi_cor_200dpi():
     """
@@ -116,7 +116,7 @@ def test_fancyarrow_dash():
 
 
 @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
+                  tol=0.02 if platform.machine() != 'x86_64' else 0)
 def test_arrow_styles():
     styles = mpatches.ArrowStyle.get_styles()
 
@@ -149,7 +149,7 @@ def test_arrow_styles():
 
 
 @image_comparison(['connection_styles.png'], style='mpl20', remove_text=True,
-                  tol=0.013 if platform.machine() == 'arm64' else 0)
+                  tol=0.013 if platform.machine() != 'x86_64' else 0)
 def test_connection_styles():
     styles = mpatches.ConnectionStyle.get_styles()
 

lib/matplotlib/tests/test_axes.py

@@ -243,7 +243,7 @@ def test_matshow(fig_test, fig_ref):
                    'formatter_ticker_004',
                    'formatter_ticker_005',
                    ],
-                  tol=0.031 if platform.machine() == 'arm64' else 0)
+                  tol=0.031 if platform.machine() != 'x86_64' else 0)
 def test_formatter_ticker():
     import matplotlib.testing.jpl_units as units
     units.register()
@@ -444,7 +444,7 @@ def test_twin_logscale(fig_test, fig_ref, twin):
 
 
 @image_comparison(['twin_autoscale.png'],
-                  tol=0.009 if platform.machine() == 'arm64' else 0)
+                  tol=0.009 if platform.machine() != 'x86_64' else 0)
 def test_twinx_axis_scales():
     x = np.array([0, 0.5, 1])
     y = 0.5 * x
@@ -1218,9 +1218,8 @@ def test_imshow():
     ax.imshow("r", data=data)
 
 
-@image_comparison(
-    ['imshow_clip'], style='mpl20',
-    tol=1.24 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x') else 0)
+@image_comparison(['imshow_clip'], style='mpl20',
+                  tol=1.24 if platform.machine() != 'x86_64' else 0)
 def test_imshow_clip():
     # As originally reported by Gellule Xg <[email protected]>
     # use former defaults to match existing baseline image
@@ -1299,7 +1298,7 @@ def test_fill_betweenx_input(y, x1, x2):
 
 
 @image_comparison(['fill_between_interpolate'], remove_text=True,
-                  tol=0.012 if platform.machine() == 'arm64' else 0)
+                  tol=0.012 if platform.machine() != 'x86_64' else 0)
 def test_fill_between_interpolate():
     x = np.arange(0.0, 2, 0.02)
     y1 = np.sin(2*np.pi*x)
@@ -1728,7 +1727,8 @@ def test_pcolorauto(fig_test, fig_ref, snap):
     ax.pcolormesh(x2, y2, Z, snap=snap)
 
 
-@image_comparison(['canonical'], tol=0.02 if platform.machine() == 'arm64' else 0)
+@image_comparison(['canonical'],
+                  tol=0.02 if platform.machine() != 'x86_64' else 0)
 def test_canonical():
     fig, ax = plt.subplots()
     ax.plot([1, 2, 3])
@@ -2653,9 +2653,8 @@ def test_contour_hatching():
                 extend='both', alpha=0.5)
 
 
-@image_comparison(
-    ['contour_colorbar'], style='mpl20',
-    tol=0.54 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x') else 0)
+@image_comparison(['contour_colorbar'], style='mpl20',
+                  tol=0.54 if platform.machine() != 'x86_64' else 0)
 def test_contour_colorbar():
     x, y, z = contour_dat()
 
@@ -3233,7 +3232,7 @@ def test_log_scales_invalid():
 
 
 @image_comparison(['stackplot_test_image', 'stackplot_test_image'],
-                  tol=0.031 if platform.machine() == 'arm64' else 0)
+                  tol=0.031 if platform.machine() != 'x86_64' else 0)
 def test_stackplot():
     fig = plt.figure()
     x = np.linspace(0, 10, 10)
@@ -5127,7 +5126,7 @@ def test_marker_styles():
 
 
 @image_comparison(['rc_markerfill.png'],
-                  tol=0.037 if platform.machine() == 'arm64' else 0)
+                  tol=0.037 if platform.machine() != 'x86_64' else 0)
 def test_markers_fillstyle_rcparams():
     fig, ax = plt.subplots()
     x = np.arange(7)
@@ -5150,7 +5149,7 @@ def test_vertex_markers():
 
 
 @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
-                  tol=0 if platform.machine() == 'x86_64' else 0.026)
+                  tol=0.026 if platform.machine() != 'x86_64' else 0)
 def test_eb_line_zorder():
     x = list(range(10))
 
@@ -5710,7 +5709,7 @@ def test_twin_remove(fig_test, fig_ref):
 
 
 @image_comparison(['twin_spines.png'], remove_text=True,
-                  tol=0.022 if platform.machine() == 'arm64' else 0)
+                  tol=0.022 if platform.machine() != 'x86_64' else 0)
 def test_twin_spines():
 
     def make_patch_spines_invisible(ax):
@@ -6307,7 +6306,7 @@ def test_pie_hatch_multi(fig_test, fig_ref):
 
 
 @image_comparison(['set_get_ticklabels.png'],
-                  tol=0.025 if platform.machine() == 'arm64' else 0)
+                  tol=0.025 if platform.machine() != 'x86_64' else 0)
 def test_set_get_ticklabels():
     # test issue 2246
     fig, ax = plt.subplots(2)
@@ -6900,7 +6899,7 @@ def test_loglog():
 
 
 @image_comparison(["test_loglog_nonpos.png"], remove_text=True, style='mpl20',
-                  tol=0.029 if platform.machine() == 'arm64' else 0)
+                  tol=0.029 if platform.machine() != 'x86_64' else 0)
 def test_loglog_nonpos():
     fig, axs = plt.subplots(3, 3)
     x = np.arange(1, 11)
@@ -7869,7 +7868,7 @@ def test_scatter_empty_data():
 
 
 @image_comparison(['annotate_across_transforms.png'], style='mpl20', remove_text=True,
-                  tol=0.025 if platform.machine() == 'arm64' else 0)
+                  tol=0.025 if platform.machine() != 'x86_64' else 0)
 def test_annotate_across_transforms():
     x = np.linspace(0, 10, 200)
     y = np.exp(-x) * np.sin(x)
@@ -7900,7 +7899,7 @@ def inverted(self):
 
 
 @image_comparison(['secondary_xy.png'], style='mpl20',
-                  tol=0.027 if platform.machine() == 'arm64' else 0)
+                  tol=0.027 if platform.machine() != 'x86_64' else 0)
 def test_secondary_xy():
     fig, axs = plt.subplots(1, 2, figsize=(10, 5), constrained_layout=True)
 
@@ -9163,10 +9162,8 @@ def test_zorder_and_explicit_rasterization():
         fig.savefig(b, format='pdf')
 
 
-@image_comparison(
-    ["preset_clip_paths.png"],
-    remove_text=True, style="mpl20",
-    tol=0.027 if platform.machine() in ("aarch64", "arm64", "ppc64le") else 0)
+@image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20",
+                  tol=0.027 if platform.machine() != 'x86_64' else 0)
 def test_preset_clip_paths():
     fig, ax = plt.subplots()
 
@@ -9500,7 +9497,7 @@ def test_boxplot_orientation(fig_test, fig_ref):
 
 
 @image_comparison(["use_colorizer_keyword.png"],
-                   tol=0.05 if platform.machine() == 'arm64' else 0)
+                   tol=0.05 if platform.machine() != 'x86_64' else 0)
 def test_use_colorizer_keyword():
     # test using the colorizer keyword
     np.random.seed(0)

lib/matplotlib/tests/test_bbox_tight.py

@@ -46,7 +46,7 @@ def test_bbox_inches_tight():
 
 @image_comparison(['bbox_inches_tight_suptile_legend'],
                   savefig_kwarg={'bbox_inches': 'tight'},
-                  tol=0.02 if platform.machine() == 'arm64' else 0)
+                  tol=0.02 if platform.machine() != 'x86_64' else 0)
 def test_bbox_inches_tight_suptile_legend():
     plt.plot(np.arange(10), label='a straight line')
     plt.legend(bbox_to_anchor=(0.9, 1), loc='upper left')

lib/matplotlib/tests/test_collections.py

@@ -391,7 +391,7 @@ def test_barb_limits():
 
 
 @image_comparison(['EllipseCollection_test_image.png'], remove_text=True,
-                  tol=0.021 if platform.machine() == 'arm64' else 0)
+                  tol=0.021 if platform.machine() != 'x86_64' else 0)
 def test_EllipseCollection():
     # Test basic functionality
     fig, ax = plt.subplots()

lib/matplotlib/tests/test_colorbar.py

@@ -235,7 +235,7 @@ def test_colorbar_single_ax_panchor_east(constrained):
 
 
 @image_comparison(['contour_colorbar.png'], remove_text=True,
-                  tol=0 if platform.machine() == 'x86_64' else 0.054)
+                  tol=0.054 if platform.machine() != 'x86_64' else 0)
 def test_contour_colorbar():
     fig, ax = plt.subplots(figsize=(4, 2))
     data = np.arange(1200).reshape(30, 40) - 500

lib/matplotlib/tests/test_constrainedlayout.py

@@ -198,7 +198,7 @@ def test_constrained_layout9():
 
 
 @image_comparison(['constrained_layout10.png'],
-                  tol=0.032 if platform.machine() == 'arm64' else 0)
+                  tol=0.032 if platform.machine() != 'x86_64' else 0)
 def test_constrained_layout10():
     """Test for handling legend outside axis"""
     fig, axs = plt.subplots(2, 2, layout="constrained")

lib/matplotlib/tests/test_contour.py

@@ -140,7 +140,7 @@ def test_contour_label_with_disconnected_segments():
 
 
 @image_comparison(['contour_manual_colors_and_levels.png'], remove_text=True,
-                  tol=0.018 if platform.machine() == 'arm64' else 0)
+                  tol=0.018 if platform.machine() != 'x86_64' else 0)
 def test_given_colors_levels_and_extends():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
@@ -416,10 +416,8 @@ def test_contourf_log_extension():
     cb = plt.colorbar(c3, ax=ax3)
 
 
-@image_comparison(
-    ['contour_addlines.png'], remove_text=True, style='mpl20',
-    tol=0.15 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x')
-        else 0.03)
+@image_comparison(['contour_addlines.png'], remove_text=True, style='mpl20',
+                  tol=0.15 if platform.machine() != 'x86_64' else 0.03)
 # tolerance is because image changed minutely when tick finding on
 # colorbars was cleaned up...
 def test_contour_addlines():

lib/matplotlib/tests/test_figure.py

@@ -26,7 +26,7 @@
 
 
 @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
+                  tol=0.01 if platform.machine() != 'x86_64' else 0)
 def test_align_labels():
     fig = plt.figure(layout='tight')
     gs = gridspec.GridSpec(3, 3)
@@ -68,7 +68,7 @@ def test_align_labels():
 
 @image_comparison(['figure_align_titles_tight.png',
                    'figure_align_titles_constrained.png'],
-                  tol=0 if platform.machine() == 'x86_64' else 0.022,
+                  tol=0.022 if platform.machine() != 'x86_64' else 0,
                   style='mpl20')
 def test_align_titles():
     for layout in ['tight', 'constrained']:
@@ -210,7 +210,7 @@ def test_clf_keyword():
 
 
 @image_comparison(['figure_today'],
-                  tol=0.015 if platform.machine() == 'arm64' else 0)
+                  tol=0.015 if platform.machine() != 'x86_64' else 0)
 def test_figure():
     # named figure support
     fig = plt.figure('today')

lib/matplotlib/tests/test_image.py

@@ -925,7 +925,7 @@ def test_imshow_endianess():
 
 
 @image_comparison(['imshow_masked_interpolation'],
-                  tol=0 if platform.machine() == 'x86_64' else 0.01,
+                  tol=0.01 if platform.machine() != 'x86_64' else 0,
                   remove_text=True, style='mpl20')
 def test_imshow_masked_interpolation():
 

lib/matplotlib/tests/test_legend.py

@@ -140,7 +140,7 @@ def test_various_labels():
 
 
 @image_comparison(['legend_labels_first.png'], remove_text=True,
-                  tol=0.013 if platform.machine() == 'arm64' else 0)
+                  tol=0.013 if platform.machine() != 'x86_64' else 0)
 def test_labels_first():
     # test labels to left of markers
     fig, ax = plt.subplots()
@@ -151,7 +151,7 @@ def test_labels_first():
 
 
 @image_comparison(['legend_multiple_keys.png'], remove_text=True,
-                  tol=0.013 if platform.machine() == 'arm64' else 0)
+                  tol=0.013 if platform.machine() != 'x86_64' else 0)
 def test_multiple_keys():
     # test legend entries with multiple keys
     fig, ax = plt.subplots()
@@ -165,7 +165,7 @@ def test_multiple_keys():
 
 
 @image_comparison(['rgba_alpha.png'], remove_text=True,
-                  tol=0 if platform.machine() == 'x86_64' else 0.03)
+                  tol=0.03 if platform.machine() != 'x86_64' else 0)
 def test_alpha_rgba():
     fig, ax = plt.subplots()
     ax.plot(range(10), lw=5)
@@ -174,7 +174,7 @@ def test_alpha_rgba():
 
 
 @image_comparison(['rcparam_alpha.png'], remove_text=True,
-                  tol=0 if platform.machine() == 'x86_64' else 0.03)
+                  tol=0.03 if platform.machine() != 'x86_64' else 0)
 def test_alpha_rcparam():
     fig, ax = plt.subplots()
     ax.plot(range(10), lw=5)
@@ -202,7 +202,7 @@ def test_fancy():
 
 
 @image_comparison(['framealpha'], remove_text=True,
-                  tol=0 if platform.machine() == 'x86_64' else 0.024)
+                  tol=0.024 if platform.machine() != 'x86_64' else 0)
 def test_framealpha():
     x = np.linspace(1, 100, 100)
     y = x
@@ -514,7 +514,7 @@ def test_figure_legend_outside():
 
 
 @image_comparison(['legend_stackplot.png'],
-                  tol=0.031 if platform.machine() == 'arm64' else 0)
+                  tol=0.031 if platform.machine() != 'x86_64' else 0)
 def test_legend_stackplot():
     """Test legend for PolyCollection using stackplot."""
     # related to #1341, #1943, and PR #3303
@@ -650,7 +650,7 @@ def test_empty_bar_chart_with_legend():
 
 
 @image_comparison(['shadow_argument_types.png'], remove_text=True, style='mpl20',
-                  tol=0.028 if platform.machine() == 'arm64' else 0)
+                  tol=0.028 if platform.machine() != 'x86_64' else 0)
 def test_shadow_argument_types():
     # Test that different arguments for shadow work as expected
     fig, ax = plt.subplots()