From d7e1c72a0af869d54f7c95210c4bd0b9150222f3 Mon Sep 17 00:00:00 2001 From: konstntokas Date: Tue, 10 Sep 2024 12:13:14 +0200 Subject: [PATCH] adjustements to resample_in_time() --- .gitignore | 1 + CHANGES.md | 2 ++ environment.yml | 2 +- xcube/core/resampling/temporal.py | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 40b615f58..542c62222 100644 --- 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 index 1343bea6d..51625f917 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -69,6 +69,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 index c05f1d8e9..6b5113c6d 100644 --- 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 index 388976641..9d05f0ac2 100644 --- 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):