From 2b2972c8dac2e900e6a0980fab10baaa3c10ff3b Mon Sep 17 00:00:00 2001 From: Pascal Bourgault Date: Wed, 29 Nov 2023 10:11:14 -0500 Subject: [PATCH 1/3] pin xarray and pandas --- CHANGES.rst | 4 ++++ environment.yml | 4 ++-- pyproject.toml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index db98c2079..085ad1b2c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,6 +6,10 @@ v0.47.0 (unreleased) -------------------- Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`), Pascal Bourgault (:user:`aulemahal`), Trevor James Smith (:user:`Zeitsperre`). +Announcements +^^^^^^^^^^^^^ +* To circumvent issues stemming from the change in the frequency code convention in pandas 2.2, we pinned xarray < 2023.11.0 and pandas < 2.2 for this release. The next release will invert the pins (>= 2023.11.0 and >= 2.2). Which also means this is the last version of xclim supporting python 3.8. + New features and enhancements ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ * New functions ``xclim.ensembles.robustness_fractions`` and ``xclim.ensembles.robustness_categories``. The former will replace ``xclim.ensembles.change_significance`` which is now deprecated and will be removed in xclim 0.49 (:pull:`1514`). diff --git a/environment.yml b/environment.yml index 3b240436b..eb70f5a47 100644 --- a/environment.yml +++ b/environment.yml @@ -16,14 +16,14 @@ dependencies: - lmoments3 - numba - numpy >=1.16 - - pandas >=0.23 + - pandas >=0.23, <2.2 - pint >=0.9 - poppler >=0.67 - pyyaml - scikit-learn >=0.21.3 - scipy >=1.2 - statsmodels - - xarray >=2022.06.0 + - xarray >=2022.06.0, <2023.11.0 # Extras - eofs - flox diff --git a/pyproject.toml b/pyproject.toml index c2f107faa..bb8701883 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,13 +45,13 @@ dependencies = [ "numba", "numpy>=1.16", "pandas>=0.23,<2.0; python_version == '3.8'", - "pandas>=0.23; python_version >= '3.9'", + "pandas>=0.23,<2.2; python_version >= '3.9'", "pint>=0.10", "pyyaml", "scikit-learn>=0.21.3", "scipy>=1.2", "statsmodels", - "xarray>=2022.06.0" + "xarray>=2022.06.0,<2023.11.0" ] [project.optional-dependencies] From 1222f5700b7f0bb5d1d10e627da539dc265c0bb7 Mon Sep 17 00:00:00 2001 From: Pascal Bourgault Date: Wed, 29 Nov 2023 14:04:27 -0500 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- CHANGES.rst | 3 ++- environment.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 085ad1b2c..c42a01c6c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,8 @@ Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`), Pascal B Announcements ^^^^^^^^^^^^^ -* To circumvent issues stemming from the change in the frequency code convention in pandas 2.2, we pinned xarray < 2023.11.0 and pandas < 2.2 for this release. The next release will invert the pins (>= 2023.11.0 and >= 2.2). Which also means this is the last version of xclim supporting python 3.8. +* To circumvent issues stemming from changes to the frequency code convention in `pandas` v2.2, we have pinned `xarray` (<2023.11.0) and `pandas` (< 2.2) for this release. This change will be reverted in `xclim` v0.48.0 to support the newer versions (`xarray>= 2023.11.0` and `pandas>= 2.2`). +* `xclim` v0.47.0 will be the last release supporting Python3.8. New features and enhancements ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/environment.yml b/environment.yml index eb70f5a47..3be9a6afe 100644 --- a/environment.yml +++ b/environment.yml @@ -16,14 +16,14 @@ dependencies: - lmoments3 - numba - numpy >=1.16 - - pandas >=0.23, <2.2 + - pandas >=0.23,<2.2 - pint >=0.9 - poppler >=0.67 - pyyaml - scikit-learn >=0.21.3 - scipy >=1.2 - statsmodels - - xarray >=2022.06.0, <2023.11.0 + - xarray >=2022.06.0,<2023.11.0 # Extras - eofs - flox From 5ff4a0537310fa75a2974d9e332766d114cab7f5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 19:05:10 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index c42a01c6c..bd551e9c5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`), Pascal B Announcements ^^^^^^^^^^^^^ -* To circumvent issues stemming from changes to the frequency code convention in `pandas` v2.2, we have pinned `xarray` (<2023.11.0) and `pandas` (< 2.2) for this release. This change will be reverted in `xclim` v0.48.0 to support the newer versions (`xarray>= 2023.11.0` and `pandas>= 2.2`). +* To circumvent issues stemming from changes to the frequency code convention in `pandas` v2.2, we have pinned `xarray` (<2023.11.0) and `pandas` (< 2.2) for this release. This change will be reverted in `xclim` v0.48.0 to support the newer versions (`xarray>= 2023.11.0` and `pandas>= 2.2`). * `xclim` v0.47.0 will be the last release supporting Python3.8. New features and enhancements