From a32c3b51c8318029dd3ab71f4e138cf8604668a0 Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 23 Jun 2025 10:05:07 -0400
Subject: [PATCH 1/6] raise xesmf and pandas pins, adjust xarray

---
 clisops/core/regrid.py    | 19 ++++++++++---------
 environment.yml           |  6 +++---
 pyproject.toml            | 10 +++++-----
 tests/test_core_subset.py | 18 +++++++++---------
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/clisops/core/regrid.py b/clisops/core/regrid.py
index d3597d7d..981aa48e 100644
--- a/clisops/core/regrid.py
+++ b/clisops/core/regrid.py
@@ -28,7 +28,7 @@
 
 # Try importing xesmf and set to None if not found at correct version
 # If set to None, the `require_module` decorator will throw an exception
-XESMF_MINIMUM_VERSION = "0.8.2"
+XESMF_MINIMUM_VERSION = "0.8.10"
 try:
     import xesmf as xe
 
@@ -41,10 +41,11 @@
 
 # FIXME: Remove this when xarray addresses https://github.com/pydata/xarray/issues/7794
 XARRAY_INCOMPATIBLE_VERSION = "2023.3.0"
+XARRAY_COMPATIBLE_VERSION = "2025.6.0"
 XARRAY_WARNING_MESSAGE = (
-    f"xarray version >= {XARRAY_INCOMPATIBLE_VERSION} "
-    f"is not supported for regridding operations with cf-time indexed arrays. "
-    f"Please use xarray version < {XARRAY_INCOMPATIBLE_VERSION}. "
+    f"xarray versions between {XARRAY_INCOMPATIBLE_VERSION} and {XARRAY_COMPATIBLE_VERSION} "
+    f"are not supported for regridding operations with cf-time indexed arrays. "
+    f"Please use xarray version >= {XARRAY_COMPATIBLE_VERSION}. "
     "For more information, see: https://github.com/pydata/xarray/issues/7794."
 )
 
