[Git][debian-gis-team/satpy][master] 6 commits: Fix compatibility with pyorbital v1.7.3
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sun Jul 17 19:49:18 BST 2022
Antonio Valentino pushed to branch master at Debian GIS Project / satpy
Commits:
fc7ecbc0 by Antonio Valentino at 2022-07-17T18:07:35+00:00
Fix compatibility with pyorbital v1.7.3
- - - - -
dafa9a91 by Antonio Valentino at 2022-07-17T18:09:22+00:00
Update lintian overrides
- - - - -
de1a71c1 by Antonio Valentino at 2022-07-17T18:13:07+00:00
Autopkgtest depends on python3-all
- - - - -
67d3c348 by Antonio Valentino at 2022-07-17T18:16:43+00:00
Build-depend on pybuild-plugin-pyproject
- - - - -
87648b60 by Antonio Valentino at 2022-07-17T18:37:33+00:00
Skip test_get_luts
- - - - -
72a8c596 by Antonio Valentino at 2022-07-17T18:38:08+00:00
Set distribution to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/control
- + debian/patches/0007-Fix-compatibility-with-pyorbital-v1.7.3.patch
- debian/patches/series
- debian/python3-satpy.lintian-overrides
- debian/rules
- debian/tests/control
- debian/tests/python3
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,23 @@
-satpy (0.36.0-2) UNRELEASED; urgency=medium
+satpy (0.36.0-2) unstable; urgency=medium
- * Team upload.
+ [ Bas Couwenberg ]
* Bump Standards-Version to 4.6.1, no changes.
* Use supported python3 versions in autopkgtest.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 21 Jun 2022 07:22:52 +0200
+ [ Antonio Valentino ]
+ * debian/patches:
+ - New 0007-Fix-compatibility-with-pyorbital-v1.7.3.patch (Closes: #1015030).
+ * Update lintian overrides.
+ * debian/tests:
+ - autopkgtest depends on python3-all.
+ - skip test_get_luts.
+ * debian/control:
+ - update dependency version.
+ - build-depend on pybuild-plugin-pyproject.
+ * debian/rules:
+ - skip test_get_luts.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Sun, 17 Jul 2022 18:38:00 +0000
satpy (0.36.0-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -7,6 +7,7 @@ Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 12),
dh-python,
libjs-mathjax,
+ pybuild-plugin-pyproject,
python3-all,
python3-appdirs,
python3-behave,
@@ -37,7 +38,7 @@ Build-Depends: debhelper-compat (= 12),
python3-pydecorate,
python3-pykdtree,
python3-pyninjotiff,
- python3-pyorbital,
+ python3-pyorbital (>= 1.7.3),
python3-pyproj,
python3-pyresample (>= 1.12.0),
python3-pyspectral (>= 0.8.7),
=====================================
debian/patches/0007-Fix-compatibility-with-pyorbital-v1.7.3.patch
=====================================
@@ -0,0 +1,90 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sun, 17 Jul 2022 17:36:10 +0000
+Subject: Fix compatibility with pyorbital v1.7.3
+
+Forwarded: not-needed
+---
+ .../reader_tests/test_seviri_l1b_calibration.py | 26 +++++++++++-----------
+ satpy/tests/reader_tests/test_utils.py | 12 +++++-----
+ 2 files changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/satpy/tests/reader_tests/test_seviri_l1b_calibration.py b/satpy/tests/reader_tests/test_seviri_l1b_calibration.py
+index f9140c8..fdcedea 100644
+--- a/satpy/tests/reader_tests/test_seviri_l1b_calibration.py
++++ b/satpy/tests/reader_tests/test_seviri_l1b_calibration.py
+@@ -94,11 +94,11 @@ VIS008_RADIANCE = xr.DataArray(
+ )
+
+ VIS008_REFLECTANCE = xr.DataArray(
+- np.array([[2.8066392, 2.6790648, 2.6790648, 2.6790648, 2.6790648],
+- [2.6790648, 2.8066392, 2.8066392, 2.6790648, 2.8066392],
+- [3.444512, 3.572086, 3.572086, 3.444512, 3.572086],
+- [14.926213, 15.053792, 15.053792, 14.671064, 15.691662],
+- [33.934814, 35.33813, 37.251755, 38.655075, 40.56869]],
++ np.array([[2.739768, 2.615233, 2.615233, 2.615233, 2.615233],
++ [2.615233, 2.739768, 2.739768, 2.615233, 2.739768],
++ [3.362442, 3.486977, 3.486977, 3.362442, 3.486977],
++ [14.570578, 14.695117, 14.695117, 14.321507, 15.317789],
++ [33.126278, 34.49616, 36.364185, 37.73407, 39.60209]],
+ dtype=np.float32)
+ )
+
+@@ -247,13 +247,13 @@ class TestFileHandlerCalibrationBase:
+ },
+ 'reflectance': {
+ 'NOMINAL': xr.DataArray(
+- [[np.nan, 40.47923],
+- [445.27155, 1142.414]],
++ [[np.nan, 41.88985],
++ [460.7884, 1182.2247]],
+ dims=('y', 'x')
+ ),
+ 'EXTERNAL': xr.DataArray(
+- [[np.nan, 404.7923],
+- [4452.7153, 11424.14]],
++ [[np.nan, 418.89853],
++ [4607.8843, 11822.249]],
+ dims=('y', 'x')
+ )
+ }
+@@ -328,13 +328,13 @@ class TestFileHandlerCalibrationBase:
+ },
+ 'reflectance': {
+ 'NOMINAL': xr.DataArray(
+- [[np.nan, 401.28372],
+- [4414.121, 11325.118]],
++ [[np.nan, 415.26767],
++ [4567.944, 11719.775]],
+ dims=('y', 'x')
+ ),
+ 'EXTERNAL': xr.DataArray(
+- [[np.nan, 167.20154],
+- [1839.217, 4718.799]],
++ [[np.nan, 173.02817],
++ [1903.31, 4883.2397]],
+ dims=('y', 'x')
+ )
+ }
+diff --git a/satpy/tests/reader_tests/test_utils.py b/satpy/tests/reader_tests/test_utils.py
+index a6bf987..52b8544 100644
+--- a/satpy/tests/reader_tests/test_utils.py
++++ b/satpy/tests/reader_tests/test_utils.py
+@@ -434,11 +434,13 @@ class TestSunEarthDistanceCorrection(unittest.TestCase):
+ attrs={'start_time': self.test_date,
+ 'scheduled_time': self.test_date})
+
+- corr_refl = xr.DataArray(da.from_array([10.50514689, 21.01029379,
+- 42.02058758, 1.05051469,
+- 102.95043957, 52.52573447]),
+- attrs={'start_time': self.test_date,
+- 'scheduled_time': self.test_date})
++ corr_refl = xr.DataArray(da.from_array([
++ 10.25484833, 20.50969667,
++ 41.01939333, 1.02548483,
++ 100.49751367, 51.27424167]),
++ attrs={'start_time': self.test_date,
++ 'scheduled_time': self.test_date},
++ )
+ self.raw_refl = raw_refl
+ self.corr_refl = corr_refl
+
=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
0004-Skip-tests-requiring-rioxarray.patch
0005-Use-local-mathjax.patch
0006-Fix-broken-test-in-i386.patch
+0007-Fix-compatibility-with-pyorbital-v1.7.3.patch
=====================================
debian/python3-satpy.lintian-overrides
=====================================
@@ -1,3 +1,3 @@
# the program is only a helper tool and the package is primarily a library
-application-in-library-section python usr/bin/satpy_retrieve_all_aux_data
-library-package-name-for-application usr/bin/satpy_retrieve_all_aux_data
+application-in-library-section python [usr/bin/satpy_retrieve_all_aux_data]
+library-package-name-for-application [usr/bin/satpy_retrieve_all_aux_data]
=====================================
debian/rules
=====================================
@@ -16,7 +16,8 @@ export PYBUILD_TEST_ARGS=-k \
and not test_retrieve_all and not test_download_script\
and not test_start_time and not test_end_time\
and not test_mimic_TPW2_nc\
- and not TestAngleGeneration"
+ and not TestAngleGeneration\
+ and not test_get_luts"
%:
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
Tests: python3
-Depends: @builddeps@, @
+Depends: @builddeps@, @, python3-all
Restrictions: skippable
=====================================
debian/tests/python3
=====================================
@@ -21,5 +21,6 @@ and not test_offline_retrieve and not test_retrieve_all \
and not test_download_script \
and not test_start_time and not test_end_time \
and not test_mimic_TPW2_nc \
-and not TestAngleGeneration" 2>&1
+and not TestAngleGeneration \
+and not test_get_luts" 2>&1
done
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/1aee333426b49e8a69cb67e9bf4e0d780c556f9a...72a8c5960d4eacaf3536136f0b047ef7a871329d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/1aee333426b49e8a69cb67e9bf4e0d780c556f9a...72a8c5960d4eacaf3536136f0b047ef7a871329d
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/20220717/d92c0254/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list