Merge branch 'main' into concat_default_kwargs

Author: jsignell

README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/pydata/xarray/workflows/CI/badge.svg?branch=main)](https://github.com/pydata/xarray/actions?query=workflow%3ACI)
 [![Code coverage](https://codecov.io/gh/pydata/xarray/branch/main/graph/badge.svg?flag=unittests)](https://codecov.io/gh/pydata/xarray)
 [![Docs](https://readthedocs.org/projects/xray/badge/?version=latest)](https://docs.xarray.dev/)
-[![Benchmarked with asv](https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](https://pandas.pydata.org/speed/xarray/)
+[![Benchmarked with asv](https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](https://asv-runner.github.io/asv-collection/xarray/)
 [![Formatted with black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
 [![Available on pypi](https://img.shields.io/pypi/v/xarray.svg)](https://pypi.python.org/pypi/xarray/)

ci/requirements/environment-3.14.yml

@@ -29,7 +29,7 @@ dependencies:
   - opt_einsum
   - packaging
   - pandas
-  - pandas-stubs
+  - pandas-stubs<=2.2.3.241126 # https://github.com/pydata/xarray/issues/10110
   # - pint>=0.22
   - pip
   - pooch

ci/requirements/environment-windows-3.14.yml

@@ -25,7 +25,7 @@ dependencies:
   - numpy
   - packaging
   - pandas
-  - pandas-stubs
+  - pandas-stubs<=2.2.3.241126 # https://github.com/pydata/xarray/issues/10110
   # - pint>=0.22
   - pip
   - pre-commit

ci/requirements/environment-windows.yml

@@ -25,7 +25,7 @@ dependencies:
   - numpy
   - packaging
   - pandas
-  - pandas-stubs
+  - pandas-stubs<=2.2.3.241126 # https://github.com/pydata/xarray/issues/10110
   # - pint>=0.22
   - pip
   - pre-commit

ci/requirements/environment.yml

@@ -29,7 +29,7 @@ dependencies:
   - opt_einsum
   - packaging
   - pandas
-  - pandas-stubs
+  - pandas-stubs<=2.2.3.241126 # https://github.com/pydata/xarray/issues/10110
   # - pint>=0.22
   - pip
   - pooch

xarray/tests/test_backends.py

@@ -2628,12 +2628,10 @@ def test_hidden_zarr_keys(self) -> None:
                 for var in expected.variables.keys():
                     assert self.DIMENSION_KEY not in expected[var].attrs
 
-            if has_zarr_v3:
-                # temporary workaround for https://github.com/zarr-developers/zarr-python/issues/2338
-                zarr_group.store._is_open = True
-
             # put it back and try removing from a variable
-            del zarr_group["var2"].attrs[self.DIMENSION_KEY]
+            attrs = dict(zarr_group["var2"].attrs)
+            del attrs[self.DIMENSION_KEY]
+            zarr_group["var2"].attrs.put(attrs)
 
             with pytest.raises(KeyError):
                 with xr.decode_cf(store):