From 8ad5fcf7fb08917420ff0a1eb5d4365ebf452793 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 4 Nov 2024 14:41:32 +0000
Subject: [PATCH 01/21] test with latest iris 3.11rc0

---
 environment.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 270f0f6ecd..88def2d2ac 100644
--- a/environment.yml
+++ b/environment.yml
@@ -6,6 +6,7 @@ channels:
   # ESMValCore.
   # - conda-forge/label/esmvalcore_rc
   - conda-forge
+  - conda-forge/label/rc_iris  # only to test with iris==3.11rc0
   - nodefaults
 
 dependencies:
@@ -30,7 +31,7 @@ dependencies:
   - fsspec
   - gdal >=3.9.0
   - importlib_metadata <8  # https://github.com/ESMValGroup/ESMValTool/issues/3699 only for Python 3.10/11 and esmpy<8.6
-  - iris >=3.6.1
+  - iris==3.11.0rc0  # first to support numpy2 and Python 3.13  # >=3.6.1
   - iris-esmf-regrid >=0.10.0  # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
   - jinja2
   - joblib

From 1f8fef664edf29f48870c4f76cecb47be8e64181 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 4 Nov 2024 14:42:23 +0000
Subject: [PATCH 02/21] run GA test

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8b3c9ceb39..3d6cae7c1c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - python313
   schedule:
     - cron: '0 0 * * *'
 
@@ -20,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4

From 1534917c6e16997a8b217e2826632139044b0ca8 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 4 Nov 2024 14:42:56 +0000
Subject: [PATCH 03/21] unpin numpy

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 88def2d2ac..9a3a62664e 100644
--- a/environment.yml
+++ b/environment.yml
@@ -42,7 +42,7 @@ dependencies:
   - nc-time-axis
   - netCDF4
   - numba
-  - numpy !=1.24.3,<2.0  # severe masking bug
+  - numpy !=1.24.3  # ,<2.0  # severe masking bug
   - openpyxl
   - packaging
   - pandas==2.1.4  # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529

From fcd148ffaff2a6f0c3e9be055402046ea759ff95 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 4 Nov 2024 16:39:57 +0000
Subject: [PATCH 04/21] free cartopy

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 9a3a62664e..e8ef7ccf14 100644
--- a/environment.yml
+++ b/environment.yml
@@ -11,7 +11,7 @@ channels:
 
 dependencies:
   - aiohttp
-  - cartopy <0.24  # https://github.com/ESMValGroup/ESMValTool/issues/3767
+  - cartopy  # should be free https://github.com/ESMValGroup/ESMValTool/issues/3769
   - cdo >=2.3.0
   - cdsapi
   - cf-units

From 581181a01c88d0de535ba1656040c0c2e5ac2cd0 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 4 Nov 2024 16:49:08 +0000
Subject: [PATCH 05/21] unpin Pandas

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index e8ef7ccf14..31888a2205 100644
--- a/environment.yml
+++ b/environment.yml
@@ -45,7 +45,7 @@ dependencies:
   - numpy !=1.24.3  # ,<2.0  # severe masking bug
   - openpyxl
   - packaging
-  - pandas==2.1.4  # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
+  - pandas  # ==2.1.4  # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529
   - pip !=21.3
   - progressbar2
   - prov

From e8ff68f255825dd4d2127c9056c8ec1af674b39a Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 4 Nov 2024 17:02:13 +0000
Subject: [PATCH 06/21] comment out esmvalcore

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 31888a2205..02b0dededd 100644
--- a/environment.yml
+++ b/environment.yml
@@ -25,7 +25,7 @@ dependencies:
   - ecmwf-api-client
   - eofs
   - esmpy  # <8.6 safe https://github.com/SciTools/iris-esmf-regrid/issues/415
-  - esmvalcore 2.11.*
+  # - esmvalcore 2.11.*
   - fiona
   - fire
   - fsspec

From 2bfb974f3b9cc8871d4594c8c52e8cf5b799c6af Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Fri, 8 Nov 2024 12:33:22 +0000
Subject: [PATCH 07/21] try again

---
 environment.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/environment.yml b/environment.yml
index 02b0dededd..d8e0547035 100644
--- a/environment.yml
+++ b/environment.yml
@@ -11,21 +11,21 @@ channels:
 
 dependencies:
   - aiohttp
-  - cartopy  # should be free https://github.com/ESMValGroup/ESMValTool/issues/3769
+  - cartopy  # should be free with iris=3.11 https://github.com/ESMValGroup/ESMValTool/issues/3769
   - cdo >=2.3.0
   - cdsapi
   - cf-units
   - cfgrib
   - cftime
   - cmocean
-  - curl <8.10
+  # - curl <8.10  # unpin and remove as soon as Julia can
   - cython
   - dask !=2024.8.0  # https://github.com/dask/dask/issues/11296
   - distributed
   - ecmwf-api-client
   - eofs
   - esmpy  # <8.6 safe https://github.com/SciTools/iris-esmf-regrid/issues/415
