Merge remote-tracking branch 'upstream/main' into polyfit-coords

ci/install-upstream-wheels.sh

@@ -12,8 +12,6 @@ fi
 $conda remove -y numba numbagg sparse
 # temporarily remove numexpr
 $conda remove -y numexpr
-# temporarily remove backends
-$conda remove -y pydap
 # forcibly remove packages to avoid artifacts
 $conda remove -y --force \
     numpy \

ci/requirements/all-but-dask.yml

@@ -27,7 +27,7 @@ dependencies:
   - pandas
   - pint>=0.22
   - pip
-  # - pydap
+  - pydap
   - pytest
   - pytest-cov
   - pytest-env

ci/requirements/doc.yml

@@ -28,6 +28,7 @@ dependencies:
   - pooch
   - pip
   - pre-commit
+  - pyarrow
   - pyproj
   - scipy!=1.10.0
   - seaborn

ci/requirements/environment-windows.yml

@@ -29,7 +29,7 @@ dependencies:
   # - pint>=0.22
   - pip
   - pre-commit
-  # - pydap
+  - pydap
   - pytest
   - pytest-cov
   - pytest-env

ci/requirements/environment.yml

@@ -35,7 +35,7 @@ dependencies:
   - pooch
   - pre-commit
   - pyarrow # pandas raises a deprecation warning without this, breaking doctests
-  # - pydap
+  - pydap
   - pytest
   - pytest-cov
   - pytest-env

doc/api-hidden.rst

@@ -684,7 +684,6 @@
 
    conventions.decode_cf_variables
 
-   coding.variables.UnsignedIntegerCoder
    coding.variables.CFMaskCoder
    coding.variables.CFScaleOffsetCoder
 

doc/conf.py

@@ -153,6 +153,9 @@
     "matplotlib colormap name": ":doc:`matplotlib colormap name <matplotlib:gallery/color/colormap_reference>`",
     "matplotlib axes object": ":py:class:`matplotlib axes object <matplotlib.axes.Axes>`",
     "colormap": ":py:class:`colormap <matplotlib.colors.Colormap>`",
+    # xarray terms
+    "dim name": ":term:`dimension name <name>`",
+    "var name": ":term:`variable name <name>`",
     # objects without namespace: xarray
     "DataArray": "~xarray.DataArray",
     "Dataset": "~xarray.Dataset",

doc/internals/chunked-arrays.rst

@@ -91,7 +91,8 @@ Once the chunkmanager subclass has been registered, xarray objects wrapping the
 The latter two methods ultimately call the chunkmanager's implementation of ``.from_array``, to which they pass the ``from_array_kwargs`` dict.
 The ``chunked_array_type`` kwarg selects which registered chunkmanager subclass to dispatch to. It defaults to ``'dask'``
 if Dask is installed, otherwise it defaults to whichever chunkmanager is registered if only one is registered.
-If multiple chunkmanagers are registered it will raise an error by default.
+If multiple chunkmanagers are registered, the ``chunk_manager`` configuration option (which can be set using :py:func:`set_options`)
+will be used to determine which chunkmanager to use, defaulting to ``'dask'``.
 
 Parallel processing without chunks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/user-guide/reshaping.rst

@@ -274,7 +274,7 @@ Sort
 ----
 
 One may sort a DataArray/Dataset via :py:meth:`~xarray.DataArray.sortby` and
-:py:meth:`~xarray.Dataset.sortby`.  The input can be an individual or list of
+:py:meth:`~xarray.Dataset.sortby`. The input can be an individual or list of
 1D ``DataArray`` objects:
 
 .. ipython:: python

doc/whats-new.rst

@@ -22,7 +22,10 @@ v2024.07.1 (unreleased)
 
 New Features
 ~~~~~~~~~~~~
-
+- Make chunk manager an option in ``set_options`` (:pull:`9362`).
+  By `Tom White <https://github.com/tomwhite>`_.
+- Allow data variable specific ``constant_values`` in the dataset ``pad`` function (:pull:`9353``).
+  By `Tiago Sanona <https://github.com/tsanona>`_.
 
 Breaking changes
 ~~~~~~~~~~~~~~~~
@@ -48,6 +51,12 @@ Bug fixes
   <https://github.com/dcherian>`_.
 - Fix issue where polyfit wouldn't handle non-dimension coordinates. (:issue:`4375`, :pull:`9369`)
   By `Karl Krauth <https://github.com/Karl-Krauth>`_.
+- Fix issue with passing parameters to ZarrStore.open_store when opening
+  datatree in zarr format (:issue:`9376`, :pull:`9377`).
+  By `Alfonso Ladino <https://github.com/aladinor>`_
+- Fix deprecation warning that was raised when calling ``np.array`` on an ``xr.DataArray``
+  in NumPy 2.0 (:issue:`9312`, :pull:`9393`)
+  By `Andrew Scherer <https://github.com/andrew-s28>`_.
 
 Documentation
 ~~~~~~~~~~~~~
@@ -56,6 +65,9 @@ Documentation
 Internal Changes
 ~~~~~~~~~~~~~~~~
 
+- Re-enable testing ``pydap`` backend with ``numpy>=2`` (:pull:`9391`).
+  By `Miguel Jimenez <https://github.com/Mikejmnez>`_ .
+
 
 
 .. _whats-new.2024.07.0:

xarray/backends/zarr.py

@@ -1225,15 +1225,37 @@ def open_datatree(
         filename_or_obj = _normalize_path(filename_or_obj)
         if group:
             parent = NodePath("/") / NodePath(group)
-            stores = ZarrStore.open_store(filename_or_obj, group=parent)
+            stores = ZarrStore.open_store(
+                filename_or_obj,
+                group=parent,
+                mode=mode,
+                synchronizer=synchronizer,
+                consolidated=consolidated,
+                consolidate_on_close=False,
+                chunk_store=chunk_store,
+                storage_options=storage_options,
+                stacklevel=stacklevel + 1,
+                zarr_version=zarr_version,
+            )
             if not stores:
                 ds = open_dataset(
                     filename_or_obj, group=parent, engine="zarr", **kwargs
                 )
                 return DataTree.from_dict({str(parent): ds})
         else:
             parent = NodePath("/")
-            stores = ZarrStore.open_store(filename_or_obj, group=parent)
+            stores = ZarrStore.open_store(
+                filename_or_obj,
+                group=parent,
+                mode=mode,
+                synchronizer=synchronizer,
+                consolidated=consolidated,
+                consolidate_on_close=False,
+                chunk_store=chunk_store,
+                storage_options=storage_options,
+                stacklevel=stacklevel + 1,
+                zarr_version=zarr_version,
+            )
         ds = open_dataset(filename_or_obj, group=parent, engine="zarr", **kwargs)
         tree_root = DataTree.from_dict({str(parent): ds})
         for path_group, store in stores.items():