[Git][debian-gis-team/satpy][master] 4 commits: Cleanup

[Antonio Valentino (@antonio.valentino)]

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


Commits:
58586d82 by Antonio Valentino at 2024-12-07T15:40:33+00:00
Cleanup

- - - - -
5257beca by Antonio Valentino at 2024-12-07T15:46:06+00:00
Drop dependency on xarray-datatree

- - - - -
5265fbe2 by Antonio Valentino at 2024-12-07T15:46:14+00:00
Re-enable TestFSFile

- - - - -
15f9645a by Antonio Valentino at 2024-12-07T16:11:14+00:00
Set diatribution to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/0007-Drop-dependency-on-xarray-datatree.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+satpy (0.53.0-2) unstable; urgency=medium
+
+  * debian/rules:
+    - Drop custom SETUPTOOLS_SCM_PRETEND_VERSION setting,
+      no longer neded after the switch to hatchling.
+    - Re-enable TestFSFile: see
+      https://github.com/pytroll/satpy/issues/3001.
+  * debian/patches:
+    - New 0007-Drop-dependency-on-xarray-datatree.patch.
+  * debian/control:
+    - Drop dependency on xarray-datatree.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 07 Dec 2024 16:10:56 +0000
+
 satpy (0.53.0-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -66,8 +66,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-trollimage (>= 1.24),
                python3-trollsched,
                python3-trollsift,
-               python3-xarray,
-               python3-xarray-datatree,
+               python3-xarray (>= 2024.10.0),
                python3-yaml,
                python3-zarr
 Standards-Version: 4.7.0


=====================================
debian/patches/0007-Drop-dependency-on-xarray-datatree.patch
=====================================
@@ -0,0 +1,31 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 7 Dec 2024 14:53:23 +0000
+Subject: Drop dependency on xarray-datatree
+
+Forwarded: https://github.com/pytroll/satpy/pull/3011
+---
+ pyproject.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 2e09ae1..dfc271a 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -62,7 +62,7 @@ seviri_l2_bufr = ["eccodes"]
+ seviri_l2_grib = ["eccodes"]
+ hsaf_grib = ["pygrib"]
+ remote_reading = ["fsspec"]
+-insat_3d = ["xarray-datatree"]
++insat_3d = ["xarray>=2024.10.0"]
+ gms5-vissr_l1b = ["numba"]
+ # Writers:
+ cf = ["h5netcdf >= 0.7.3"]
+@@ -87,7 +87,7 @@ satpos_from_tle = ["skyfield", "astropy"]
+ tests = ["behave", "h5py", "netCDF4", "pyhdf", "imageio",
+          "rasterio", "trollimage", "fsspec", "bottleneck",
+          "rioxarray", "pytest", "pytest-lazy-fixtures", "defusedxml",
+-         "s3fs", "eccodes", "h5netcdf", "xarray-datatree",
++         "s3fs", "eccodes", "h5netcdf", "xarray>=2024.10.0",
+          "skyfield", "ephem", "pint-xarray", "astropy", "dask-image", "python-geotiepoints", "numba"]
+ dev = ["satpy[doc,tests]"]
+ 


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 0004-Fix-privacy-breach.patch
 0005-Fix-compatibility-with-old-dask-versions.patch
 0006-Do-not-document-pvivate-members.patch
+0007-Drop-dependency-on-xarray-datatree.patch


=====================================
debian/rules
=====================================
@@ -5,7 +5,6 @@
 #export DH_VERBOSE=1
 
 include /usr/share/dpkg/pkg-info.mk
-export SETUPTOOLS_SCM_PRETEND_VERSION=$(DEB_VERSION_UPSTREAM)
 
 ifneq (,${PYBUILD_AUTOPKGTEST})
 TESTDIR=/usr/lib/python3/dist-packages/satpy/tests
@@ -57,11 +56,7 @@ and not test_filenames_only \
 and not test_add_grid_mapping_oblique_mercator \
 and not test_palettize \
 and not test_viirs \
-and not test_basic_default_provided \
-and not test_open_zip_fs_regular_filename \
-and not test_sorting_fsfiles \
-and not test_equality \
-and not test_hash" \
+and not test_basic_default_provided" \
 --ignore=${TESTDIR}/reader_tests/gms/test_gms5_vissr_l1b.py \
 --ignore=${TESTDIR}/reader_tests/gms/test_gms5_vissr_navigation.py \
 --ignore=${TESTDIR}/reader_tests/test_viirs_edr_active_fires.py \



View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/fefe5da909b7a351cf0cb7bd9e9faa9d357c4797...15f9645a9ba060ff4be679a42feea0ddcbe4e0e1

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/fefe5da909b7a351cf0cb7bd9e9faa9d357c4797...15f9645a9ba060ff4be679a42feea0ddcbe4e0e1
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/20241207/3416ac60/attachment-0001.htm>