h5netcdf 1.7.0__tar.gz → 1.7.2__tar.gz

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/CHANGELOG.rst

@@ -1,6 +1,17 @@
 Change Log
 ----------
 
+Version 1.7.2 (October 17th, 2025):
+
+- Fix regression where format was requested from group instance instead of _root. Simplify logic to check and raise ``CompatibilityError``. (:issue:`293`, :pull:`294`).
+  By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_
+
+
+Version 1.7.1 (October 16th, 2025):
+
+- Fix regression where attributes with list of strings were written with h5py low-level API instead of high-level API (:issue:`291`, :pull:`292`).
+  By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_
+
 Version 1.7.0 (October 15th, 2025):
 
 - Fix unintentional changes in test suite (:pull:`277`).

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h5netcdf
-Version: 1.7.0
+Version: 1.7.2
 Summary: netCDF4 via h5py
 Author-email: Stephan Hoyer <shoyer@gmail.com>, Kai Mühlbauer <kmuehlbauer@wradlib.org>
 Maintainer-email: h5netcdf developers <devteam@h5netcdf.org>

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/h5netcdf/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.7.0'
-__version_tuple__ = version_tuple = (1, 7, 0)
+__version__ = version = '1.7.2'
+__version_tuple__ = version_tuple = (1, 7, 2)
 
-__commit_id__ = commit_id = 'g9cb422fb6'
+__commit_id__ = commit_id = 'g0a7fc48ba'

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/h5netcdf/attrs.py

@@ -87,10 +87,11 @@ class Attributes(MutableMapping):
 
         self._check_dtype(dtype)
 
+        is_plain_string = dtype.kind in {"S", "U"} and dtype.metadata is None
         if (
-            dtype.kind in {"S", "U"}  # for strings
-            and dtype.metadata is None  # but not special h5py strings
-            and not isinstance(value, (list, self._h5py.Empty))
+            is_plain_string  # for simple strings
+            and (not isinstance(value, list) and self._format == "NETCDF4_CLASSIC")
+            and not isinstance(value, self._h5py.Empty)
             and self._h5py.__name__ == "h5py"
         ):
             # create with low level API to get fixed length strings

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/h5netcdf/core.py

@@ -12,7 +12,7 @@ from packaging import version
 
 from . import __version__
 from .attrs import Attributes
