From ba09729a4f7db16a564fa3570c50f4f55d971c3e Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 5 Jan 2026 12:43:03 +0000 Subject: [PATCH 1/7] unpin iris and test with Python 3.14 --- .github/workflows/test.yml | 4 ++-- environment.yml | 4 ++-- environment_osx.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f3ab374432..309336be42 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.12", "3.13"] + python-version: ["3.12", "3.13", "3.14"] name: Linux Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v6 @@ -67,7 +67,7 @@ jobs: if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks strategy: matrix: - python-version: ["3.12", "3.13"] + python-version: ["3.12", "3.13", "3.14"] fail-fast: false name: OSX Python ${{ matrix.python-version }} steps: diff --git a/environment.yml b/environment.yml index c589289453..ee5fd66221 100644 --- a/environment.yml +++ b/environment.yml @@ -30,7 +30,7 @@ dependencies: - fsspec - gdal >=3.9.0 - ipython - - iris >=3.11,<3.14.1 + - iris >=3.11 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib @@ -50,7 +50,7 @@ dependencies: - prov - pyproj >=2.1 - pys2index # only from conda-forge - - python >=3.12,<3.14 + - python >=3.12,<3.15 - python-cdo - python-dateutil - pyyaml diff --git a/environment_osx.yml b/environment_osx.yml index 77fdeffa90..ba6f7fc0b9 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -30,7 +30,7 @@ dependencies: - fsspec - gdal >=3.9.0 - ipython - - iris >=3.11,<3.14.1 + - iris >=3.11 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib @@ -50,7 +50,7 @@ dependencies: - prov - pyproj >=2.1 - pys2index >=0.1.5 # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792 - - python >=3.12,<3.14 + - python >=3.12,<3.15 - python-cdo - python-dateutil - pyyaml From ca34003100b1c150a1563340fd665f27829cd48b Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 5 Jan 2026 12:45:11 +0000 Subject: [PATCH 2/7] run test GHA --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 309336be42..e73c6f34fb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,7 @@ on: push: branches: - main + - python3.14 schedule: - cron: "0 0 * * *" From a3e9b03aada00b812e0e3363d374ddb951d0b6a0 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 5 Jan 2026 12:59:28 +0000 Subject: [PATCH 3/7] unpin iris --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e77f09c7c2..c1993fd130 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,7 +74,7 @@ dependencies = [ "scikit-image", "scikit-learn>=1.4.0", # github.com/ESMValGroup/ESMValTool/issues/3504 "scipy", - "scitools-iris>=3.11,<3.14.1", + "scitools-iris>=3.11", "seaborn", "seawater", "shapely>=2", From 18437724b4b10ff872f25a2434f8e2cabfb06e4e Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 5 Jan 2026 13:51:17 +0000 Subject: [PATCH 4/7] comment out pys2index --- environment.yml | 2 +- environment_osx.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index ee5fd66221..c690aca8e2 100644 --- a/environment.yml +++ b/environment.yml @@ -49,7 +49,7 @@ dependencies: - progressbar2 - prov - pyproj >=2.1 - - pys2index # only from conda-forge + # - pys2index # only from conda-forge - python >=3.12,<3.15 - python-cdo - python-dateutil diff --git a/environment_osx.yml b/environment_osx.yml index ba6f7fc0b9..4223676392 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -49,7 +49,7 @@ dependencies: - progressbar2 - prov - pyproj >=2.1 - - pys2index >=0.1.5 # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792 + # - pys2index >=0.1.5 # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792 - python >=3.12,<3.15 - python-cdo - python-dateutil diff --git a/pyproject.toml b/pyproject.toml index c1993fd130..f90aac8637 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ dependencies = [ "pandas", "progressbar2", "pyproj>=2.1", - "pys2index", + # "pys2index", "python-dateutil", "pyyaml", "rasterio>=1.3.10", From 56184fda19135687545583ea9fcb80041b241487 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 22 Jan 2026 15:40:38 +0000 Subject: [PATCH 5/7] restore pys2index in env files --- environment.yml | 2 +- environment_osx.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index c690aca8e2..ee5fd66221 100644 --- a/environment.yml +++ b/environment.yml @@ -49,7 +49,7 @@ dependencies: - progressbar2 - prov - pyproj >=2.1 - # - pys2index # only from conda-forge + - pys2index # only from conda-forge - python >=3.12,<3.15 - python-cdo - python-dateutil diff --git a/environment_osx.yml b/environment_osx.yml index 4223676392..ba6f7fc0b9 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -49,7 +49,7 @@ dependencies: - progressbar2 - prov - pyproj >=2.1 - # - pys2index >=0.1.5 # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792 + - pys2index >=0.1.5 # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792 - python >=3.12,<3.15 - python-cdo - python-dateutil diff --git a/pyproject.toml b/pyproject.toml index f90aac8637..c1993fd130 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ dependencies = [ "pandas", "progressbar2", "pyproj>=2.1", - # "pys2index", + "pys2index", "python-dateutil", "pyyaml", "rasterio>=1.3.10", From e0fae3f496a9dd770fc1220c849a90900c93e067 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 12 Mar 2026 11:48:22 +0000 Subject: [PATCH 6/7] try see if pys2index is the issue --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 7be617d69a..c227559cbb 100644 --- a/environment.yml +++ b/environment.yml @@ -49,7 +49,7 @@ dependencies: - progressbar2 - prov - pyproj >=2.1 - - pys2index # only from conda-forge + # - pys2index # only from conda-forge - python >=3.12,<3.15 - python-cdo - python-dateutil From db3f49567fb5953d11c374f1302d67997a33000c Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 12 Mar 2026 11:57:50 +0000 Subject: [PATCH 7/7] reinstate pys2index --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index c227559cbb..7be617d69a 100644 --- a/environment.yml +++ b/environment.yml @@ -49,7 +49,7 @@ dependencies: - progressbar2 - prov - pyproj >=2.1 - # - pys2index # only from conda-forge + - pys2index # only from conda-forge - python >=3.12,<3.15 - python-cdo - python-dateutil