From a8f929c92645956065568be2f498148ac932e058 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 3 Mar 2025 15:51:39 +0000
Subject: [PATCH] Unpin pandas  (#3924)

Co-authored-by: sloosvel <45196700+sloosvel@users.noreply.github.com>
---
 environment.yml     | 6 +++---
 environment_osx.yml | 4 ++--
 setup.py            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/environment.yml b/environment.yml
index e631bba4d7..a8dbf3e745 100644
--- a/environment.yml
+++ b/environment.yml
@@ -44,7 +44,7 @@ dependencies:
   - numpy !=1.24.3  # severe masking bug
   - openpyxl
   - packaging
-  - pandas==2.1.4  # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
+  - pandas
   - pip !=21.3
   - progressbar2
   - prov
@@ -62,7 +62,7 @@ dependencies:
   - requests
   - ruamel.yaml
   - scikit-image
-  - scikit-learn >= 1.4.0  # github.com/ESMValGroup/ESMValTool/issues/3504
+  - scikit-learn >=1.4.0  # github.com/ESMValGroup/ESMValTool/issues/3504
   - scipy
   - seaborn
   - seawater
@@ -106,7 +106,7 @@ dependencies:
 
   # R and dependencies
   - cdo
-  - r-base >=3.5,<4.3.0
+  - r-base >=3.5,<4.3.0  # https://github.com/ESMValGroup/ESMValTool/pull/3924
   - r-abind
   - r-akima
   - r-climdex.pcic
diff --git a/environment_osx.yml b/environment_osx.yml
index 2ce23abf63..f435922b04 100644
--- a/environment_osx.yml
+++ b/environment_osx.yml
@@ -43,7 +43,7 @@ dependencies:
   - numpy !=1.24.3  # severe masking bug
   - openpyxl
   - packaging
-  - pandas==2.1.4  # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
+  - pandas
   - pip !=21.3
   - progressbar2
   - prov
@@ -61,7 +61,7 @@ dependencies:
   - requests
   - ruamel.yaml
   - scikit-image
-  - scikit-learn >= 1.4.0  # github.com/ESMValGroup/ESMValTool/issues/3504
+  - scikit-learn >=1.4.0  # github.com/ESMValGroup/ESMValTool/issues/3504
   - scipy
   - seaborn
   - seawater
diff --git a/setup.py b/setup.py
index cdadaca2d2..d5f38a9100 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@
         'numpy!=1.24.3',  # severe masking bug
         'openpyxl',
         'packaging',
-        'pandas==2.1.4',  # see note in environment.yml
+        'pandas',
         'progressbar2',
         'psyplot>=1.5.0',  # psy*<1.5.0 are not py312 compat
         'psy-maps>=1.5.0',