-from .dimensions import Dimension, Dimensions
+from .dimensions import Dimension, Dimensions, _check_classic_unlimited
 from .utils import (
     CompatibilityError,
     Frozen,
@@ -1030,12 +1030,8 @@ class Group(Mapping):
 
     @dimensions.setter
     def dimensions(self, value):
-        if self._format == "NETCDF4_CLASSIC":
-            unlimited_dims = list(filter(lambda s: s in [None, 0], value.values()))
-            if len(unlimited_dims) > 1:
-                raise CompatibilityError(
-                    "NETCDF4_CLASSIC format only allows one unlimited dimension."
-                )
+        if self._root._format == "NETCDF4_CLASSIC":
+            _check_classic_unlimited(value)
 
         for k, v in self._all_dimensions.maps[0].items():
             if k in value:

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/h5netcdf/dimensions.py

@@ -1,12 +1,24 @@
 import weakref
 from collections import OrderedDict
-from collections.abc import MutableMapping
+from collections.abc import Mapping, MutableMapping
 
 import numpy as np
 
 from .utils import CompatibilityError
 
 
+def _check_classic_unlimited(value, unlimited=None):
+    if isinstance(value, Mapping):
+        multiple_unlimited_dimensions = sum(v in (None, 0) for v in value.values()) > 1
+    else:
+        multiple_unlimited_dimensions = unlimited and value in (None, 0)
+
+    if multiple_unlimited_dimensions:
+        raise CompatibilityError(
+            "Only one unlimited dimension allowed in the NETCDF4_CLASSIC format."
+        )
+
+
 class Dimensions(MutableMapping):
     def __init__(self, group):
         self._group_ref = weakref.ref(group)
@@ -25,14 +37,8 @@ class Dimensions(MutableMapping):
             raise RuntimeError("H5NetCDF: Write to read only")
         if name in self._objects:
             raise ValueError(f"dimension {name!r} already exists")
-        if (
-            size in [0, None]
-            and self._unlimited()
-            and self._group._format == "NETCDF4_CLASSIC"
-        ):
-            raise CompatibilityError(
-                "Only one unlimited dimension allowed in the NETCDF4_CLASSIC format."
-            )
+        if self._group._root._format == "NETCDF4_CLASSIC":
+            _check_classic_unlimited(size, self._unlimited())
 
         self._objects[name] = Dimension(self._group, name, size, create_h5ds=True)
 

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/h5netcdf/tests/test_h5netcdf.py

@@ -211,7 +211,7 @@ def write_h5netcdf(tmp_netcdf, compression="gzip", format="NETCDF4"):
     if ds.data_model == "NETCDF4_CLASSIC":
         with raises(
             CompatibilityError,
-            match="NETCDF4_CLASSIC format only allows one unlimited dimension.",
+            match="Only one unlimited dimension allowed",
         ):
             ds.dimensions = {"x": 4, "y": 5, "z": 6, "unlimited": None, "empty": 0}
 
@@ -2903,7 +2903,7 @@ def test_raise_on_closed_file(tmp_local_netcdf):
     v = f.create_variable("hello", ("x",), float)
     v[:] = np.ones(5)
     f.close()
-    with pytest.raises(
+    with raises(
         ValueError,
         match=f"I/O operation on <Closed h5netcdf.File>: '{tmp_local_netcdf}'",
     ):
@@ -2999,3 +2999,44 @@ def test_is_classic(tmp_local_netcdf):
 
     out = subprocess.run(["ncdump", "-k", tmp_local_netcdf], capture_output=True)
     assert out.stdout.decode().strip() == "netCDF-4 classic model"
+
+
+@pytest.mark.parametrize(
+    "attr", [("un", "deux"), ["un", "deux"], ("one", "two"), ["one", "two"]]
+)
+def test_attributes_list(tmp_local_netcdf, attr):
+    # regression test for https://github.com/h5netcdf/h5netcdf/issues/291
+    with h5netcdf.File(tmp_local_netcdf, mode="w") as hf:
+        hf.attrs["foo"] = attr
+
+    with h5netcdf.File(tmp_local_netcdf, mode="r") as hf:
+        assert hf.attrs["foo"][0] == attr[0]
+        assert hf.attrs["foo"][1] == attr[1]
+        assert isinstance(hf.attrs["foo"], list)
+
+
+def test_group_dimensions(tmp_local_netcdf):
+    # regression test for https://github.com/h5netcdf/h5netcdf/issues/293
+    with h5netcdf.File(tmp_local_netcdf, mode="w") as f:
+        group = f.create_group("data")
+        dims = {"y": 3, "x": 3, "z": None, "z1": None}
+        group.dimensions = dims
+        assert list(group.dimensions) == ["y", "x", "z", "z1"]
+        group.dimensions["z2"] = None
+        assert list(group.dimensions) == ["y", "x", "z", "z1", "z2"]
+
+
+def test_group_dimensions_classic(tmp_local_netcdf):
+    # regression test for https://github.com/h5netcdf/h5netcdf/issues/293
+    with h5netcdf.File(tmp_local_netcdf, mode="w", format="NETCDF4_CLASSIC") as f:
+        group = f.create_group("data")
+        dims = {"y": 3, "x": 3, "z": None, "z1": None}
+        with raises(CompatibilityError, match=r"Only one unlimited dimension allowed"):
+            group.dimensions = dims
+        assert list(group.dimensions) == []
+        dims = {"y": 3, "x": 3, "z": None}
+        group.dimensions = dims
+        assert list(group.dimensions) == ["y", "x", "z"]
+        with raises(CompatibilityError, match=r"Only one unlimited dimension allowed"):
+            group.dimensions["z1"] = None
+        assert list(group.dimensions) == ["y", "x", "z"]

{h5netcdf-1.7.0 → h5netcdf-1.7.2}/h5netcdf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h5netcdf
-Version: 1.7.0
+Version: 1.7.2
 Summary: netCDF4 via h5py
 Author-email: Stephan Hoyer <shoyer@gmail.com>, Kai Mühlbauer <kmuehlbauer@wradlib.org>
 Maintainer-email: h5netcdf developers <devteam@h5netcdf.org>