h5netcdf 1.6.0__tar.gz → 1.6.1__tar.gz

{h5netcdf-1.6.0 → h5netcdf-1.6.1}/CHANGELOG.rst

@@ -1,6 +1,12 @@
 Change Log
 ----------
 
+Version 1.6.1 (March 7th, 2025):
+
+- Let Variable.chunks return None for scalar variables, independent of what the underlying
+  h5ds object returns ({pull}`259`).
+  By `Rickard Holmberg <https://github.com/rho-novatron>`_
+
 Version 1.6.0 (March 7th, 2025):
 
 - Allow specifying `h5netcdf.File(driver="h5pyd")` to force the use of h5pyd ({issue}`255`, {pull}`256`).

{h5netcdf-1.6.0 → h5netcdf-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: h5netcdf
-Version: 1.6.0
+Version: 1.6.1
 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.6.0 → h5netcdf-1.6.1}/doc/devguide.rst

@@ -18,10 +18,12 @@ Contributors
 - `Ezequiel Cimadevilla Alvarez <https://github.com/zequihg50>`_
 - `Frédéric Laliberté <https://github.com/laliberte>`_
 - `Ghislain Vaillant <https://github.com/ghisvail>`_
+- `John Readey <https://github.com/jreadey>`_
 - `Lion Krischer <https://github.com/krischer>`_
 - `Mark Harfouche <https://github.com/hmaarrfk>`_
 - `Martin Raspaud <https://github.com/mraspaud>`_
 - `Pierre Augier <https://github.com/paugier>`_
+- `Rickard Holmberg <https://github.com/rho-novatron>`_
 - `Ryan Grout <https://github.com/groutr>`_
 - `Scott Henderson <https://github.com/scottyhq>`_
 - `Thomas Kluyver <https://github.com/takluyver>`_

{h5netcdf-1.6.0 → h5netcdf-1.6.1}/doc/index.rst

@@ -50,7 +50,7 @@ by Stephan Hoyer. The first `official` ``h5netcdf`` announcement was made by Ste
 `xarray issue tracker`_ only one day later.
 
 The library evolved constantly over the years (fixing bugs and adding enhancements)
-and gained contributions from 17 other :ref:`contributors` so far. The library is widely used,
+and gained contributions from 19 other :ref:`contributors` so far. The library is widely used,
 especially as backend within `xarray`_.
 
 Early 2020 Kai Mühlbauer started to add contributions and after some time he volunteered

{h5netcdf-1.6.0 → h5netcdf-1.6.1}/h5netcdf/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.6.1'
+__version_tuple__ = version_tuple = (1, 6, 1)

{h5netcdf-1.6.0 → h5netcdf-1.6.1}/h5netcdf/core.py

@@ -608,6 +608,11 @@ class BaseVariable(BaseObject):
 class Variable(BaseVariable):
     @property
     def chunks(self):
+        if self.shape == ():
+            # In HSDS, the layout can be chunked even for scalar datasets, but with only a single chunk.
+            # Return None for scalar datasets since they shall be handled as non-chunked.
+            assert self._h5ds.chunks in (None, (), (1,))
+            return None
         return self._h5ds.chunks
 
     @property

{h5netcdf-1.6.0 → h5netcdf-1.6.1}/h5netcdf/tests/test_h5netcdf.py

@@ -2757,3 +2757,19 @@ def test_h5pyd_driver(hsds_up):
         with h5netcdf.File(fname, "w", driver="h5pyd") as ds:
             assert ds._h5py == h5pyd
             assert isinstance(ds._h5file, h5pyd.File)
+
+
+def test_h5pyd_nonchunked_scalars(hsds_up):
+    if without_h5pyd:
+        pytest.skip("h5pyd package not available")
+    elif not hsds_up:
+        pytest.skip("HSDS service not running")
+    rnd = "".join(random.choice(string.ascii_uppercase) for _ in range(5))
+    fname = f"hdf5://testfile{rnd}.nc"
+    with h5pyd.File(fname, "w") as ds:
+        ds.create_dataset("foo", data=b"1234")
+    with h5netcdf.File(fname, "r", driver="h5pyd") as ds:
+        # HSDS stores this as a chunked dataset, but only with a single chunk
+        assert ds["foo"]._h5ds.chunks == (1,)
+        # However, since it is a scalar dataset, we should not expose the chunking
+        assert ds["foo"].chunks is None

{h5netcdf-1.6.0 → h5netcdf-1.6.1}/h5netcdf.egg-info/PKG-INFO

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