Merge remote-tracking branch 'upstream/main' into whats-new-2023.02.0

* upstream/main:
  Update apply_ufunc output_sizes error message (pydata#7509)
  Zarr: drop "source" and  "original_shape" from encoding (pydata#7500)
  [pre-commit.ci] pre-commit autoupdate (pydata#7507)

Author: dcherian

.pre-commit-config.yaml

@@ -16,13 +16,13 @@ repos:
         files: ^xarray/
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.0.237'
+    rev: 'v0.0.241'
     hooks:
       - id: ruff
         args: ["--fix"]
   # https://github.com/python/black#version-control-integration
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
       - id: black-jupyter
@@ -31,7 +31,7 @@ repos:
     hooks:
       - id: blackdoc
         exclude: "generate_aggregations.py"
-        additional_dependencies: ["black==22.12.0"]
+        additional_dependencies: ["black==23.1.0"]
       - id: blackdoc-autoupdate-black
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.991

doc/conf.py

@@ -436,7 +436,6 @@ def update_videos(app: Sphinx):
 
     items = []
     for video in videos:
-
         authors = " | ".join(video["authors"])
         item = f"""
 .. grid-item-card:: {" ".join(video["title"].split())}

doc/examples/apply_ufunc_vectorize_1d.ipynb

@@ -663,7 +663,6 @@
     "\n",
     "\n",
     "def xr_interp(data, dim, newdim):\n",
-    "\n",
     "    interped = xr.apply_ufunc(\n",
     "        interp1d_np_gufunc,  # first the function\n",
     "        data,  # now arguments in the order expected by 'interp1_np'\n",

doc/whats-new.rst

@@ -24,6 +24,10 @@ This release brings a major upgrade to :py:func:`xarray.concat`, many bug fixes,
 and a bump in supported dependency versions. Thanks to our 11 contributors:
 Aron Gergely, Deepak Cherian, Illviljan, James Bourbeau, Joe Hamman,
 Justus Magin, Hauke Schulz, Kai Mühlbauer, Ken Mankoff, Spencer Clark, Tom Nicholas.
+This release brings a major upgrade to :py:func:`xarray.concat`, bug fixes and
+a bump in supported dependency versions. Thanks to our 9 contributors:
+Aron Gergely, Deepak Cherian, Illviljan, James Bourbeau, Joe Hamman,
+Justus Magin, Kai Mühlbauer, Ken Mankoff, Spencer Clark.
 
 Breaking changes
 ~~~~~~~~~~~~~~~~
@@ -58,6 +62,11 @@ Bug fixes
   By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_ and `Scott Chamberlin <https://github.com/scottcha>`_.
 - Handle ``keep_attrs`` option in binary operators of :py:meth:`Dataset` (:issue:`7390`, :pull:`7391`).
   By `Aron Gergely <https://github.com/arongergely>`_.
+- Improve error message when using dask in :py:func:`apply_ufunc` with ``output_sizes`` not supplied. (:pull:`7509`)
+  By `Tom Nicholas <https://github.com/TomNicholas>`_.
+- :py:func:`xarray.Dataset.to_zarr` now drops variable encodings that have been added by xarray during reading
+  a dataset. (:issue:`7129`, :pull:`7500`).
+  By `Hauke Schulz <https://github.com/observingClouds>`_.
 
 Documentation
 ~~~~~~~~~~~~~

xarray/backends/cfgrib_.py

@@ -119,7 +119,6 @@ def open_dataset(
         squeeze=True,
         time_dims=("time", "step"),
     ):
-
         filename_or_obj = _normalize_path(filename_or_obj)
         store = CfGribDataStore(
             filename_or_obj,

xarray/backends/h5netcdf_.py

@@ -401,7 +401,6 @@ def open_dataset(
         phony_dims=None,
         decode_vlen_strings=True,
     ):
-
         filename_or_obj = _normalize_path(filename_or_obj)
         store = H5NetCDFStore.open(
             filename_or_obj,

xarray/backends/netCDF4_.py

@@ -573,7 +573,6 @@ def open_dataset(
         lock=None,
         autoclose=False,
     ):
-
         filename_or_obj = _normalize_path(filename_or_obj)
         store = NetCDF4DataStore.open(
             filename_or_obj,

xarray/backends/pseudonetcdf_.py

@@ -156,7 +156,6 @@ def open_dataset(
         lock=None,
         **format_kwargs,
     ):
-
         filename_or_obj = _normalize_path(filename_or_obj)
         store = PseudoNetCDFDataStore.open(
             filename_or_obj, lock=lock, mode=mode, **format_kwargs

xarray/backends/pydap_.py

@@ -178,7 +178,6 @@ def open_dataset(
         verify=None,
         user_charset=None,
     ):
-
         store = PydapDataStore.open(
             url=filename_or_obj,
             application=application,

xarray/backends/scipy_.py

@@ -266,7 +266,6 @@ class ScipyBackendEntrypoint(BackendEntrypoint):
     url = "https://docs.xarray.dev/en/stable/generated/xarray.backends.ScipyBackendEntrypoint.html"
 
     def guess_can_open(self, filename_or_obj):
-
         magic_number = try_read_magic_number_from_file_or_path(filename_or_obj)
         if magic_number is not None and magic_number.startswith(b"\x1f\x8b"):
             with gzip.open(filename_or_obj) as f:
@@ -296,7 +295,6 @@ def open_dataset(
         mmap=None,
         lock=None,
     ):
-
         filename_or_obj = _normalize_path(filename_or_obj)
         store = ScipyDataStore(
             filename_or_obj, mode=mode, format=format, group=group, mmap=mmap, lock=lock