h5netcdf 1.7.2__py3-none-any.whl → 1.7.3__py3-none-any.whl

h5netcdf/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.7.2'
-__version_tuple__ = version_tuple = (1, 7, 2)
+__version__ = version = '1.7.3'
+__version_tuple__ = version_tuple = (1, 7, 3)
 
 __commit_id__ = commit_id = None

h5netcdf/core.py

@@ -55,20 +55,13 @@ def _invalid_netcdf_feature(feature, allow):
 
 def _transform_1d_boolean_indexers(key):
     """Find and transform 1D boolean indexers to int"""
-    # return key, if not iterable
-    try:
-        key = [
-            (
-                np.asanyarray(k).nonzero()[0]
-                if isinstance(k, (np.ndarray, list)) and type(k[0]) in (bool, np.bool_)
-                else k
-            )
-            for k in key
-        ]
-    except TypeError:
-        return key
-
-    return tuple(key)
+    # Convert 1D boolean arrays/lists to integer indices,
+    # leaving all other types unchanged
+    return tuple(
+        np.flatnonzero(arr) if arr.dtype == bool else k
+        for k in key
+        for arr in [np.asanyarray(k)]
+    )
 
 
 def _expanded_indexer(key, ndim):
@@ -526,13 +519,27 @@ class BaseVariable(BaseObject):
             h5ds_shape = self._h5ds.shape
             shape = self.shape
 
-            # check for ndarray and list
             # see https://github.com/pydata/xarray/issues/7154
+            # see https://github.com/pydata/xarray/issues/10867
             # first get maximum index
-            max_index = [
-                max(k) + 1 if isinstance(k, (np.ndarray, list)) else k.stop
-                for k in key0
-            ]
+            def _get_max_index(k):
+                # Return the maximum index for ndarray, list, slice, or int,
+                # handling empty arrays/lists safely
+                if isinstance(k, np.ndarray):
+                    if k.size == 0:
+                        return None
+                    return k.max() + 1
+                elif isinstance(k, list):
+                    return max(k) + 1 if k else None
+                elif isinstance(k, slice):
+                    return k.stop
+                elif isinstance(k, int):
+                    return k + 1
+                else:
+                    return None
+
+            max_index = [_get_max_index(k) for k in key0]
+
             # second convert to max shape
             # we take the minimum of shape vs max_index to not return
             # slices larger than expected data

h5netcdf/tests/test_h5netcdf.py

@@ -1973,6 +1973,13 @@ def test_fancy_indexing(tmp_local_or_remote_netcdf):
         np.testing.assert_array_equal(ds["hello"][[4, 5, 6], 1], [41, 0, 0])
         np.testing.assert_array_equal(ds["hello"][slice(4, 7), 1], [41, 0, 0])
 
+        # test empty slices
+        # regression test for https://github.com/pydata/xarray/pull/10870
+        empty = np.empty(0, dtype="int64")
+        np.testing.assert_array_equal(ds["hello"][1, []], empty)
+        np.testing.assert_array_equal(ds["hello"][1, np.array([], dtype="int")], empty)
+        np.testing.assert_array_equal(ds["hello"][1, slice(0, 0)], empty)
+
 
 def test_h5py_chunking(tmp_local_netcdf):
     with h5netcdf.File(tmp_local_netcdf, "w") as ds:

{h5netcdf-1.7.2.dist-info → h5netcdf-1.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h5netcdf
-Version: 1.7.2
+Version: 1.7.3
 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.2.dist-info → h5netcdf-1.7.3.dist-info}/RECORD

@@ -1,16 +1,16 @@
 h5netcdf/__init__.py,sha256=Y0EBCcmlJctwl1kCmj7yLijTVy9AioBTr2091vInAtw,456
-h5netcdf/_version.py,sha256=veZJrH40zJtbmH4sd91I-OwvwjV0ha3xLhPSXrkCusQ,704
+h5netcdf/_version.py,sha256=7eQx5zuwit_DANpeuU5CY0KHuDtyAFB3ZgRhOo7lx8Y,704
 h5netcdf/attrs.py,sha256=GSq2lzv9q0tEkJBqr2Hyrwo0YJnWZHxtLRhhG9NVf4w,4575
-h5netcdf/core.py,sha256=Dd0q1XNwrrqzCWSPauwGDFwtrVu55APIrhwOs0Gd7nQ,69508
+h5netcdf/core.py,sha256=jElZOQqCNE27hZytIGBzqkwZryc6rfhEJglu5N2jXsw,69961
 h5netcdf/dimensions.py,sha256=BO126-7r9B0sF_bbcCSzTMnQY5wH7e_DSkbUO4F9q_o,8609
 h5netcdf/legacyapi.py,sha256=MIZlht5Ad4hDFF1Slz2vXmKkgbv7Fhhf2YwNIe16Lfk,7682
 h5netcdf/utils.py,sha256=btxKI-VZP-Wn0Rk_wmnhnUls-mrxO42w0s_uX_su4FI,6528
 h5netcdf/tests/conftest.py,sha256=qS7XTZxos0NIRFtMCJwVEyx0paZw8Le1loPK1MtoQ_0,2350
 h5netcdf/tests/pytest.ini,sha256=ruJxrLdCIA4bCPVuPQjxsLSlvVxuIsIakK6iQOmz-ak,107
-h5netcdf/tests/test_h5netcdf.py,sha256=nQoKgCym6xxigicOEF-2nSBm5ba0k568GatfZnSo8BI,118407
-h5netcdf-1.7.2.dist-info/licenses/AUTHORS.txt,sha256=LTKzUh9o4Wc_oT3aFC48cyDCCP6tdm6VEV_6RrNy4uo,272
-h5netcdf-1.7.2.dist-info/licenses/LICENSE,sha256=Xer1Jg8iL_n9Da0xt0S99blk6tsg9tee_JdgH1rWTjs,1505
-h5netcdf-1.7.2.dist-info/METADATA,sha256=_Gh6qQTBa-Oy7Q4wm8vMAoa7EJN1sdSHjjf2IuVMDb8,13396
-h5netcdf-1.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-h5netcdf-1.7.2.dist-info/top_level.txt,sha256=Fb_KIpOE6MBqjSvxV1Ay7oYce1mdmQ1pO9JQJPDeGqg,9
-h5netcdf-1.7.2.dist-info/RECORD,,
+h5netcdf/tests/test_h5netcdf.py,sha256=TriQc5J4oSCTIijgwhTf6bkVzzvwub6s-6eHfYn1IyI,118780
+h5netcdf-1.7.3.dist-info/licenses/AUTHORS.txt,sha256=LTKzUh9o4Wc_oT3aFC48cyDCCP6tdm6VEV_6RrNy4uo,272
+h5netcdf-1.7.3.dist-info/licenses/LICENSE,sha256=Xer1Jg8iL_n9Da0xt0S99blk6tsg9tee_JdgH1rWTjs,1505
+h5netcdf-1.7.3.dist-info/METADATA,sha256=H1kMZigWMuWwgy_Np2u9u_Pp-7i6BHhMBk1N0JY1lDY,13396
+h5netcdf-1.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+h5netcdf-1.7.3.dist-info/top_level.txt,sha256=Fb_KIpOE6MBqjSvxV1Ay7oYce1mdmQ1pO9JQJPDeGqg,9
+h5netcdf-1.7.3.dist-info/RECORD,,