[Git][debian-gis-team/pyresample][master] Workaround for broken basemap

[Antonio Valentino]

Antonio Valentino pushed to branch master at Debian GIS Project / pyresample


Commits:
55eab16e by Antonio Valentino at 2019-09-01T15:55:42Z
Workaround for broken basemap

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0004-Detect-broken-basemap.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,10 @@
 pyresample (1.12.3-6) UNRELEASED; urgency=medium
 
   * Use debhelper-compat instead of debian/compat.
+  * debian/patches:
+    - new 0004-Detect-broken-basemap.patch: workaround for failures
+      of basemap imports due to incompatibility with new pyproj
+      versions
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Wed, 21 Aug 2019 19:35:41 +0000
 


=====================================
debian/patches/0004-Detect-broken-basemap.patch
=====================================
@@ -0,0 +1,23 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sun, 1 Sep 2019 06:37:12 +0000
+Subject: Detect broken basemap
+
+https://github.com/matplotlib/basemap/pull/454
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939022
+---
+ pyresample/test/test_plot.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyresample/test/test_plot.py b/pyresample/test/test_plot.py
+index 0ea4fa3..bc446e3 100644
+--- a/pyresample/test/test_plot.py
++++ b/pyresample/test/test_plot.py
+@@ -29,7 +29,7 @@ except ImportError:
+ 
+ try:
+     from mpl_toolkits.basemap import Basemap
+-except ImportError:
++except (ImportError, AttributeError):
+     Basemap = None
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 0001-fix-proj4-initialization.patch
 0002-Skip-dask-related-tests-if-dask-is-not-available.patch
 0003-Make-xarray-optional-for-testing.patch
+0004-Detect-broken-basemap.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/commit/55eab16e711ff56bac48aee6920840d8ff6e86f0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/commit/55eab16e711ff56bac48aee6920840d8ff6e86f0
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/20190901/7e4303fe/attachment-0001.html>