|
 |
4ebb491 |
From 95dc2e69ced6d28d1a9490603f860a060765dfdb Mon Sep 17 00:00:00 2001
|
|
|
7a0e839 |
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
7a0e839 |
Date: Mon, 26 Feb 2018 02:42:50 -0500
|
|
|
0cf216b |
Subject: [PATCH] Increase tolerance for new FreeType.
|
|
|
7a0e839 |
|
|
|
7a0e839 |
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
7a0e839 |
---
|
|
|
6f9ce12 |
lib/cartopy/tests/mpl/test_examples.py | 2 +-
|
|
|
6f9ce12 |
lib/cartopy/tests/mpl/test_gridliner.py | 5 +++++
|
|
|
6f9ce12 |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
7a0e839 |
|
|
|
6f9ce12 |
diff --git a/lib/cartopy/tests/mpl/test_examples.py b/lib/cartopy/tests/mpl/test_examples.py
|
|
|
da6d5c3 |
index 71c15453..e3ab3660 100644
|
|
|
6f9ce12 |
--- a/lib/cartopy/tests/mpl/test_examples.py
|
|
|
6f9ce12 |
+++ b/lib/cartopy/tests/mpl/test_examples.py
|
|
|
da6d5c3 |
@@ -56,7 +56,7 @@ elif MPL_VERSION <= '2.0.2':
|
|
|
6f9ce12 |
elif MPL_VERSION <= '2.1.2':
|
|
|
6f9ce12 |
contour_labels_tolerance = 0.63
|
|
|
6f9ce12 |
else:
|
|
|
6f9ce12 |
- contour_labels_tolerance = 0
|
|
|
6f9ce12 |
+ contour_labels_tolerance = 9.8
|
|
|
6f9ce12 |
|
|
|
6f9ce12 |
|
|
|
6f9ce12 |
@pytest.mark.natural_earth
|
|
|
7a0e839 |
diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py
|
|
|
4ebb491 |
index 80c40c6c..5724e939 100644
|
|
|
7a0e839 |
--- a/lib/cartopy/tests/mpl/test_gridliner.py
|
|
|
7a0e839 |
+++ b/lib/cartopy/tests/mpl/test_gridliner.py
|
|
|
4ebb491 |
@@ -165,6 +165,11 @@ elif (6, 0, 0) <= ccrs.PROJ4_VERSION:
|
|
|
6f9ce12 |
# Better Robinson projection causes some text movement.
|
|
|
da6d5c3 |
grid_label_inline_tol += 1.2
|
|
|
7a0e839 |
|
|
|
6f9ce12 |
+# Force higher tolerance due to new FreeType on Fedora.
|
|
|
6f9ce12 |
+grid_label_tol = 15
|
|
|
6f9ce12 |
+grid_label_inline_tol = 10.2
|
|
|
6f9ce12 |
+grid_label_inline_usa_tol = 11.5
|
|
|
7a0e839 |
+
|
|
|
7a0e839 |
|
|
|
7a0e839 |
@pytest.mark.natural_earth
|
|
|
6f9ce12 |
@ImageTesting([grid_label_image], tolerance=grid_label_tol)
|
|
|
7a0e839 |
--
|
|
|
6f9ce12 |
2.21.1
|
|
|
7a0e839 |
|