Merge pull request #1068 from xcube-dev/konstntokas-xxx-adapt_xcube_t…

…o_new_xarray_release Adjustments to `resample_in_time()` so that xcube now supports `xarray=2024.7`
xcube-dev · Sep 10, 2024 · c6ebe6f · c6ebe6f
2 parents bcf6aaa + d7e1c72
commit c6ebe6f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+out.yml
 *.cover
 .hypothesis/
 .pytest_cache/

diff --git a/CHANGES.md b/CHANGES.md
@@ -71,6 +71,8 @@
   in the `open_params` of the `store.open_data()` method. (#1054)
   xcube server has been adapted to always open `MultiLevelDataset`s from
   a specified data store, if that data type is supported.
+* Adjustments to `resample_in_time()` in `xcube/core/resampling/temporal.py`
+  so that xcube now supports `xarray=2024.7`.
 
 ### Other changes
 

diff --git a/environment.yml b/environment.yml
@@ -40,7 +40,7 @@ dependencies:
   - shapely >=1.6
   - tornado >=6.0
   - urllib3 >=1.26
-  - xarray >=2022.6, <=2024.6
+  - xarray >=2022.6
   - zarr >=2.11
   # Testing
   - flake8 >=3.7

diff --git a/xcube/core/resampling/temporal.py b/xcube/core/resampling/temporal.py
@@ -80,7 +80,7 @@ def resample_in_time(
         dataset = select_variables_subset(dataset, var_names)
 
     resampler = dataset.resample(
-        skipna=True, closed="left", label="left", time=frequency, loffset=offset
+        skipna=True, closed="left", label="left", time=frequency, offset=offset
     )
 
     if isinstance(method, str):