From da6d5c3ab3921f5deea4f4addc079e8a0516d6b1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 13 Apr 2020 05:53:33 -0400 Subject: [PATCH] Update to latest beta version. --- .gitignore | 1 + 0001-Increase-tolerance-for-new-FreeType.patch | 12 ++++++------ python-cartopy.spec | 11 +++++++---- sources | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6d6d3a7..e8c5e5f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /Cartopy-norm-images.tar.xz /Cartopy-0.17.0.tar.gz /Cartopy-0.18.0b1.tar.gz +/Cartopy-0.18.0b2.tar.gz diff --git a/0001-Increase-tolerance-for-new-FreeType.patch b/0001-Increase-tolerance-for-new-FreeType.patch index eb929dc..b2d2e5e 100644 --- a/0001-Increase-tolerance-for-new-FreeType.patch +++ b/0001-Increase-tolerance-for-new-FreeType.patch @@ -1,4 +1,4 @@ -From 4dab0f840ab74ba455c21db1eb94f2afca89a89e Mon Sep 17 00:00:00 2001 +From 158666202a99c38dd99002e4fb7fea48d55f56e3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 26 Feb 2018 02:42:50 -0500 Subject: [PATCH] Increase tolerance for new FreeType. @@ -10,10 +10,10 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/cartopy/tests/mpl/test_examples.py b/lib/cartopy/tests/mpl/test_examples.py -index 25edb13..30b5cf2 100644 +index 71c15453..e3ab3660 100644 --- a/lib/cartopy/tests/mpl/test_examples.py +++ b/lib/cartopy/tests/mpl/test_examples.py -@@ -54,7 +54,7 @@ if MPL_VERSION < '2': +@@ -56,7 +56,7 @@ elif MPL_VERSION <= '2.0.2': elif MPL_VERSION <= '2.1.2': contour_labels_tolerance = 0.63 else: @@ -23,12 +23,12 @@ index 25edb13..30b5cf2 100644 @pytest.mark.natural_earth diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py -index a7067e6..9dd4273 100644 +index a268d366..04242fdc 100644 --- a/lib/cartopy/tests/mpl/test_gridliner.py +++ b/lib/cartopy/tests/mpl/test_gridliner.py -@@ -174,6 +174,11 @@ elif (6, 0, 0) <= ccrs.PROJ4_VERSION: +@@ -161,6 +161,11 @@ elif (6, 0, 0) <= ccrs.PROJ4_VERSION: # Better Robinson projection causes some text movement. - grid_label_inline_tol += 1.1 + grid_label_inline_tol += 1.2 +# Force higher tolerance due to new FreeType on Fedora. +grid_label_tol = 15 diff --git a/python-cartopy.spec b/python-cartopy.spec index de3c310..25702f8 100644 --- a/python-cartopy.spec +++ b/python-cartopy.spec @@ -5,13 +5,13 @@ %bcond_with network Name: python-%{srcname} -Version: 0.18.0~b1 +Version: 0.18.0~b2 Release: 1%{?dist} Summary: Cartographic Python library with Matplotlib visualisations License: LGPLv3 URL: http://scitools.org.uk/cartopy/docs/latest/ -Source0: %pypi_source %{Srcname} 0.18.0b1 +Source0: %pypi_source %{Srcname} 0.18.0b2 # Set location of Fedora-provided pre-existing data. Source1: siteconfig.py # Might not go upstream in current form. @@ -94,7 +94,7 @@ Data files for %{srcname}. %prep -%autosetup -n %{Srcname}-0.18.0b1 -p1 +%autosetup -n %{Srcname}-0.18.0b2 -p1 cp -a %SOURCE1 lib/cartopy/ # Remove bundled egg-info @@ -132,10 +132,13 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" PYTHONDONTWRITEBYTECODE=1 MPLBACKEN %files -n python3-%{srcname} %{python3_sitearch}/cartopy -%{python3_sitearch}/%{Srcname}-0.18.0b1-py?.?.egg-info +%{python3_sitearch}/%{Srcname}-0.18.0b2-py*.egg-info %changelog +* Mon Apr 13 2020 Elliott Sales de Andrade - 0.18.0~b2-1 +- Update to latest beta + * Mon Feb 10 2020 Elliott Sales de Andrade - 0.18.0~b1-1 - Update to latest beta diff --git a/sources b/sources index d8d1f2b..edf4a18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Cartopy-0.18.0b1.tar.gz) = 156ac89d5ba02c51f423a5e27b8dbf38cc4eaccc0840c0f8de4d955107450f439d34221291bf5cbd882225662e7386554ac00d28de6e8e0a1a24bb45a29714e3 +SHA512 (Cartopy-0.18.0b2.tar.gz) = ff6d767e940bcd89ca01d7d97e1e3efaa5979e6d96c4495c718f2c8161cb22a99e1164e8c91ac6125290f6e856d099797b7099763bc296c1d1583e9b79804bc5