Merge branch 'master' into fix-1525

Ouranosinc · Nov 29, 2023 · b1c0e42 · b1c0e42
2 parents b84de8a + d382912
commit b1c0e42
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,11 @@ v0.47.0 (unreleased)
 --------------------
 Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`), Pascal Bourgault (:user:`aulemahal`), Trevor James Smith (:user:`Zeitsperre`), David Huard (:user:`huard`).
 
+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`).
+* `xclim` v0.47.0 will be the last release supporting Python3.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
@@ -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
@@ -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]