[Git][debian-gis-team/python-cartopy][master] 2 commits: Add patch to fix test failure with GEOS 3.9.1.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-cartopy


Commits:
fb9cec4b by Bas Couwenberg at 2021-08-16T21:17:30+02:00
Add patch to fix test failure with GEOS 3.9.1.

- - - - -
bdf1bc16 by Bas Couwenberg at 2021-08-16T21:17:39+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/test_gridliner.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-cartopy (0.19.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to fix test failure with GEOS 3.9.1.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 16 Aug 2021 21:17:31 +0200
+
 python-cartopy (0.19.0+dfsg-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 0001-Skip-tests-failing-on-i386-architectures.patch
 test_robinson.patch
+test_gridliner.patch


=====================================
debian/patches/test_gridliner.patch
=====================================
@@ -0,0 +1,51 @@
+Description: Also skip tests with GEOS 3.9.1+.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/lib/cartopy/tests/mpl/test_gridliner.py
++++ b/lib/cartopy/tests/mpl/test_gridliner.py
+@@ -137,7 +137,7 @@ grid_label_inline_image = 'gridliner_lab
+ grid_label_inline_usa_image = 'gridliner_labels_inline_usa'
+ 
+ 
+- at pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug")
++ at pytest.mark.skipif(geos_version >= (3, 9, 0), reason="GEOS intersection bug")
+ @pytest.mark.natural_earth
+ @ImageTesting([grid_label_image], tolerance=grid_label_tol)
+ def test_grid_labels():
+@@ -211,7 +211,7 @@ def test_grid_labels():
+ @pytest.mark.skipif(
+     MPL_VERSION < '3.0.0',
+     reason='Impossible to override tight layout algorithm in mpl < 3')
+- at pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug")
++ at pytest.mark.skipif(geos_version >= (3, 9, 0), reason="GEOS intersection bug")
+ @pytest.mark.natural_earth
+ @ImageTesting(['gridliner_labels_tight'],
+               tolerance=grid_label_tol if ccrs.PROJ4_VERSION < (7, 1, 0)
+@@ -254,7 +254,7 @@ def test_grid_labels_tight():
+             assert hasattr(gl, '_plotted') and gl._plotted
+ 
+ 
+- at pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug")
++ at pytest.mark.skipif(geos_version >= (3, 9, 0), reason="GEOS intersection bug")
+ @pytest.mark.natural_earth
+ @ImageTesting([grid_label_inline_image], tolerance=grid_label_inline_tol)
+ def test_grid_labels_inline():
+@@ -278,7 +278,7 @@ def test_grid_labels_inline():
+     plt.subplots_adjust(wspace=0.35, hspace=0.35)
+ 
+ 
+- at pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug")
++ at pytest.mark.skipif(geos_version >= (3, 9, 0), reason="GEOS intersection bug")
+ @pytest.mark.natural_earth
+ @ImageTesting([grid_label_inline_usa_image],
+               tolerance=grid_label_inline_usa_tol)
+@@ -313,7 +313,7 @@ def test_grid_labels_inline_usa():
+     plt.subplots_adjust(wspace=0.35, hspace=0.35)
+ 
+ 
+- at pytest.mark.skipif(geos_version == (3, 9, 0), reason="GEOS intersection bug")
++ at pytest.mark.skipif(geos_version >= (3, 9, 0), reason="GEOS intersection bug")
+ @ImageTesting(["gridliner_labels_bbox_style"], tolerance=grid_label_tol)
+ def test_gridliner_labels_bbox_style():
+     top = 49.3457868  # north lat



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/compare/2657e3fefd810136002ff9de434acf140b098230...bdf1bc16be9071f1cc6491261729275a1063c6bc

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/compare/2657e3fefd810136002ff9de434acf140b098230...bdf1bc16be9071f1cc6491261729275a1063c6bc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210816/c483551d/attachment-0001.htm>