diff --git a/doc/source/references/release_notes.rst b/doc/source/references/release_notes.rst index 551be11c..de3f0211 100644 --- a/doc/source/references/release_notes.rst +++ b/doc/source/references/release_notes.rst @@ -1,9 +1,10 @@ Release history =============== -6.5.0 ------ +6.5.0 (unreleased) +------------------ +* [maint] Adapt generic indicators "excess" and "deficit" to xclim 0.45. * [maint] Upgrade minimal python version to 3.9 * [fix] Avoid resampling SPI* indices. diff --git a/environment.yml b/environment.yml index a4835a52..e2bb5b72 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,7 @@ channels: dependencies: # Core dependencies - python>=3.9 - - xclim==0.43 + - xclim>=0.45 - numpy - xarray>=2022.6 - cf_xarray>=0.7.4 diff --git a/icclim/generic_indices/generic_indicators.py b/icclim/generic_indices/generic_indicators.py index ce6fd4c9..ecc454b5 100644 --- a/icclim/generic_indices/generic_indicators.py +++ b/icclim/generic_indices/generic_indicators.py @@ -390,7 +390,8 @@ def excess( res = ( (excesses).clip(min=0).resample(time=resample_freq.pandas_freq).sum(dim="time") ) - return to_agg_units(res, study, "delta_prod") + res = res.assign_attrs(units=f"delta_{res.attrs['units']}") + return to_agg_units(res, study, "integral") def deficit( @@ -401,7 +402,8 @@ def deficit( study, threshold = get_single_var(climate_vars) deficit = threshold.compute(study, override_op=lambda da, th: th - da) res = deficit.clip(min=0).resample(time=resample_freq.pandas_freq).sum(dim="time") - return to_agg_units(res, study, "delta_prod") + res = res.assign_attrs(units=f"delta_{res.attrs['units']}") + return to_agg_units(res, study, "integral") def fraction_of_total( diff --git a/requirements.txt b/requirements.txt index 2f59f5ba..2651b813 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,5 +18,5 @@ sphinx_codeautolink sphinx_copybutton sphinx_lfs_content xarray>=2022.6 -xclim==0.43 +xclim>=0.45 zarr diff --git a/requirements_dev.txt b/requirements_dev.txt index 7f62d266..c0bcd80f 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -25,5 +25,5 @@ sphinx_copybutton sphinx_lfs_content twine xarray>=2022.6 -xclim==0.43 +xclim>=0.45 zarr diff --git a/setup.py b/setup.py index cadcd970..3f4dbb3a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ MINIMAL_REQUIREMENTS = [ "numpy>=1.16", "xarray>=2022.6", - "xclim>=0.43", + "xclim>=0.45, <=0.47", "cf_xarray>=0.7.4", "cftime>=1.4.1", "dask[array]",