[Git][debian-gis-team/pyresample][master] 2 commits: New patch for fixing compatibility with Python 3.7

[Antonio Valentino]

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


Commits:
30e2cf54 by Antonio Valentino at 2018-07-14T11:12:05+00:00
New patch for fixing compatibility with Python 3.7

- - - - -
071f7d1b by Antonio Valentino at 2018-07-14T11:51:03+00:00
Set distribution to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0005-Fix-StopIteration-handling.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyresample (1.10.1-1) UNRELEASED; urgency=medium
+pyresample (1.10.1-1) unstable; urgency=medium
 
   [ Bas Couwenberg ]
   * Bump Standards-Version to 4.1.5, no changes.
@@ -14,8 +14,11 @@ pyresample (1.10.1-1) UNRELEASED; urgency=medium
       skip tests requiring dask if dask is not available.
     - new 0004-Regenerate-cython-extensions.patch
       Fixes a FTBFS with Python 3.7 (Closes: #903530).
+    - New debian/patches/0005-Fix-StopIteration-handling.patch.
+      Fix StopIteration handling for compatibility with Python 3.7 and
+      PEP 479. See also https://github.com/pytroll/pyresample/pull/134.
 
- -- Bas Couwenberg <sebastic at debian.org>  Thu, 05 Jul 2018 11:02:39 +0200
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 14 Jul 2018 11:50:40 +0000
 
 pyresample (1.9.3-2) unstable; urgency=medium
 


=====================================
debian/patches/0005-Fix-StopIteration-handling.patch
=====================================
--- /dev/null
+++ b/debian/patches/0005-Fix-StopIteration-handling.patch
@@ -0,0 +1,23 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 14 Jul 2018 10:36:51 +0000
+Subject: Fix StopIteration handling
+
+Compatibility with Python 3.7 and PEP 479.
+See also https://github.com/pytroll/pyresample/pull/134.
+---
+ pyresample/_multi_proc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyresample/_multi_proc.py b/pyresample/_multi_proc.py
+index e40c293..1f318a3 100644
+--- a/pyresample/_multi_proc.py
++++ b/pyresample/_multi_proc.py
+@@ -71,7 +71,7 @@ class Scheduler(object):
+                 yield slice(s0, s1)
+             else:
+                 self._lock.release()
+-                raise StopIteration
++                return
+ 
+ 
+ def shmem_as_ndarray(raw_array):


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-fix-proj4-initialization.patch
 0003-Skip-TestXArrayResamplerNN-if-dask-is-not-available.patch
 0004-Regenerate-cython-extensions.patch
+0005-Fix-StopIteration-handling.patch



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/compare/2a43c4f723dc91a241306e586dc947604dcdc91c...071f7d1b5ee4040eed20c7f09e70953a8718dcff
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/20180714/681df24c/attachment-0001.html>