268 lines
11 KiB
Diff
268 lines
11 KiB
Diff
From b35bcac297de5fbf24a093c0a0121856ba7a7b41 Mon Sep 17 00:00:00 2001
|
|
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
Date: Sat, 31 Mar 2018 00:33:37 -0400
|
|
Subject: [PATCH 3/3] Increase some tolerances for non-x86 arches.
|
|
|
|
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
---
|
|
lib/matplotlib/tests/test_arrow_patches.py | 4 ++--
|
|
lib/matplotlib/tests/test_axes.py | 7 ++++---
|
|
lib/matplotlib/tests/test_collections.py | 2 +-
|
|
lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
|
|
lib/matplotlib/tests/test_cycles.py | 6 +++---
|
|
lib/matplotlib/tests/test_figure.py | 2 +-
|
|
lib/matplotlib/tests/test_image.py | 2 +-
|
|
lib/matplotlib/tests/test_legend.py | 6 +++---
|
|
lib/matplotlib/tests/test_pickle.py | 2 +-
|
|
lib/matplotlib/tests/test_scale.py | 2 +-
|
|
lib/matplotlib/tests/test_streamplot.py | 2 +-
|
|
lib/matplotlib/tests/test_units.py | 4 ++--
|
|
lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py | 2 +-
|
|
13 files changed, 22 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
|
|
index 44f87c5fe..fb50ae710 100644
|
|
--- a/lib/matplotlib/tests/test_arrow_patches.py
|
|
+++ b/lib/matplotlib/tests/test_arrow_patches.py
|
|
@@ -68,7 +68,7 @@ def __prepare_fancyarrow_dpi_cor_test():
|
|
|
|
|
|
@image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'],
|
|
- remove_text=True, extensions=['png'],
|
|
+ remove_text=True, extensions=['png'], tol=0.016,
|
|
savefig_kwarg=dict(dpi=100))
|
|
def test_fancyarrow_dpi_cor_100dpi():
|
|
"""
|
|
@@ -83,7 +83,7 @@ def test_fancyarrow_dpi_cor_100dpi():
|
|
|
|
|
|
@image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'],
|
|
- remove_text=True, extensions=['png'],
|
|
+ remove_text=True, extensions=['png'], tol=0.019,
|
|
savefig_kwarg=dict(dpi=200))
|
|
def test_fancyarrow_dpi_cor_200dpi():
|
|
"""
|
|
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
|
|
index 77ec92b01..49a4d9290 100644
|
|
--- a/lib/matplotlib/tests/test_axes.py
|
|
+++ b/lib/matplotlib/tests/test_axes.py
|
|
@@ -389,7 +389,7 @@ def test_annotate_default_arrow():
|
|
assert ann.arrow_patch is not None
|
|
|
|
|
|
-@image_comparison(baseline_images=['polar_axes'], style='default')
|
|
+@image_comparison(baseline_images=['polar_axes'], style='default', tol=0.01)
|
|
def test_polar_annotations():
|
|
# you can specify the xypoint and the xytext in different
|
|
# positions and coordinate systems, and optionally turn on a
|
|
@@ -3284,7 +3284,8 @@ def test_vertex_markers():
|
|
|
|
|
|
@image_comparison(baseline_images=['vline_hline_zorder',
|
|
- 'errorbar_zorder'])
|
|
+ 'errorbar_zorder'],
|
|
+ tol=0.02)
|
|
def test_eb_line_zorder():
|
|
x = list(xrange(10))
|
|
|
|
@@ -5017,7 +5018,7 @@ def test_title_location_roundtrip():
|
|
|
|
|
|
@image_comparison(baseline_images=["loglog"], remove_text=True,
|
|
- extensions=['png'])
|
|
+ extensions=['png'], tol=0.009)
|
|
def test_loglog():
|
|
fig, ax = plt.subplots()
|
|
x = np.arange(1, 11)
|
|
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
|
|
index 291647d17..6b623ef52 100644
|
|
--- a/lib/matplotlib/tests/test_collections.py
|
|
+++ b/lib/matplotlib/tests/test_collections.py
|
|
@@ -443,7 +443,7 @@ def test_barb_limits():
|
|
|
|
|
|
@image_comparison(baseline_images=['EllipseCollection_test_image'],
|
|
- extensions=['png'],
|
|
+ extensions=['png'], tol=0.012,
|
|
remove_text=True)
|
|
def test_EllipseCollection():
|
|
# Test basic functionality
|
|
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
|
|
index 9c36fb247..3834e4e26 100644
|
|
--- a/lib/matplotlib/tests/test_constrainedlayout.py
|
|
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
|
|
@@ -223,7 +223,7 @@ def test_constrained_layout9():
|
|
|
|
|
|
@image_comparison(baseline_images=['constrained_layout10'],
|
|
- extensions=['png'])
|
|
+ extensions=['png'], tol=0.01)
|
|
def test_constrained_layout10():
|
|
'Test for handling legend outside axis'
|
|
fig, axs = plt.subplots(2, 2, constrained_layout=True)
|
|
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
|
|
index 95611f36c..0a118b636 100644
|
|
--- a/lib/matplotlib/tests/test_cycles.py
|
|
+++ b/lib/matplotlib/tests/test_cycles.py
|
|
@@ -10,7 +10,7 @@ from cycler import cycler
|
|
|
|
|
|
@image_comparison(baseline_images=['color_cycle_basic'], remove_text=True,
|
|
- extensions=['png'])
|
|
+ extensions=['png'], tol=0.008)
|
|
def test_colorcycle_basic():
|
|
fig = plt.figure()
|
|
ax = fig.add_subplot(111)
|
|
@@ -28,7 +28,7 @@ def test_colorcycle_basic():
|
|
|
|
|
|
@image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
|
|
- remove_text=True, extensions=['png'])
|
|
+ remove_text=True, extensions=['png'], tol=0.008)
|
|
def test_marker_cycle():
|
|
fig = plt.figure()
|
|
ax = fig.add_subplot(111)
|
|
@@ -63,7 +63,7 @@ def test_marker_cycle():
|
|
|
|
|
|
@image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
|
|
- extensions=['png'])
|
|
+ extensions=['png'], tol=0.009)
|
|
def test_linestylecycle_basic():
|
|
fig = plt.figure()
|
|
ax = fig.add_subplot(111)
|
|
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
|
|
index 229ce192c..0e7a10d46 100644
|
|
--- a/lib/matplotlib/tests/test_figure.py
|
|
+++ b/lib/matplotlib/tests/test_figure.py
|
|
@@ -14,7 +14,7 @@ import numpy as np
|
|
import pytest
|
|
|
|
|
|
-@image_comparison(baseline_images=['figure_align_labels'])
|
|
+@image_comparison(baseline_images=['figure_align_labels'], tol=0.01)
|
|
def test_align_labels():
|
|
# Check the figure.align_labels() command
|
|
fig = plt.figure(tight_layout=True)
|
|
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
|
|
index 26e3b4a7e..2c7cedf74 100644
|
|
--- a/lib/matplotlib/tests/test_image.py
|
|
+++ b/lib/matplotlib/tests/test_image.py
|
|
@@ -784,7 +784,7 @@ def test_imshow_endianess():
|
|
|
|
|
|
@image_comparison(baseline_images=['imshow_masked_interpolation'],
|
|
- remove_text=True, style='mpl20')
|
|
+ remove_text=True, style='mpl20', tol=0.006)
|
|
def test_imshow_masked_interpolation():
|
|
|
|
cm = copy(plt.get_cmap('viridis'))
|
|
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
|
|
index 55b8adc77..1784ff966 100644
|
|
--- a/lib/matplotlib/tests/test_legend.py
|
|
+++ b/lib/matplotlib/tests/test_legend.py
|
|
@@ -145,7 +145,7 @@ def test_multiple_keys():
|
|
|
|
|
|
@image_comparison(baseline_images=['rgba_alpha'],
|
|
- extensions=['png'], remove_text=True)
|
|
+ extensions=['png'], remove_text=True, tol=0.007)
|
|
def test_alpha_rgba():
|
|
import matplotlib.pyplot as plt
|
|
|
|
@@ -156,7 +156,7 @@ def test_alpha_rgba():
|
|
|
|
|
|
@image_comparison(baseline_images=['rcparam_alpha'],
|
|
- extensions=['png'], remove_text=True)
|
|
+ extensions=['png'], remove_text=True, tol=0.007)
|
|
def test_alpha_rcparam():
|
|
import matplotlib.pyplot as plt
|
|
|
|
@@ -183,7 +183,7 @@ def test_fancy():
|
|
ncol=2, shadow=True, title="My legend", numpoints=1)
|
|
|
|
|
|
-@image_comparison(baseline_images=['framealpha'], remove_text=True)
|
|
+@image_comparison(baseline_images=['framealpha'], remove_text=True, tol=0.018)
|
|
def test_framealpha():
|
|
x = np.linspace(1, 100, 100)
|
|
y = x
|
|
diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
|
|
index 89a5a512e..99051dee7 100644
|
|
--- a/lib/matplotlib/tests/test_pickle.py
|
|
+++ b/lib/matplotlib/tests/test_pickle.py
|
|
@@ -42,7 +42,7 @@ def test_simple():
|
|
|
|
@image_comparison(baseline_images=['multi_pickle'],
|
|
extensions=['png'], remove_text=True,
|
|
- style='mpl20')
|
|
+ style='mpl20', tol=0.004)
|
|
def test_complete():
|
|
fig = plt.figure('Figure with a label?', figsize=(10, 6))
|
|
|
|
diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
|
|
index c50a0a896..a33fcccf0 100644
|
|
--- a/lib/matplotlib/tests/test_scale.py
|
|
+++ b/lib/matplotlib/tests/test_scale.py
|
|
@@ -97,7 +97,7 @@ def test_logscale_transform_repr():
|
|
|
|
|
|
@image_comparison(baseline_images=['logscale_nonpos_values'], remove_text=True,
|
|
- extensions=['png'], style='mpl20')
|
|
+ extensions=['png'], style='mpl20', tol=0.008)
|
|
def test_logscale_nonpos_values():
|
|
np.random.seed(19680801)
|
|
xs = np.random.normal(size=int(1e3))
|
|
diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
|
|
index 4f70ce861..4e52ed0c4 100644
|
|
--- a/lib/matplotlib/tests/test_streamplot.py
|
|
+++ b/lib/matplotlib/tests/test_streamplot.py
|
|
@@ -48,7 +48,7 @@ def test_colormap():
|
|
plt.colorbar()
|
|
|
|
|
|
-@image_comparison(baseline_images=['streamplot_linewidth'])
|
|
+@image_comparison(baseline_images=['streamplot_linewidth'], tol=0.002)
|
|
def test_linewidth():
|
|
X, Y, U, V = velocity_field()
|
|
speed = np.sqrt(U*U + V*V)
|
|
diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
|
|
index 65c8da7ea..c69d1d531 100644
|
|
--- a/lib/matplotlib/tests/test_units.py
|
|
+++ b/lib/matplotlib/tests/test_units.py
|
|
@@ -43,7 +43,7 @@ class Quantity(object):
|
|
|
|
# Tests that the conversion machinery works properly for classes that
|
|
# work as a facade over numpy arrays (like pint)
|
|
-@image_comparison(baseline_images=['plot_pint'],
|
|
+@image_comparison(baseline_images=['plot_pint'], tol=0.003,
|
|
extensions=['png'], remove_text=False, style='mpl20')
|
|
def test_numpy_facade():
|
|
# Create an instance of the conversion interface and
|
|
@@ -87,7 +87,7 @@ def test_numpy_facade():
|
|
|
|
|
|
# Tests gh-8908
|
|
-@image_comparison(baseline_images=['plot_masked_units'],
|
|
+@image_comparison(baseline_images=['plot_masked_units'], tol=0.007,
|
|
extensions=['png'], remove_text=True, style='mpl20')
|
|
def test_plot_masked_units():
|
|
data = np.linspace(-5, 5)
|
|
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
|
|
index a7c637428..8fc5b25b1 100644
|
|
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
|
|
+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
|
|
@@ -91,7 +91,7 @@ def test_custom_transform():
|
|
|
|
|
|
@image_comparison(baseline_images=['polar_box'],
|
|
- extensions=['png'], style='default', tol=0.03)
|
|
+ extensions=['png'], style='default', tol=0.04)
|
|
def test_polar_box():
|
|
fig = plt.figure(figsize=(5, 5))
|
|
|
|
--
|
|
2.14.3
|
|
|