Skip to content

Commit

Permalink
Merge pull request #238 from cerfacs-globc/maint/upgrade-xclim
Browse files Browse the repository at this point in the history
MAINT: Upgrade to xclim 0.39
  • Loading branch information
bzah authored Nov 12, 2022
2 parents 26a2add + ab7f97b commit bb07b0f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
5 changes: 3 additions & 2 deletions doc/source/references/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Release history
===============

6.1.0 (unreleased)
------------------
6.1.0
-----
* [fix] Add unit getter/setter for BoundedThreshold.
* [enh] Add ECAD wind indices ``{fxx, fg6bft, fgcalm, fg, ddnorth, ddeast, ddsouth, ddwest}``.
`ddnorth` and `ddsouth` do not follow the ECAD's ATBD v11 requirements as their definition seems to be wrong in the document.
* [enh] Add generic indicators as stand-alone functions in `icclim` namespace.
* [doc] Add documentation for generic indicators stand-alone functions.
* [doc] Add a recipe "how to" documentation for generic indicators.
* [enh] Add ECAD's indices GSL, SPI3, SPI6 by binding them to xclim's indicators.
* [maint] Upgrade to xclim 0.39.0


6.0.0
Expand Down
5 changes: 3 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ channels:
dependencies:
# Core dependencies
- python>=3.8
- xclim>=0.37
- xclim>=0.39
- numpy
- xarray>=0.19
- xarray>=2022.6
- cf_xarray>=0.7.4
- dask[array]
- netCDF4>=1.5.7
- cftime>=1.5.0
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cf_xarray>=0.7.4
cftime
dask[array]
dateparser
Expand All @@ -17,5 +18,5 @@ sphinx_codeautolink
sphinx_copybutton
sphinx_lfs_content
xarray>=2022.6
xclim~=0.38.0
xclim~=0.39.0
zarr
3 changes: 2 additions & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
black
cf_xarray>=0.7.4
cftime~=1.5.0
dask
dateparser
Expand All @@ -24,5 +25,5 @@ sphinx_copybutton
sphinx_lfs_content
twine
xarray>=2022.6
xclim~=0.38.0
xclim~=0.39.0
zarr
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from setuptools import find_packages, setup

MINIMAL_REQUIREMENTS = [
"pint<0.20", # Temporary pin until xclim 0.39 is released
"numpy>=1.16",
"xarray>=2022.6",
"xclim>=0.38",
"xclim>=0.39",
"cf_xarray>=0.7.4",
"cftime>=1.4.1",
"dask[array]",
"netCDF4>=1.5.7",
Expand Down

0 comments on commit bb07b0f

Please sign in to comment.