Skip to content
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ a909e174
satpy (0.16.1-5) unstable; urgency=medium
* debian/patches:
- rename dask-2.8.patch into 0007-dask-2.8.patch
- new 0008-Fix-TestVIIRSComposites.patch, backport form upstream
* debian/control:
- explicitly specify Rules-Requires-Root: no
-- Antonio Valentino <antonio.valentino@tiscali.it> Wed, 04 Dec 2019 07:29:08 +0000
satpy (0.16.1-4) unstable; urgency=medium
* Team upload.
......
debian/control
View file @ a909e174
......@@ -3,6 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Antonio Valentino <antonio.valentino@tiscali.it>
Section: python
Priority: optional
Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 12),
dh-python,
python3-all,
......
debian/patches/dask-2.8.patch → debian/patches/0007-dask-2.8.patch
View file @ a909e174
Description: Fix test failures with dask-2.8.
Author: David Hoese
From: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Date: Wed, 4 Dec 2019 07:06:50 +0000
Subject: Fix test failures with dask-2.8.
Origin: https://github.com/pytroll/satpy/commit/ca2d7e16635c0adfe6390e216f326d20cc148264
Origin: https://github.com/pytroll/satpy/commit/9f631a739e8587b09fbf1afe57e761c1690a3629
Bug-Debian: https://bugs.debian.org/945129
---
satpy/tests/compositor_tests/test_viirs.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/satpy/tests/compositor_tests/test_viirs.py b/satpy/tests/compositor_tests/test_viirs.py
index 3ccaedc..7b7a5ba 100644
--- a/satpy/tests/compositor_tests/test_viirs.py
+++ b/satpy/tests/compositor_tests/test_viirs.py
@@ -173,7 +173,10 @@ class TestVIIRSComposites(unittest.TestC
@@ -173,7 +173,10 @@ class TestVIIRSComposites(unittest.TestCase):
c02 = xr.DataArray(sza,
dims=('y', 'x'),
attrs={'name': 'solar_zenith_angle', 'area': area})
......@@ -18,7 +25,7 @@ Bug-Debian: https://bugs.debian.org/945129
c03 = xr.DataArray(lza,
dims=('y', 'x'),
attrs={'name': 'lunar_zenith_angle', 'area': area})
@@ -224,7 +227,10 @@ class TestVIIRSComposites(unittest.TestC
@@ -224,7 +227,10 @@ class TestVIIRSComposites(unittest.TestCase):
c02 = xr.DataArray(sza,
dims=('y', 'x'),
attrs={'name': 'solar_zenith_angle', 'area': area})
......
debian/patches/0008-Fix-TestVIIRSComposites.patch 0 → 100644
View file @ a909e174
From: Antonio Valentino <antonio.valentino@tiscali.it>
Date: Wed, 4 Dec 2019 07:19:38 +0000
Subject: Fix TestVIIRSComposites
Baxkport form upstream.
---
satpy/tests/compositor_tests/test_viirs.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/satpy/tests/compositor_tests/test_viirs.py b/satpy/tests/compositor_tests/test_viirs.py
index 7b7a5ba..4398b8d 100644
--- a/satpy/tests/compositor_tests/test_viirs.py
+++ b/satpy/tests/compositor_tests/test_viirs.py
@@ -306,9 +306,9 @@ class TestVIIRSComposites(unittest.TestCase):
self.assertEqual(res.attrs['area'], area)
self.assertEqual(res.attrs['ancillary_variables'], [])
data = res.values
- self.assertLess(abs(np.mean(data) - 29.907390988422513), 1e-10)
+ self.assertLess(abs(np.nanmean(data) - 26.00760944144745), 1e-10)
self.assertEqual(data.shape, (5, 10))
- unique = np.unique(data)
+ unique = np.unique(data[~np.isnan(data)])
np.testing.assert_allclose(unique, [-1.0, 4.210745457958135, 6.7833906076177595, 8.730371329824473,
10.286627569545209, 11.744159436709374, 12.20226097829902,
13.501444598985305, 15.344399223932212, 17.173329483996515,
@@ -316,11 +316,11 @@ class TestVIIRSComposites(unittest.TestCase):
19.288331720959864, 19.77043407084455, 19.887082168377006,
20.091028778326375, 20.230341149334617, 20.457671064690196,
20.82686905639114, 21.021094816441195, 21.129963777952124,
- 21.94957397026227, 41.601857910095575, 43.963919057675504,
+ 41.601857910095575, 43.963919057675504,
46.21672174361075, 46.972099490462085, 47.497072794632835,
47.80393007974336, 47.956765988770385, 48.043025685032106,
51.909142813383916, 58.8234273736508, 68.84706145641482, 69.91085190887961,
- 71.10179768327806, 71.33161009169649, 78.81291424983952])
+ 71.10179768327806, 71.33161009169649])
def test_reflectance_corrector_viirs(self):
import xarray as xr
debian/patches/series
View file @ a909e174
......@@ -4,4 +4,5 @@
0004-Disable-tests-on-the-number-of-calls-to-ll2cr.patch
0005-Fix-test_gaclacfile.patch
0006-Fix-compatibility-with-new-proj-version.patch
dask-2.8.patch
0007-dask-2.8.patch
0008-Fix-TestVIIRSComposites.patch