[Git][debian-gis-team/satpy][master] 6 commits: New 0006-Fix-broken-test-in-i386.patch
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sun Dec 12 18:52:39 GMT 2021
Antonio Valentino pushed to branch master at Debian GIS Project / satpy
Commits:
24b589d9 by Antonio Valentino at 2021-12-12T18:34:51+00:00
New 0006-Fix-broken-test-in-i386.patch
- - - - -
3b5d6c00 by Antonio Valentino at 2021-12-12T18:34:57+00:00
Improve formatting of d/control
- - - - -
6d4643bd by Antonio Valentino at 2021-12-12T18:34:57+00:00
Temparary disable tests that are broken in Python 3.10
- - - - -
1cc15ccf by Antonio Valentino at 2021-12-12T18:34:57+00:00
squash
- - - - -
2d93975d by Antonio Valentino at 2021-12-12T18:34:58+00:00
Disable tests requiring a large amount of resources
- - - - -
85ce5801 by Antonio Valentino at 2021-12-12T18:35:25+00:00
Set distirbution to experimental
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/0006-Fix-broken-test-in-i386.patch
- debian/patches/series
- debian/rules
- debian/tests/python3
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+satpy (0.31.0-3~exp1) experimental; urgency=medium
+
+ * devian/control:
+ - improve formatting
+ * debian/patches:
+ - new 0006-Fix-broken-test-in-i386.patch, fix tests that
+ are broken on i386.
+ * Temporary disable test that are broken in Python 3.10
+ (see https://github.com/pytroll/satpy/issues/1929).
+ * Disable tests requiring a large amount of resources
+ (see https://github.com/pytroll/satpy/issues/1883).
+ Closes: #1000273.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Sun, 12 Dec 2021 18:35:12 +0000
+
satpy (0.31.0-2) unstable; urgency=medium
* debian/rules:
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 12),
python3-appdirs,
python3-behave,
python3-bottleneck,
- python3-bs4,
+ python3-bs4,
python3-cloudpickle,
python3-dask (>= 2.8),
python3-distributed,
@@ -42,7 +42,7 @@ Build-Depends: debhelper-compat (= 12),
python3-pyspectral (>= 0.8.7),
python3-pytest,
python3-pytest-lazy-fixture,
- python3-rasterio,
+ python3-rasterio,
python3-requests,
python3-scipy,
python3-setuptools,
@@ -88,7 +88,7 @@ Depends: python3-appdirs,
Recommends: libjs-mathjax,
python3-behave,
python3-bottleneck,
- python3-bs4,
+ python3-bs4,
python3-distributed,
python3-geotiepoints,
python3-glymur,
@@ -106,11 +106,11 @@ Recommends: libjs-mathjax,
python3-pyspectral (>= 0.8.7),
python3-pytest,
python3-pytest-lazy-fixture,
- python3-rasterio,
+ python3-rasterio,
python3-requests,
python3-tables,
python3-tornado,
- python3-trollsched,
+ python3-trollsched
Suggests: www-browser
Description: Python package for earth-observing satellite data processing
The SatPy package is a Python library for reading and manipulating
=====================================
debian/patches/0006-Fix-broken-test-in-i386.patch
=====================================
@@ -0,0 +1,25 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 13 Nov 2021 18:11:21 +0000
+Subject: Fix broken test in i386
+
+Forwarded: https://github.com/pytroll/satpy/issues/1883
+---
+ satpy/tests/reader_tests/test_agri_l1.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/satpy/tests/reader_tests/test_agri_l1.py b/satpy/tests/reader_tests/test_agri_l1.py
+index 78b2cbb..74e21c8 100644
+--- a/satpy/tests/reader_tests/test_agri_l1.py
++++ b/satpy/tests/reader_tests/test_agri_l1.py
+@@ -358,8 +358,10 @@ class Test_HDF_AGRI_L1_cal:
+ res = reader.load(band_names)
+ assert len(res) == len(band_names)
+ self._check_calibration_and_units(band_names, res)
++ from numpy import testing as npt
+ for band_name in band_names:
+- assert res[band_name].attrs['area'].area_extent == AREA_EXTENTS_BY_RESOLUTION[resolution_to_test]
++ npt.assert_allclose(res[band_name].attrs['area'].area_extent, AREA_EXTENTS_BY_RESOLUTION[resolution_to_test])
++ # assert res[band_name].attrs['area'].area_extent == AREA_EXTENTS_BY_RESOLUTION[resolution_to_test]
+
+ def _check_calibration_and_units(self, band_names, result):
+ for index, band_name in enumerate(band_names):
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
0003-Skip-broken-tests.patch
0004-Skip-tests-requiring-rioxarray.patch
0005-Use-local-mathjax.patch
+0006-Fix-broken-test-in-i386.patch
=====================================
debian/rules
=====================================
@@ -9,8 +9,10 @@ include /usr/share/dpkg/pkg-info.mk
export PYBUILD_NAME=satpy
export PYBUILD_AFTER_INSTALL=rm -rf '{destdir}/{install_dir}/benchmarks' '{destdir}/{install_dir}/dask-worker-space'
export PYBUILD_TEST_ARGS=-k \
-"not test_retrieve and not test_offline_retrieve and\
- not test_retrieve_all and not test_download_script"
+"not test_retrieve 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 test_fy4a_for_one_resolution and not test_load_longitude_latitude"
%:
dh $@ --with python3,sphinxdoc --buildsystem=pybuild
=====================================
debian/tests/python3
=====================================
@@ -7,7 +7,9 @@ cd "$AUTOPKGTEST_TMP"
for py in $PYS; do
echo "=== $py ==="
- $py -m pytest -v --pyargs satpy -k "not test_retrieve and \
-not test_offline_retrieve and not test_retrieve_all and \
-not test_download_script" 2>&1
+ $py -m pytest -v --pyargs satpy -k "not test_retrieve \
+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 test_fy4a_for_one_resolution and not test_load_longitude_latitude" 2>&1
done
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/46f0360dee1fd9c79588883457fcdb1dd6693932...85ce5801c92e5a4a8a49b15257a7d6593b783db6
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/46f0360dee1fd9c79588883457fcdb1dd6693932...85ce5801c92e5a4a8a49b15257a7d6593b783db6
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/20211212/c060e256/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list