-  # - esmvalcore 2.11.*
+  - esmvalcore 2.11.*
   - fiona
   - fire
   - fsspec
@@ -42,7 +42,7 @@ dependencies:
   - nc-time-axis
   - netCDF4
   - numba
-  - numpy !=1.24.3  # ,<2.0  # severe masking bug
+  - numpy !=1.24.3  # should be free with iris=3.11 ,<2.0  # severe masking bug
   - openpyxl
   - packaging
   - pandas  # ==2.1.4  # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529

From b082db6612db43375210f3ca9b4f7c09f368f7ce Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Fri, 8 Nov 2024 13:11:03 +0000
Subject: [PATCH 08/21] remove ncl

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index d8e0547035..675b722985 100644
--- a/environment.yml
+++ b/environment.yml
@@ -100,7 +100,7 @@ dependencies:
   - yapf ==0.32.0
 
   # NCL and dependencies
-  - ncl >=6.6.2
+  # - ncl >=6.6.2
   - cdo
   - imagemagick
   - nco

From c70069b862fdb4b07d8a9fd2fad16d5ab223f696 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Fri, 15 Nov 2024 17:08:05 +0000
Subject: [PATCH 09/21] remove pin on python 3.13

---
 environment.yml     | 2 +-
 environment_osx.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 4e721bd661..fe68b6f4d4 100644
--- a/environment.yml
+++ b/environment.yml
@@ -55,7 +55,7 @@ dependencies:
   - psy-simple >=1.5.0
   - pyproj >=2.1
   - pys2index  # only from conda-forge
-  - python >=3.10,<3.13
+  - python >=3.10
   - python-cdo
   - python-dateutil
   - pyyaml
diff --git a/environment_osx.yml b/environment_osx.yml
index 242f0a4f56..06b0d0a326 100644
--- a/environment_osx.yml
+++ b/environment_osx.yml
@@ -53,7 +53,7 @@ dependencies:
   - psy-simple >=1.5.0
   - pyproj >=2.1
   - pys2index >=0.1.5  # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792
-  - python >=3.10,<3.13
+  - python >=3.10
   - python-cdo
   - python-dateutil
   - pyyaml

From e43e08d5fb6670883dac5a3ef6b93495ceebc815 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 25 Nov 2024 16:46:51 +0000
Subject: [PATCH 10/21] remove rc iris channel

---
 environment.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index fe68b6f4d4..d230553073 100644
--- a/environment.yml
+++ b/environment.yml
@@ -6,7 +6,6 @@ channels:
   # ESMValCore.
   # - conda-forge/label/esmvalcore_rc
   - conda-forge
-  - conda-forge/label/rc_iris  # only to test with iris==3.11rc0
   - nodefaults
 
 dependencies:

From 3e0cc7bc44d335bf8f440cec63304c22779c16d8 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Mon, 25 Nov 2024 16:53:17 +0000
Subject: [PATCH 11/21] remove pys2index to test

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index d230553073..6a1bdf0562 100644
--- a/environment.yml
+++ b/environment.yml
@@ -53,7 +53,7 @@ dependencies:
   - psy-reg >=1.5.0
   - psy-simple >=1.5.0
   - pyproj >=2.1
-  - pys2index  # only from conda-forge
+  # - pys2index  # only from conda-forge  # not py313 compat
   - python >=3.10
   - python-cdo
   - python-dateutil

From 73e634cd5f0c077c396ffc2bcc3c01b13429abd2 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 15:13:01 +0000
Subject: [PATCH 12/21] remove temp psy-simple

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 6a1bdf0562..ac48c268de 100644
--- a/environment.yml
+++ b/environment.yml
@@ -51,7 +51,7 @@ dependencies:
   - psyplot >=1.5.0
   - psy-maps >=1.5.0
   - psy-reg >=1.5.0
-  - psy-simple >=1.5.0
+  # - psy-simple >=1.5.0  # nay Py3.13 yet
   - pyproj >=2.1
   # - pys2index  # only from conda-forge  # not py313 compat
   - python >=3.10

From 7cdea2976ea44cae936762f71b5bd1ec8e466500 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 15:17:36 +0000
Subject: [PATCH 13/21] remove temp psy-reg

---
 environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index ac48c268de..fdd7f57247 100644
--- a/environment.yml
+++ b/environment.yml
@@ -50,7 +50,7 @@ dependencies:
   - prov
   - psyplot >=1.5.0
   - psy-maps >=1.5.0
-  - psy-reg >=1.5.0
+  # - psy-reg >=1.5.0  # nay Py3.13 yet
   # - psy-simple >=1.5.0  # nay Py3.13 yet
   - pyproj >=2.1
   # - pys2index  # only from conda-forge  # not py313 compat
@@ -99,7 +99,7 @@ dependencies:
   - yapf ==0.32.0
 
   # NCL and dependencies