@@ -76,8 +77,8 @@ def weights_cache_init(
     Parameters
     ----------
     weights_dir : str or Path
-        Directory name to initialize the local weights cache in.
-        Will be created if it does not exist.
+        Directory name to initialise the local weights cache in.
+        It will be created if it does not exist.
         Per default, this function is called upon import with weights_dir as defined in roocs.ini.
     config : dict
         Configuration dictionary as read from top-level.
@@ -122,7 +123,7 @@ def weights_cache_flush(
     ----------
     weights_dir_init : str, optional
         Directory name to reinitialize the local weights cache in.
-        Will be created if it does not exist.
+        It will be created if it does not exist.
         The default is CONFIG["clisops:grid_weights"]["local_weights_dir"] as defined in roocs.ini
         (or as redefined by a manual weights_cache_init call).
     dryrun : bool, optional
@@ -1554,7 +1555,7 @@ def to_netcdf(
     ):
         """Store a copy of the horizontal Grid as netCDF file on disk.
 
-        Define output folder, filename and output format (currently only 'CF' is supported).
+        Define output folder, file name and output format (currently only 'CF' is supported).
         Does not overwrite an existing file.
 
         Parameters
@@ -1635,7 +1636,7 @@ def to_netcdf(
 class Weights:
     """Creates remapping weights out of two Grid objects serving as source and target grid.
 
-    Reads weights from cache if possible. Reads weights from disk if specified (not yet implemented).
+    Reads weights from cache if possible or from disk if specified (not yet implemented).
     In the latter case, the weight file format has to be supported, to reformat it to xESMF format.
 
     Parameters
diff --git a/environment.yml b/environment.yml
index fd616946..dbbd2cb3 100644
--- a/environment.yml
+++ b/environment.yml
@@ -20,7 +20,7 @@ dependencies:
  - loguru >=0.5.3
  - numpy >=1.25.0,<2.3.0
  - packaging >=23.2
- - pandas >=1.5.3
+ - pandas >=2.2.0
  - platformdirs >=4.0
  - pooch >=1.8.0
  - pyproj >=3.3.0
@@ -29,13 +29,13 @@ dependencies:
  - s3fs >=2025.5.1
  - scipy >=1.11.0
  - shapely >=2.0
- - xarray >=2025.1.1 # use decode_times=CFDatetimeCoder(use_cftime=True)
+ - xarray >=2025.6.0
  - zarr >=2.13.0,<3.0
  # Compression
  - zstandard
  # Extras
  - netcdf4 >=1.4
- - xesmf >=0.8.2
+ - xesmf >=0.8.10
 #  # Dev tools and testing
  - black >=25.1.0
  - bump-my-version >=1.0.0
diff --git a/pyproject.toml b/pyproject.toml
index 849cf29d..2e3f9a32 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,8 +31,8 @@ classifiers = [
   "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.12", # Compatibility issues will persist until https://github.com/pydata/xarray/issues/7794 is resolved
-  "Programming Language :: Python :: 3.13", # Compatibility issues will persist until https://github.com/pydata/xarray/issues/7794 is resolved
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Topic :: Scientific/Engineering",
   "Topic :: Scientific/Engineering :: Atmospheric Science",
   "Topic :: Scientific/Engineering :: GIS",
@@ -58,7 +58,7 @@ dependencies = [
   "loguru >=0.5.3",
   "numpy >=1.25.0,<2.3.0",
   "packaging >=23.2",
-  "pandas >=1.5.3",
+  "pandas >=2.2.0",
   "platformdirs >=4.0",
   "pooch >=1.8.0",
   "pyproj >=3.3.0",
@@ -107,9 +107,9 @@ docs = [
   "sphinx-rtd-theme >=1.0"
 ]
 extras = [
-  "xesmf >=0.8.2",
+  "xesmf >=0.8.10",
   # See: https://github.com/pydata/xarray/issues/7794
-  "xarray >=2022.6.0,<2023.3.0"
+  "xarray >=2025.6.0"
 ]
 
 [project.urls]
diff --git a/tests/test_core_subset.py b/tests/test_core_subset.py
index 57c2eef5..52aa9319 100644
--- a/tests/test_core_subset.py
+++ b/tests/test_core_subset.py
@@ -838,11 +838,8 @@ def test_mask_multiregions(self, nimbus, clisops_test_data):
         np.testing.assert_array_equal(vals, [0, 1, 2])
         np.testing.assert_array_equal(counts, [58, 250, 22])
 
-    @pytest.mark.skipif(
-        xesmf is None, reason="xESMF >= 0.6.2 is needed for average_shape."
-    )
+    @pytest.mark.skipif(xesmf is None, reason="xESMF needed for average_shape.")
     def test_weight_masks_multiregions(self, nimbus, clisops_test_data):
-        # rename is due to a small limitation of xESMF 0.5.2
         ds = xr.open_dataset(nimbus.fetch(self.nc_file)).rename(bnds="bounds")
         regions = gpd.read_file(clisops_test_data["multi_regions_geojson"]).set_index(
             "id"
@@ -1064,8 +1061,9 @@ def test_nudge_levels(self, nimbus):
 
 
 class TestGridPolygon:
+
+    @pytest.mark.skipif(xesmf is None, reason="xESMF needed for average_shape.")
     def test_rectilinear(self):
-        pytest.importorskip("xesmf", "0.6.2")
         # CF-Compliant with bounds
         ds = xesmf.util.cf_grid_2d(-200, -100, 20, -60, 60, 10)
         poly = subset._rectilinear_grid_exterior_polygon(ds)
@@ -1101,9 +1099,10 @@ def test_curvilinear(self, mode, nimbus):
 
 
 class TestShapeBboxIndexer:
+
+    @pytest.mark.skipif(xesmf is None, reason="xESMF required.")
     def test_rectilinear(self):
         # Create small polygon fitting in one cell.
-        pytest.importorskip("xesmf", "0.6.2")
         x, y = -150, 35
         p = Point(x, y)
         ds = xesmf.util.cf_grid_2d(-200, 0, 20, -60, 60, 10)
@@ -1114,9 +1113,9 @@ def test_rectilinear(self):
             inds = subset.shape_bbox_indexer(ds, gpd.GeoDataFrame(geometry=[pb]))
             assert pb.within(subset.grid_exterior_polygon(ds.isel(inds)))
 
+    @pytest.mark.skipif(xesmf is None, reason="xESMF required.")
     def test_complex_geometries(self):
         # Test with geometries that cannot be simplified to a single polygon using `unary_union`.
-        pytest.importorskip("xesmf", "0.6.2")
         import shapely.wkt
 
         p1 = shapely.wkt.loads(
@@ -1149,9 +1148,9 @@ def test_complex_geometries(self):
         inds = subset.shape_bbox_indexer(ds, gpd.GeoDataFrame(geometry=[p1, p2]))
         assert inds == {}
 
+    @pytest.mark.skipif(xesmf is None, reason="xESMF required.")
     def test_curvilinear(self):
         # Check that grid along lon/lat and a rotated grid are indexed identically for geometry and rotated geometry.
-        pytest.importorskip("xesmf", "0.6.2")
         from shapely.affinity import rotate
 
         ds = xesmf.util.grid_2d(0, 100, 10, 0, 60, 6)
@@ -1165,9 +1164,9 @@ def test_curvilinear(self):
         ri = subset.shape_bbox_indexer(rds, gpd.GeoSeries([rgeom]))
         assert ri == i
 
+    @pytest.mark.skipif(xesmf is None, reason="xESMF required.")
     def test_multipoints(self):
         # Test with a MultiPoint geometry.
-        pytest.importorskip("xesmf", "0.6.2")
         from shapely.geometry import MultiPoint, Point
 
         ds = xesmf.util.cf_grid_2d(-200, 0, 20, -60, 60, 10)
@@ -1189,6 +1188,7 @@ def test_multipoints(self):
             assert geom.within(subset.grid_exterior_polygon(ds.isel(inds)))
 
 
+@pytest.mark.skipif(xesmf is None, reason="xESMF required.")
 def rotated_grid_2d(lon0_b, lon1_b, d_lon, lat0_b, lat1_b, d_lat, angle):
     # Rotate lat lon by degree.
     ds = xesmf.util.grid_2d(lon0_b, lon1_b, d_lon, lat0_b, lat1_b, d_lat)

From 732d5ce3f2cd4c4facacf8e124db2fa47980eda6 Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 23 Jun 2025 10:05:43 -0400
Subject: [PATCH 2/6] adjust docs recipe for tox

---
 Makefile | 2 ++
 tox.ini  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 87312b87..3b704702 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,9 @@ autodoc: clean-docs ## create sphinx-apidoc files:
 
 docs: autodoc ## generate Sphinx HTML documentation, including API docs
 	$(MAKE) -C docs html
+ifndef READTHEDOCS
 	$(BROWSER) docs/_build/html/index.html
+endif
 
 servedocs: docs ## compile the docs watching for changes
 	watchmedo shell-command -p '*.md' -c '$(MAKE) -C docs html' -R -D .
diff --git a/tox.ini b/tox.ini
index c8cca00b..bd9e5f7b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,12 @@ allowlist_externals =
     make
 
 [testenv:docs]
+setenv =
+    READTHEDOCS = 1
 extras = docs
 deps =
 commands =
-    make --directory=docs clean html
+    make docs
 allowlist_externals =
     make
 

From be89b44bf2a41a84fa0e3c9de810c601e9d99f20 Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 23 Jun 2025 11:47:11 -0400
Subject: [PATCH 3/6] switch netcdf4 for h5netcdf for stability reasons, add
 default of h5netcdf when writing out netcdf files, remove some
 pytest.mark.xfail warnings

---
 clisops/ops/average.py        |  3 +--
 clisops/utils/output_utils.py | 25 ++++++++++++++++---------
 environment.yml               |  2 +-
 pyproject.toml                |  2 +-
 tests/conftest.py             |  2 --
 tests/test_core_regrid.py     |  3 ---
 tests/test_core_subset.py     |  8 ++------
 tests/test_ops_subset.py      |  4 ++++
 8 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/clisops/ops/average.py b/clisops/ops/average.py
index 7248081d..a056cff2 100644
--- a/clisops/ops/average.py
+++ b/clisops/ops/average.py
@@ -136,7 +136,6 @@ def average_shape(
     shape : Union[str, Path, gpd.GeoDataFrame]
         Path to shape file, or directly a GeoDataFrame. Supports formats compatible with geopandas.
         Will be converted to EPSG:4326 if needed.
-
     variable : Optional[Union[str, Sequence[str], None]]
         Variables to average. If None, average over all data variables.
     output_dir : Optional[Union[str, Path]]
@@ -210,7 +209,7 @@ def average_time(
     ds : Union[xr.Dataset, str]
         Xarray dataset.
     freq : str
-        The frequency to average over. One of "month", "year".
+        The frequency to average over, either "month" or "year".
     output_dir : Optional[Union[str, Path]]
     output_type : {"netcdf", "nc", "zarr", "xarray"}
     split_method : {"time:auto"}
diff --git a/clisops/utils/output_utils.py b/clisops/utils/output_utils.py
index 8a0ef343..2911ff03 100644
--- a/clisops/utils/output_utils.py
+++ b/clisops/utils/output_utils.py
@@ -18,9 +18,9 @@
 from clisops.utils.dataset_utils import get_main_variable
 
 SUPPORTED_FORMATS = {
-    "netcdf": {"method": "to_netcdf", "extension": "nc"},
-    "nc": {"method": "to_netcdf", "extension": "nc"},
-    "zarr": {"method": "to_zarr", "extension": "zarr"},
+    "netcdf": {"method": "to_netcdf", "extension": "nc", "engine": "h5netcdf"},
+    "nc": {"method": "to_netcdf", "extension": "nc", "engine": "h5netcdf"},
+    "zarr": {"method": "to_zarr", "extension": "zarr", "engine": "zarr"},
     "xarray": {"method": None, "extension": None},
 }
 
@@ -28,7 +28,7 @@
 
 
 def check_format(fmt):
-    """Checks requested format exists."""
+    """Check that the requested format exists."""
     if fmt not in SUPPORTED_FORMATS:
         raise KeyError(
             f'Format not recognised: "{fmt}". Must be one of: {SUPPORTED_FORMATS}.'
@@ -47,6 +47,12 @@ def get_format_extension(fmt):
     return SUPPORTED_FORMATS[fmt]["extension"]
 
 
+def get_format_engine(fmt):
+    """Finds the engine for the requested output format."""
+    check_format(fmt)
+    return SUPPORTED_FORMATS[fmt]["engine"]
+
+
 def _format_time(tm: Union[str, dt], fmt="%Y-%m-%d"):
     """Convert to datetime if time is a numpy datetime."""
     if not hasattr(tm, "strftime"):
@@ -74,7 +80,7 @@ def filter_times_within(times, start=None, end=None):
 
 
 def get_da(ds):
-    """Returns xr.DataArray when format of ds may be either xr.Dataset or xr.DataArray."""
+    """Returns xr.DataArray when the format of ds may be either xr.Dataset or xr.DataArray."""
     if isinstance(ds, xr.DataArray):
         da = ds
     else:
@@ -119,7 +125,7 @@ def get_time_slices(
             f"The split method {split_method} is not implemented."
         )
 
-    # Use default file size limit if not provided
+    # Use the default file size limit if not provided
     if not file_size_limit:
         file_size_limit = parse_size(CONFIG["clisops:write"]["file_size_limit"])
 
@@ -164,7 +170,7 @@ def get_time_slices(
 def get_chunk_length(da):
     """Calculate the chunk length to use when chunking xarray datasets.
 
-    Based on memory limit provided in config and the size of the dataset.
+    Based on the memory limit provided in config and the size of the dataset.
     """
     size = da.nbytes
     n_times = len(da.time.values)
@@ -209,7 +215,7 @@ def get_output(ds, output_type, output_dir, namer):
     except AttributeError:
         chunked_ds = ds
 
-    # If `output_dir` is not set, use current directory
+    # If `output_dir` is not set, use the current directory
     if not output_dir:
         output_dir = Path().cwd().expanduser()
     else:
@@ -235,7 +241,8 @@ def get_output(ds, output_type, output_dir, namer):
     #  - https://docs.dask.org/en/latest/scheduling.html
     with dask.config.set(scheduler="synchronous"):
         writer = getattr(chunked_ds, format_writer)
-        delayed_obj = writer(target_path, compute=False)
+        engine = get_format_engine(output_type)
+        delayed_obj = writer(target_path, engine=engine, compute=False)
         delayed_obj.compute()
 
     # If "output_staging_dir" is set, then pause, move the output file,
diff --git a/environment.yml b/environment.yml
index dbbd2cb3..a573843a 100644
--- a/environment.yml
+++ b/environment.yml
@@ -42,8 +42,8 @@ dependencies:
  - coverage >=7.5.0
  - deptry >=0.23.0
  - flake8 >=7.1.0
+ - h5netcdf >=1.4.0
  - isort >=6.0.1
- - netCDF4 >=1.4
  - pre-commit >=3.5.0
  - pytest >=8.0.0
  - pytest-cov >=5.0.0
diff --git a/pyproject.toml b/pyproject.toml
index 2e3f9a32..3a4bea61 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -80,8 +80,8 @@ dev = [
   "coverage[toml] >=7.5.0",
   "deptry >=0.23.0",
   "flake8 >=7.2.0",
+  "h5netcdf >=1.4.0",
   "isort >=6.0.1",
-  "netCDF4 >=1.4",
   "pip >=25.0",
   "pre-commit >=3.5.0",
   "pytest >=8.0.0",
diff --git a/tests/conftest.py b/tests/conftest.py
index fc460987..819a95d9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,9 +6,7 @@
 import pytest
 import xarray as xr
 from _pytest.logging import caplog as _caplog  # noqa
-from packaging.version import Version
 
-from clisops.core.regrid import XARRAY_INCOMPATIBLE_VERSION
 from clisops.utils import testing
 from clisops.utils.testing import stratus as _stratus
 from clisops.utils.testing import write_roocs_cfg as _write_roocs_cfg
diff --git a/tests/test_core_regrid.py b/tests/test_core_regrid.py
index 6f97cdf6..9ed5e87b 100644
--- a/tests/test_core_regrid.py
+++ b/tests/test_core_regrid.py
@@ -152,9 +152,6 @@ def test_grid_init_ds_tos_degenerated_cells(mini_esgf_data):
         ]
 
 
-@pytest.mark.xfail(
-    reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-)
 def test_grid_init_da_tas_regular(mini_esgf_data):
     with xr.open_dataset(
         mini_esgf_data["CMIP6_TAS_ONE_TIME_STEP"],
diff --git a/tests/test_core_subset.py b/tests/test_core_subset.py
index 52aa9319..e258ab2b 100644
--- a/tests/test_core_subset.py
+++ b/tests/test_core_subset.py
@@ -338,10 +338,6 @@ class TestSubsetBbox:
     lonGCM = [-70.0, -60.0]
     latGCM = [43.0, 59.0]
 
-    @pytest.mark.xfail(
-        reason="NetCDF4 has thread safety issues. Consider using h5netcdf in the future",
-        strict=False,
-    )
     def test_dataset(self, nimbus):
         da = xr.open_mfdataset(
             [nimbus.fetch(self.nc_tasmax_file), nimbus.fetch(self.nc_tasmin_file)],
@@ -838,7 +834,7 @@ def test_mask_multiregions(self, nimbus, clisops_test_data):
         np.testing.assert_array_equal(vals, [0, 1, 2])
         np.testing.assert_array_equal(counts, [58, 250, 22])
 
-    @pytest.mark.skipif(xesmf is None, reason="xESMF needed for average_shape.")
+    @pytest.mark.skipif(xesmf is None, reason="xESMF required.")
     def test_weight_masks_multiregions(self, nimbus, clisops_test_data):
         ds = xr.open_dataset(nimbus.fetch(self.nc_file)).rename(bnds="bounds")
         regions = gpd.read_file(clisops_test_data["multi_regions_geojson"]).set_index(
@@ -1062,7 +1058,7 @@ def test_nudge_levels(self, nimbus):
 
 class TestGridPolygon:
 
-    @pytest.mark.skipif(xesmf is None, reason="xESMF needed for average_shape.")
+    @pytest.mark.skipif(xesmf is None, reason="xESMF required.")
     def test_rectilinear(self):
         # CF-Compliant with bounds
         ds = xesmf.util.cf_grid_2d(-200, -100, 20, -60, 60, 10)
diff --git a/tests/test_ops_subset.py b/tests/test_ops_subset.py
index ac58a282..96967ddf 100644
--- a/tests/test_ops_subset.py
+++ b/tests/test_ops_subset.py
@@ -642,6 +642,10 @@ def test_time_invariant_subset_standard_name(tmpdir, check_output_nc, mini_esgf_
     check_output_nc(result, fname="mrsofc_fx_IPSL-CM6A-LR_ssp119_r1i1p1f1_gr.nc")
 
 
+@pytest.mark.xfail(
+    reason="Dataset metadata are badly encoded and not easily handled by h5netcdf",
+    strict=False,
+)
 def test_longitude_and_latitude_coords_only(tmpdir, check_output_nc, mini_esgf_data):
     """Test subset succeeds when latitude and longitude are coordinates not dims and are not called lat/lon"""
     result = subset(

From c552e3fb98f8952ac2569c6483259d5b55d44b72 Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:37:17 -0400
Subject: [PATCH 4/6] remove more obsolete xfail markers

---
 tests/test_ops_regrid.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/test_ops_regrid.py b/tests/test_ops_regrid.py
index 46979923..a859ee60 100644
--- a/tests/test_ops_regrid.py
+++ b/tests/test_ops_regrid.py
@@ -72,9 +72,6 @@ def test_regrid_grid_as_none(tmpdir, tmp_path, mini_esgf_data):
 
 
 @pytest.mark.slow
-@pytest.mark.xfail(
-    reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-)
 @pytest.mark.skipif(xe is None, reason=XESMF_IMPORT_MSG)
 @pytest.mark.parametrize("grid_id", sorted(grid_dict))
 def test_regrid_regular_grid_to_all_roocs_grids(
@@ -153,9 +150,6 @@ def test_subset_and_regrid_erroneous_cf_units_cmip5(tmpdir, mini_esgf_data, tmp_
 
 
 @pytest.mark.slow
-@pytest.mark.xfail(
-    reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-)
 @pytest.mark.skipif(xe is None, reason=XESMF_IMPORT_MSG)
 @pytest.mark.parametrize(
     "dset", ["ATLAS_v1_CORDEX", "ATLAS_v1_EOBS_GRID", "ATLAS_v0_CORDEX_ANT"]
@@ -176,9 +170,6 @@ def test_regrid_ATLAS_datasets(tmpdir, dset, mini_esgf_data):
     )
 
 
-@pytest.mark.xfail(
-    reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-)
 @pytest.mark.skipif(xe is None, reason=XESMF_IMPORT_MSG)
 def test_regrid_ATLAS_CORDEX(tmpdir, caplog, mini_esgf_data):  # noqa
     """Test regridding for ATLAS CORDEX dataset."""
@@ -382,9 +373,6 @@ def test_regrid_same_grid_exception(tmpdir, tmp_path):
     xr.testing.assert_identical(ds, ds_regrid)
 
 
-@pytest.mark.xfail(
-    reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-)
 @pytest.mark.skipif(xe is None, reason=XESMF_IMPORT_MSG)
 def test_regrid_cmip6_nc_consistent_bounds_and_coords(tmpdir, mini_esgf_data):
     """Tests clisops regrid function and check metadata added by xarray"""

From 93fa12b1e3cbb2b94625c1a76175d00ad12a5148 Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:38:58 -0400
Subject: [PATCH 5/6] remove more obsolete xfail markers

---
 tests/test_core_regrid.py | 3 ---
 tests/test_ops_regrid.py  | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/tests/test_core_regrid.py b/tests/test_core_regrid.py
index 9ed5e87b..4a9c154e 100644
--- a/tests/test_core_regrid.py
+++ b/tests/test_core_regrid.py
@@ -1529,9 +1529,6 @@ def test_duplicated_cells_warning_issued(self, tmp_path, mini_esgf_data):
                 else:
                     assert len(issuedWarnings) == 1
 
-    @pytest.mark.xfail(
-        reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-    )
     def test_regrid_dataarray(self, tmp_path, mini_esgf_data):
         with xr.open_dataset(
             mini_esgf_data[self.c6tots],
diff --git a/tests/test_ops_regrid.py b/tests/test_ops_regrid.py
index a859ee60..c5be64f7 100644
--- a/tests/test_ops_regrid.py
+++ b/tests/test_ops_regrid.py
@@ -21,9 +21,6 @@ def _check_output_nc(result, fname="output_001.nc"):
     assert fname in [os.path.basename(_) for _ in result]
 
 
-@pytest.mark.xfail(
-    reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-)
 @pytest.mark.skipif(xe is None, reason=XESMF_IMPORT_MSG)
 def test_regrid_basic(tmpdir, tmp_path, mini_esgf_data):
     """Test a basic regridding operation."""
@@ -104,9 +101,6 @@ def test_regrid_regular_grid_to_all_roocs_grids(
 
 
 @pytest.mark.slow
-@pytest.mark.xfail(
-    reason="Needs xarray fix https://github.com/pydata/xarray/issues/7794"
-)
 @pytest.mark.skipif(xe is None, reason=XESMF_IMPORT_MSG)
 def test_subset_and_regrid_erroneous_cf_units_cmip5(tmpdir, mini_esgf_data, tmp_path):
     """Test subset and regrid ds with erroneous cf units."""

From 62a8186e39c2d8959c6e85df0209dd42d91d8623 Mon Sep 17 00:00:00 2001
From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Date: Wed, 25 Jun 2025 13:50:13 -0400
Subject: [PATCH 6/6] update HISTORY.rst

---
 HISTORY.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 46d558dc..a1d29f1f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,13 +1,17 @@
 Version History
 ===============
 
-next release
+v0.17.0 (unreleased)
 --------------------
 
 Bug Fixes
 ^^^^^^^^^
+* Fixed support for `kerchunk` with `s3`. Pinned `zarr >=2.13.0,<3.0` (#429).
+* Lift pin on `xarray` that was previously due to incompatibilities with `xesmf`. `xarray>=2025.1.1` now required for general usage and `xarray>=2025.6.0` for `regrid` operations (#437).
 
-* Fixed support for kerchunk with s3. Pinned `zarr >=2.13.0,<3.0` (#429).
+Internal Changes
+^^^^^^^^^^^^^^^^
+* `tox` and Makefile configuration for testing docs has been adjusted to ensure that builds do not rely on opening a browser window (#437).
 
 v0.16.2 (2025-04-14)
 --------------------