Skip to content

Commit 64e60cf

Browse files
aladinorpre-commit-ci[bot]TomNicholas
authored
passing missing arguments when opening zarr, hdf5 and netcdft4 datatrees (#9428)
* passing missing arguments to when opening hdf5 datatrees * passing missing arguments to when opening netcdf4 datatrees * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * changes documented in 'whats-new.rst file' * passing missing arguments to open_groups_as_dict when opening zarr datatrees --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Tom Nicholas <[email protected]>
1 parent 278b11a commit 64e60cf

File tree

4 files changed

+59
-3
lines changed

4 files changed

+59
-3
lines changed

doc/whats-new.rst

+3
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ Bug fixes
155155
- Fix deprecation warning that was raised when calling ``np.array`` on an ``xr.DataArray``
156156
in NumPy 2.0 (:issue:`9312`, :pull:`9393`)
157157
By `Andrew Scherer <https://github.com/andrew-s28>`_.
158+
- Fix passing missing arguments to when opening hdf5 and netCDF4 datatrees
159+
(:issue:`9427`, :pull: `9428`).
160+
By `Alfonso Ladino <https://github.com/aladinor>`_.
158161
- Fix support for using ``pandas.DateOffset``, ``pandas.Timedelta``, and
159162
``datetime.timedelta`` objects as ``resample`` frequencies
160163
(:issue:`9408`, :pull:`9413`).

xarray/backends/h5netcdf_.py

+19-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,25 @@ def open_datatree(
477477

478478
from xarray.core.datatree import DataTree
479479

480-
groups_dict = self.open_groups_as_dict(filename_or_obj, **kwargs)
480+
groups_dict = self.open_groups_as_dict(
481+
filename_or_obj,
482+
mask_and_scale=mask_and_scale,
483+
decode_times=decode_times,
484+
concat_characters=concat_characters,
485+
decode_coords=decode_coords,
486+
drop_variables=drop_variables,
487+
use_cftime=use_cftime,
488+
decode_timedelta=decode_timedelta,
489+
format=format,
490+
group=group,
491+
lock=lock,
492+
invalid_netcdf=invalid_netcdf,
493+
phony_dims=phony_dims,
494+
decode_vlen_strings=decode_vlen_strings,
495+
driver=driver,
496+
driver_kwds=driver_kwds,
497+
**kwargs,
498+
)
481499

482500
return DataTree.from_dict(groups_dict)
483501

xarray/backends/netCDF4_.py

+18-1
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,24 @@ def open_datatree(
713713

714714
from xarray.core.datatree import DataTree
715715

716-
groups_dict = self.open_groups_as_dict(filename_or_obj, **kwargs)
716+
groups_dict = self.open_groups_as_dict(
717+
filename_or_obj,
718+
mask_and_scale=mask_and_scale,
719+
decode_times=decode_times,
720+
concat_characters=concat_characters,
721+
decode_coords=decode_coords,
722+
drop_variables=drop_variables,
723+
use_cftime=use_cftime,
724+
decode_timedelta=decode_timedelta,
725+
group=group,
726+
format=format,
727+
clobber=clobber,
728+
diskless=diskless,
729+
persist=persist,
730+
lock=lock,
731+
autoclose=autoclose,
732+
**kwargs,
733+
)
717734

718735
return DataTree.from_dict(groups_dict)
719736

xarray/backends/zarr.py

+19-1
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,25 @@ def open_datatree(
12951295
from xarray.core.datatree import DataTree
12961296

12971297
filename_or_obj = _normalize_path(filename_or_obj)
1298-
groups_dict = self.open_groups_as_dict(filename_or_obj, **kwargs)
1298+
groups_dict = self.open_groups_as_dict(
1299+
filename_or_obj=filename_or_obj,
1300+
mask_and_scale=mask_and_scale,
1301+
decode_times=decode_times,
1302+
concat_characters=concat_characters,
1303+
decode_coords=decode_coords,
1304+
drop_variables=drop_variables,
1305+
use_cftime=use_cftime,
1306+
decode_timedelta=decode_timedelta,
1307+
group=group,
1308+
mode=mode,
1309+
synchronizer=synchronizer,
1310+
consolidated=consolidated,
1311+
chunk_store=chunk_store,
1312+
storage_options=storage_options,
1313+
stacklevel=stacklevel,
1314+
zarr_version=zarr_version,
1315+
**kwargs,
1316+
)
12991317

13001318
return DataTree.from_dict(groups_dict)
13011319

0 commit comments

Comments
 (0)