-  # - ncl >=6.6.2
+  # - ncl >=6.6.2  # nay Py3.13 yet
   - cdo
   - imagemagick
   - nco

From b935ddfe42b5d86ef76f6cb9797cbfe9b1eab4cf Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 15:24:39 +0000
Subject: [PATCH 14/21] remove temp psy-maps

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index fdd7f57247..da3577c9a4 100644
--- a/environment.yml
+++ b/environment.yml
@@ -49,7 +49,7 @@ dependencies:
   - progressbar2
   - prov
   - psyplot >=1.5.0
-  - psy-maps >=1.5.0
+  # - psy-maps >=1.5.0  # nay Py3.13 yet
   # - psy-reg >=1.5.0  # nay Py3.13 yet
   # - psy-simple >=1.5.0  # nay Py3.13 yet
   - pyproj >=2.1

From 76a5d8a2be854cbb373c0ea4eac3957bdc23e7f6 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 15:48:56 +0000
Subject: [PATCH 15/21] remove temp numba

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index da3577c9a4..50c28a48ca 100644
--- a/environment.yml
+++ b/environment.yml
@@ -40,7 +40,7 @@ dependencies:
   - natsort
   - nc-time-axis
   - netCDF4
-  - numba
+  # - numba  # nay Py3.13 yet
   - numpy !=1.24.3  # severe masking bug
   - openpyxl
   - packaging

From 35418be187e2aa2bf4b501186c3270f8f3e81712 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 15:52:33 +0000
Subject: [PATCH 16/21] remove temp xesmf

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 50c28a48ca..f2fbd9d968 100644
--- a/environment.yml
+++ b/environment.yml
@@ -68,7 +68,7 @@ dependencies:
   - seawater
   - shapely >=2.0.2
   - xarray >=0.12.0
-  - xesmf >=0.7.1
+  # - xesmf >=0.7.1  # nay Py3.13 yet via Numba
   - xgboost >1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
   - xlsxwriter
   - zarr

From 2cccebb2bb98eff8a12480319d580a28a60de7ec Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 15:55:59 +0000
Subject: [PATCH 17/21] remove temp esmvalcore

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index f2fbd9d968..51c9f51970 100644
--- a/environment.yml
+++ b/environment.yml
@@ -24,7 +24,7 @@ dependencies:
   - ecmwf-api-client
   - eofs
   - esmpy
-  - esmvalcore 2.11.*
+  # - esmvalcore 2.11.*  # nay Py3.13 yet
   - fiona
   - fire
   - fsspec

From 5baa8cc3f4e40ea3ac799a5f1abccd8e601dd596 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 16:05:40 +0000
Subject: [PATCH 18/21] away with curl

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 51c9f51970..27f0f88ae8 100644
--- a/environment.yml
+++ b/environment.yml
@@ -17,7 +17,7 @@ dependencies:
   - cfgrib
   - cftime
   - cmocean
-  - curl <8.10  # https://github.com/ESMValGroup/ESMValTool/issues/3758
+  # - curl <8.10  # https://github.com/ESMValGroup/ESMValTool/issues/3758
   - cython
   - dask !=2024.8.0  # https://github.com/dask/dask/issues/11296
   - distributed

From 5cfb8d49498529f3af3eaaccf13410e8633fafe2 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 16:15:06 +0000
Subject: [PATCH 19/21] add note against curl

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 27f0f88ae8..8b157b19bb 100644
--- a/environment.yml
+++ b/environment.yml
@@ -17,7 +17,7 @@ dependencies:
   - cfgrib
   - cftime
   - cmocean
-  # - curl <8.10  # https://github.com/ESMValGroup/ESMValTool/issues/3758
+  # - curl <8.10  # nay Py3.13 yet  # https://github.com/ESMValGroup/ESMValTool/issues/3758
   - cython
   - dask !=2024.8.0  # https://github.com/dask/dask/issues/11296
   - distributed

From f892590f88cf52b56a282798497bc4b5f7d1277a Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 16:15:27 +0000
Subject: [PATCH 20/21] recheck ncl

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 8b157b19bb..5bf379f115 100644
--- a/environment.yml
+++ b/environment.yml
@@ -99,7 +99,7 @@ dependencies:
   - yapf ==0.32.0
 
   # NCL and dependencies
-  # - ncl >=6.6.2  # nay Py3.13 yet
+  - ncl >=6.6.2  # nay Py3.13 yet
   - cdo
   - imagemagick
   - nco

From 843f767cc7a39f6d9bb0ebf57c6270862c3d9e25 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 28 Nov 2024 16:21:42 +0000
Subject: [PATCH 21/21] remove note on ncl

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 5bf379f115..9e04d3796d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -99,7 +99,7 @@ dependencies:
   - yapf ==0.32.0
 
   # NCL and dependencies
-  - ncl >=6.6.2  # nay Py3.13 yet
+  - ncl >=6.6.2
   - cdo
   - imagemagick
   - nco