[Git][debian-gis-team/xarray-ceos-alos2][master] 5 commits: New upstream version 2026.03.10
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Wed Mar 11 07:41:50 GMT 2026
Antonio Valentino pushed to branch master at Debian GIS Project / xarray-ceos-alos2
Commits:
dd3348c0 by Antonio Valentino at 2026-03-11T07:33:38+00:00
New upstream version 2026.03.10
- - - - -
24ab4f8c by Antonio Valentino at 2026-03-11T07:33:38+00:00
Update upstream source from tag 'upstream/2026.03.10'
Update to upstream version '2026.03.10'
with Debian dir ffec481b986e1a867f7270c345d621163a476f77
- - - - -
aed55af9 by Antonio Valentino at 2026-03-11T07:34:29+00:00
New upstream release
- - - - -
e09611f1 by Antonio Valentino at 2026-03-11T07:39:04+00:00
Drop patches applied upstream
- - - - -
c00a75b3 by Antonio Valentino at 2026-03-11T07:39:26+00:00
Set diatribution to unstable
- - - - -
12 changed files:
- .github/workflows/ci.yaml
- .github/workflows/pypi.yaml
- .github/workflows/upstream-dev.yaml
- .pre-commit-config.yaml
- ceos_alos2/decoders.py
- ceos_alos2/testing.py
- ceos_alos2/tests/test_testing.py
- debian/changelog
- − debian/patches/0001-Python-packages.patch
- − debian/patches/0002-Fix-compatibility-with-new-fsspec-versions.patch
- − debian/patches/series
- pyproject.toml
Changes:
=====================================
.github/workflows/ci.yaml
=====================================
@@ -22,7 +22,7 @@ jobs:
outputs:
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
steps:
- - uses: actions/checkout at v4
+ - uses: actions/checkout at v6
with:
fetch-depth: 2
- uses: xarray-contrib/ci-trigger at v1
@@ -49,7 +49,7 @@ jobs:
steps:
- name: Checkout the repository
- uses: actions/checkout at v4
+ uses: actions/checkout at v6
with:
# need to fetch all tags to get a correct version
fetch-depth: 0 # fetch all branches and tags
=====================================
.github/workflows/pypi.yaml
=====================================
@@ -11,9 +11,9 @@ jobs:
if: github.repository == 'umr-lops/xarray-ceos-alos2'
steps:
- name: Checkout
- uses: actions/checkout at v4
+ uses: actions/checkout at v6
- name: Set up Python
- uses: actions/setup-python at v5
+ uses: actions/setup-python at v6
with:
python-version: "3.x"
- name: Install dependencies
@@ -27,7 +27,7 @@ jobs:
run: |
twine check dist/*
- name: Upload build artifacts
- uses: actions/upload-artifact at v4
+ uses: actions/upload-artifact at v7
with:
name: packages
path: dist/*
@@ -45,10 +45,10 @@ jobs:
steps:
- name: Download build artifacts
- uses: actions/download-artifact at v4
+ uses: actions/download-artifact at v8
with:
name: packages
path: dist/
- name: Publish to PyPI
- uses: pypa/gh-action-pypi-publish at 76f52bc884231f62b9a034ebfe128415bbaabdfc
+ uses: pypa/gh-action-pypi-publish at ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
=====================================
.github/workflows/upstream-dev.yaml
=====================================
@@ -21,7 +21,7 @@ jobs:
outputs:
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
steps:
- - uses: actions/checkout at v4
+ - uses: actions/checkout at v6
with:
fetch-depth: 2
- uses: xarray-contrib/ci-trigger at v1.2
@@ -55,7 +55,7 @@ jobs:
steps:
- name: checkout the repository
- uses: actions/checkout at v4
+ uses: actions/checkout at v6
with:
# need to fetch all tags to get a correct version
fetch-depth: 0 # fetch all branches and tags
=====================================
.pre-commit-config.yaml
=====================================
@@ -4,33 +4,33 @@ ci:
# https://pre-commit.com/
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v5.0.0
+ rev: v6.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-docstring-first
- - repo: https://github.com/psf/black
- rev: 25.1.0
+ - repo: https://github.com/psf/black-pre-commit-mirror
+ rev: 26.1.0
hooks:
- id: black
- repo: https://github.com/keewis/blackdoc
- rev: v0.3.9
+ rev: v0.4.6
hooks:
- id: blackdoc
- additional_dependencies: ["black==25.1.0"]
+ additional_dependencies: ["black==26.1.0"]
- id: blackdoc-autoupdate-black
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.11.8
+ rev: v0.15.4
hooks:
- id: ruff
args: [--fix]
- repo: https://github.com/kynan/nbstripout
- rev: 0.8.1
+ rev: 0.9.1
hooks:
- id: nbstripout
args: [--extra-keys=metadata.kernelspec metadata.language_info.version]
- repo: https://github.com/rbubley/mirrors-prettier
- rev: v3.5.3
+ rev: v3.8.1
hooks:
- id: prettier
- repo: https://github.com/ComPWA/taplo-pre-commit
=====================================
ceos_alos2/decoders.py
=====================================
@@ -7,39 +7,31 @@ from tlz.functoolz import identity as passthrough
from ceos_alos2.dicttoolz import valsplit
-scene_id_re = re.compile(
- r"""(?x)
+scene_id_re = re.compile(r"""(?x)
(?P<mission_name>[A-Z0-9]{5})
(?P<orbit_accumulation>[0-9]{5})
(?P<scene_frame>[0-9]{4})
-(?P<date>[0-9]{6})
- """
-)
-product_id_re = re.compile(
- r"""(?x)
+ """)
+product_id_re = re.compile(r"""(?x)
(?P<observation_mode>[A-Z]{3})
(?P<observation_direction>[LR])
(?P<processing_level>1\.0|1\.1|1\.5|3\.1)
(?P<processing_option>[GR_])
(?P<map_projection>[UL_])
(?P<orbit_direction>[AD])
- """
-)
-scan_info_re = re.compile(
- r"""(?x)
+ """)
+scan_info_re = re.compile(r"""(?x)
(?P<processing_method>[BF])
(?P<scan_number>[0-9])
- """
-)
-fname_re = re.compile(
- r"""(?x)
+ """)
+fname_re = re.compile(r"""(?x)
(?P<filetype>[A-Z]{3})
(-(?P<polarization>[HV]{2}))?
-(?P<scene_id>[A-Z0-9]{14}-[0-9]{6})
-(?P<product_id>[A-Z0-9._]{10})
(-(?P<scan_info>[BF][0-9]))?
- """
-)
+ """)
observation_modes = {
"SBS": "spotlight mode",
=====================================
ceos_alos2/testing.py
=====================================
@@ -119,13 +119,11 @@ def diff_mapping(a, b, name):
def diff_scalar(a, b, name):
- return textwrap.dedent(
- f"""\
+ return textwrap.dedent(f"""\
Differing {name.title()}:
L {a}
R {b}
- """.rstrip()
- )
+ """.rstrip())
def compare_data(a, b):
@@ -138,6 +136,13 @@ def compare_data(a, b):
return a.shape == b.shape and np.all(a == b)
+def extract_fs_protocol(fs):
+ protocol = fs.protocol
+ if isinstance(protocol, tuple):
+ protocol, *_ = protocol
+ return protocol
+
+
def diff_array(a, b):
if not isinstance(a, Array):
lines = [
@@ -151,9 +156,11 @@ def diff_array(a, b):
if a.fs != b.fs:
lines = ["Differing filesystem:"]
# fs.protocol is always `dir`, so we have to check the wrapped fs
- if a.fs.fs.protocol != b.fs.fs.protocol:
- lines.append(f" L protocol {a.fs.fs.protocol}")
- lines.append(f" R protocol {b.fs.fs.protocol}")
+ protocol_a = extract_fs_protocol(a.fs.fs)
+ protocol_b = extract_fs_protocol(b.fs.fs)
+ if protocol_a != protocol_b:
+ lines.append(f" L protocol {protocol_a}")
+ lines.append(f" R protocol {protocol_b}")
if a.fs.path != b.fs.path:
lines.append(f" L path {a.fs.path}")
lines.append(f" R path {b.fs.path}")
=====================================
ceos_alos2/tests/test_testing.py
=====================================
@@ -286,7 +286,6 @@ def test_compare_data(left, right, expected):
)
def test_diff_array(left, right, expected):
actual = testing.diff_array(left, right)
-
assert actual == expected
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+xarray-ceos-alos2 (2026.03.10-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/patches:
+ - Drop 0001-Python-packages.patch and
+ 0002-Fix-compatibility-with-new-fsspec-versions.patch,
+ applied upstream.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Wed, 11 Mar 2026 07:39:12 +0000
+
xarray-ceos-alos2 (2025.05.0-2) unstable; urgency=medium
* Update dates in d/copyright.
=====================================
debian/patches/0001-Python-packages.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Tue, 23 Dec 2025 17:08:57 +0000
-Subject: Python packages
-
-Fix the list of Python (sub-)package in pyproject.toml.
----
- pyproject.toml | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 254d630..e5a67fa 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -53,7 +53,15 @@ requires = ["setuptools>=64.0", "setuptools-scm"]
- build-backend = "setuptools.build_meta"
-
- [tool.setuptools]
--packages = ["ceos_alos2"]
-+packages = [
-+ "ceos_alos2",
-+ "ceos_alos2.sar_image",
-+ "ceos_alos2.sar_image.caching",
-+ "ceos_alos2.sar_leader",
-+ "ceos_alos2.sar_trailer",
-+ "ceos_alos2.tests",
-+ "ceos_alos2.volume_directory",
-+]
-
- [tool.setuptools_scm]
- fallback_version = "999"
=====================================
debian/patches/0002-Fix-compatibility-with-new-fsspec-versions.patch deleted
=====================================
@@ -1,35 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Fri, 20 Feb 2026 07:23:16 +0000
-Subject: Fix compatibility with new fsspec versions
-
-Forwarded: https://github.com/umr-lops/xarray-ceos-alos2/pull/123
----
- ceos_alos2/tests/test_testing.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/ceos_alos2/tests/test_testing.py b/ceos_alos2/tests/test_testing.py
-index c50372a..4899800 100644
---- a/ceos_alos2/tests/test_testing.py
-+++ b/ceos_alos2/tests/test_testing.py
-@@ -1,5 +1,6 @@
- import numpy as np
- import pytest
-+import fsspec
-
- from ceos_alos2 import testing
- from ceos_alos2.hierarchy import Group, Variable
-@@ -194,7 +195,13 @@ def test_compare_data(left, right, expected):
- "\n".join(
- [
- "Differing filesystem:",
-- " L protocol http",
-+ " L protocol 'http'",
-+ " R protocol memory",
-+ ]
-+ ) if fsspec.__version__ < "2025.10.0" else "\n".join(
-+ [
-+ "Differing filesystem:",
-+ " L protocol ('http', 'https')",
- " R protocol memory",
- ]
- ),
=====================================
debian/patches/series deleted
=====================================
@@ -1,2 +0,0 @@
-0001-Python-packages.patch
-0002-Fix-compatibility-with-new-fsspec-versions.patch
=====================================
pyproject.toml
=====================================
@@ -1,7 +1,7 @@
[project]
name = "xarray-ceos-alos2"
requires-python = ">= 3.10"
-license = { text = "MIT" }
+license = "MIT"
description = "xarray reader for advanced land observing satellite 2 (ALOS2) CEOS files"
readme = "README.md"
dependencies = [
@@ -26,7 +26,6 @@ keywords = [
]
classifiers = [
"Development Status :: 4 - Beta",
- "License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
@@ -52,8 +51,8 @@ ceos-alos2-create-cache = "ceos_alos2.sar_image.cli:main"
requires = ["setuptools>=64.0", "setuptools-scm"]
build-backend = "setuptools.build_meta"
-[tool.setuptools]
-packages = ["ceos_alos2"]
+[tool.setuptools.packages.find]
+include = ["ceos_alos2*"]
[tool.setuptools_scm]
fallback_version = "999"
View it on GitLab: https://salsa.debian.org/debian-gis-team/xarray-ceos-alos2/-/compare/e41083ccf707adfa139651e2f76f12a1a72981d9...c00a75b39442f775916d3b9a1d2750b5a3150f0e
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/xarray-ceos-alos2/-/compare/e41083ccf707adfa139651e2f76f12a1a72981d9...c00a75b39442f775916d3b9a1d2750b5a3150f0e
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/20260311/7225a320/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list