[Git][debian-gis-team/pyresample][master] 2 commits: Compatibility with Python 3.7

[Antonio Valentino]

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


Commits:
1cf2632f by Antonio Valentino at 2018-07-11T06:34:59+00:00
Compatibility with Python 3.7

- - - - -
2a43c4f7 by Antonio Valentino at 2018-07-11T06:54:18+00:00
Skip tests requiring dask

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0003-Skip-TestXArrayResamplerNN-if-dask-is-not-available.patch
- + debian/patches/0004-Regenerate-cython-extensions.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ pyresample (1.10.1-1) UNRELEASED; urgency=medium
   * debian/patches
     - drop test_spherical.patch, applied upstrem.
     - refresh remaining patches.
+    - new 0003-Skip-TestXArrayResamplerNN-if-dask-is-not-available.patch:
+      skip tests requiring dask if dask is not available.
+    - new 0004-Regenerate-cython-extensions.patch
+      Fixes a FTBFS with Python 3.7 (Closes: #903530).
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 05 Jul 2018 11:02:39 +0200
 


=====================================
debian/patches/0003-Skip-TestXArrayResamplerNN-if-dask-is-not-available.patch
=====================================
--- /dev/null
+++ b/debian/patches/0003-Skip-TestXArrayResamplerNN-if-dask-is-not-available.patch
@@ -0,0 +1,32 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Wed, 11 Jul 2018 06:50:33 +0000
+Subject: Skip TestXArrayResamplerNN if dask is not available
+
+---
+ pyresample/test/test_kd_tree.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pyresample/test/test_kd_tree.py b/pyresample/test/test_kd_tree.py
+index dcb3943..fbf91ef 100644
+--- a/pyresample/test/test_kd_tree.py
++++ b/pyresample/test/test_kd_tree.py
+@@ -14,6 +14,11 @@ if sys.version_info < (2, 7):
+ else:
+     import unittest
+ 
++try:
++    import dask.array as da
++except ImportError:
++    da = None
++
+ 
+ class Test(unittest.TestCase):
+ 
+@@ -696,6 +701,7 @@ class Test(unittest.TestCase):
+         self.assertTrue(np.array_equal(fill_mask, expected_fill_mask))
+ 
+ 
++ at unittest.skipIf(not da, 'dask not available')
+ class TestXArrayResamplerNN(unittest.TestCase):
+     """Test the XArrayResamplerNN class."""
+ 


=====================================
debian/patches/0004-Regenerate-cython-extensions.patch
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-fix-doc-build.patch
 0002-fix-proj4-initialization.patch
+0003-Skip-TestXArrayResamplerNN-if-dask-is-not-available.patch
+0004-Regenerate-cython-extensions.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/compare/e8d6c9df52e50797623b9f542cf9c07c5e266509...2a43c4f723dc91a241306e586dc947604dcdc91c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/compare/e8d6c9df52e50797623b9f542cf9c07c5e266509...2a43c4f723dc91a241306e586dc947604dcdc91c
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/20180711/47f241f2/attachment-0001.html>