[Git][debian-gis-team/satpy][master] 2 commits: New 0009-Compatibility-with-numpy-1.24.patch

[Antonio Valentino (@antonio.valentino)]

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


Commits:
951c8314 by Antonio Valentino at 2022-12-29T14:55:12+00:00
New 0009-Compatibility-with-numpy-1.24.patch

- - - - -
1359a776 by Antonio Valentino at 2022-12-29T16:01:46+00:00
Set distribution to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0009-Compatibility-with-numpy-1.24.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
-satpy (0.38.0-2) UNRELEASED; urgency=medium
+satpy (0.38.0-2) unstable; urgency=medium
 
-  * Team upload.
+  [ Bas Couwenberg ]
   * Enable numpy3 dh helper.
 
- -- Bas Couwenberg <sebastic at debian.org>  Thu, 22 Dec 2022 13:25:34 +0100
+  [ Antonio Valentino ]
+  * debian/patchess:
+    - new 0009-Compatibility-with-numpy-1.24.patch (Closes: #1027242).
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 29 Dec 2022 16:01:36 +0000
 
 satpy (0.38.0-1) unstable; urgency=medium
 


=====================================
debian/patches/0009-Compatibility-with-numpy-1.24.patch
=====================================
@@ -0,0 +1,64 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Thu, 29 Dec 2022 14:51:54 +0000
+Subject: Compatibility with numpy 1.24
+
+Forwarded: not-needed
+Applied-Upstream:
+    https://github.com/pytroll/satpy/commit/d2e0bf3197615f06abc6770bb3b24c03e22f166a
+    https://github.com/pytroll/satpy/commit/e97803fb255474412286afb0498275ce5f2be090
+---
+ satpy/readers/aapp_mhs_amsub_l1c.py | 2 +-
+ satpy/readers/seviri_base.py        | 4 ++--
+ satpy/tests/test_dataset.py         | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/satpy/readers/aapp_mhs_amsub_l1c.py b/satpy/readers/aapp_mhs_amsub_l1c.py
+index f590214..44df49a 100644
+--- a/satpy/readers/aapp_mhs_amsub_l1c.py
++++ b/satpy/readers/aapp_mhs_amsub_l1c.py
+@@ -151,7 +151,7 @@ def _calibrate(data,
+     if calib_type == 'counts':
+         return channel
+ 
+-    channel = channel.astype(np.float)
++    channel = channel.astype(np.float_)
+ 
+     return da.where(mask, channel, np.nan)
+ 
+diff --git a/satpy/readers/seviri_base.py b/satpy/readers/seviri_base.py
+index 5842c07..d2c4a31 100644
+--- a/satpy/readers/seviri_base.py
++++ b/satpy/readers/seviri_base.py
+@@ -449,8 +449,8 @@ class MpefProductHeader(object):
+             ('EncodingVersion', np.uint16),
+             ('Channel', np.uint8),
+             ('ImageLocation', 'S3'),
+-            ('GsicsCalMode', np.bool),
+-            ('GsicsCalValidity', np.bool),
++            ('GsicsCalMode', np.bool_),
++            ('GsicsCalValidity', np.bool_),
+             ('Padding', 'S2'),
+             ('OffsetToData', np.uint32),
+             ('Padding2', 'S9'),
+diff --git a/satpy/tests/test_dataset.py b/satpy/tests/test_dataset.py
+index b79c5b5..89172ed 100644
+--- a/satpy/tests/test_dataset.py
++++ b/satpy/tests/test_dataset.py
+@@ -327,7 +327,7 @@ def test_combine_dicts_close():
+             'b': 'foo',
+             'c': [1, 2, 3],
+             'd': {
+-                'e': np.str('bar'),
++                'e': np.str_('bar'),
+                 'f': datetime(2020, 1, 1, 12, 15, 30),
+                 'g': np.array([1, 2, 3]),
+             },
+@@ -340,7 +340,7 @@ def test_combine_dicts_close():
+             'b': 'foo',
+             'c': np.array([1, 2, 3]) + 1E-12,
+             'd': {
+-                'e': np.str('bar'),
++                'e': np.str_('bar'),
+                 'f': datetime(2020, 1, 1, 12, 15, 30),
+                 'g': np.array([1, 2, 3]) + 1E-12
+             },


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@
 0006-Relax-test-tolerance.patch
 0007-Fix-privacy-breach.patch
 0008-Fix-compatibility-with-old-dask-versions.patch
+0009-Compatibility-with-numpy-1.24.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/3ae463db780217e874267a71fffc2db5483747f5...1359a77604920a31fe96d90bed907ae066e1b088

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/3ae463db780217e874267a71fffc2db5483747f5...1359a77604920a31fe96d90bed907ae066e1b088
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/20221229/da73325a/attachment-0001.htm>