From 2d37e63a0fd1f0f0043273de1099e741a09142fa Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:31:22 +0000 Subject: [PATCH 1/3] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 22.12.0 → 23.1.0](https://github.com/psf/black/compare/22.12.0...23.1.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4631074f..cf95e169 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: - id: requirements-txt-fixer language_version: python3 - repo: https://github.com/psf/black - rev: 22.12.0 + rev: 23.1.0 hooks: - id: black language_version: python3 From 30bd0513ead26961a392c36db25023bf0b571570 Mon Sep 17 00:00:00 2001 From: Abel Date: Tue, 14 Feb 2023 19:44:39 +0100 Subject: [PATCH 2/3] FIX: Pin xclim to 0.40 --- environment.yml | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index 0270b39e..15726cfc 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,7 @@ channels: dependencies: # Core dependencies - python>=3.8 - - xclim>=0.40 + - xclim==0.40 - numpy - xarray>=2022.6 - cf_xarray>=0.7.4 diff --git a/requirements.txt b/requirements.txt index c4efa363..c3ab746c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,5 +18,5 @@ sphinx_codeautolink sphinx_copybutton sphinx_lfs_content xarray>=2022.6 -xclim~=0.40 +xclim==0.40 zarr diff --git a/requirements_dev.txt b/requirements_dev.txt index e4ae9a04..f79a514a 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -25,5 +25,5 @@ sphinx_copybutton sphinx_lfs_content twine xarray>=2022.6 -xclim~=0.40 +xclim==0.40 zarr diff --git a/setup.py b/setup.py index 763d04c7..292b4662 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ MINIMAL_REQUIREMENTS = [ "numpy>=1.16", "xarray>=2022.6", - "xclim>=0.40", + "xclim==0.40", "cf_xarray>=0.7.4", "cftime>=1.4.1", "dask[array]", From 63b3e370111793149a22b84aa402aefb088f8b7c Mon Sep 17 00:00:00 2001 From: Abel Date: Tue, 14 Feb 2023 19:46:48 +0100 Subject: [PATCH 3/3] DOC: Release note --- doc/source/references/release_notes.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/source/references/release_notes.rst b/doc/source/references/release_notes.rst index 24dc0e76..2e949f77 100644 --- a/doc/source/references/release_notes.rst +++ b/doc/source/references/release_notes.rst @@ -1,12 +1,14 @@ Release history =============== -6.2.0 (unreleased) ------------------- +6.2.0 +----- * [maint] Upgrade and adapt to xclim 0.40. Moved PercentileDataArray from xclim to icclim. Adapted the unit cenversion to use the hydro context. +* [fix] Pin xclim to exact 0.40 to avoid breaking changes. + 6.1.5 -----