From b51b5bcab7bf2baa72db9338c4fb9a6645fb0a80 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 13 Nov 2024 17:03:52 +0000 Subject: [PATCH 1/8] update environment --- environment.yml | 8 ++++---- environment_osx.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/environment.yml b/environment.yml index 270f0f6ecd..71cdf7ca51 100644 --- a/environment.yml +++ b/environment.yml @@ -10,20 +10,20 @@ channels: dependencies: - aiohttp - - cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767 + - cartopy - cdo >=2.3.0 - cdsapi - cf-units - cfgrib - cftime - cmocean - - curl <8.10 + - curl <8.10 # https://github.com/ESMValGroup/ESMValTool/issues/3758 - 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 + - esmpy - esmvalcore 2.11.* - fiona - fire @@ -41,7 +41,7 @@ dependencies: - nc-time-axis - netCDF4 - numba - - numpy !=1.24.3,<2.0 # severe masking bug + - numpy !=1.24.3 - openpyxl - packaging - pandas==2.1.4 # unpin when ESMValCore released with https://github.com/ESMValGroup/ESMValCore/pull/2529 diff --git a/environment_osx.yml b/environment_osx.yml index 8285b43ecd..b4ff845768 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -10,7 +10,7 @@ channels: dependencies: - aiohttp - - cartopy <0.24 # https://github.com/ESMValGroup/ESMValTool/issues/3767 + - cartopy - cdo >=2.3.0 - cdsapi - cf-units @@ -40,7 +40,7 @@ dependencies: - nc-time-axis - netCDF4 - numba - - numpy !=1.24.3,<2.0 # severe masking bug + - 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 From b1d0eb80e731ee045339f40dcebd145cef20fcc7 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 13 Nov 2024 17:03:58 +0000 Subject: [PATCH 2/8] update environment --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 86aab79854..d0f29bd4e5 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ # Use with pip install . to install from source 'install': [ 'aiohttp', - 'cartopy<0.24', # github.com/ESMValGroup/ESMValTool/issues/3767 + 'cartopy', 'cdo', 'cdsapi', 'cf-units', From 530d16dbec90bd37e0b3bf99f5e379dd196df086 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 13 Nov 2024 17:04:56 +0000 Subject: [PATCH 3/8] run a GA test --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8b3c9ceb39..187a7b5266 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,7 @@ on: push: branches: - main + - update_environment_Nov24 schedule: - cron: '0 0 * * *' From a46d410022ba2a6fbb12c6b27470644667976bd7 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 14 Nov 2024 13:28:36 +0000 Subject: [PATCH 4/8] pin iris --- environment.yml | 2 +- environment_osx.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 71cdf7ca51..cb6a175012 100644 --- a/environment.yml +++ b/environment.yml @@ -30,7 +30,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 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib diff --git a/environment_osx.yml b/environment_osx.yml index b4ff845768..790f5c64b2 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -29,7 +29,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 - iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342 - jinja2 - joblib From 9784721a7aa2eca7227eef68ffbb85e19d762f52 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 14 Nov 2024 13:28:40 +0000 Subject: [PATCH 5/8] pin iris --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d0f29bd4e5..cdadaca2d2 100755 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ 'scikit-image', 'scikit-learn>=1.4.0', # github.com/ESMValGroup/ESMValTool/issues/3504 'scipy', - 'scitools-iris>=3.6.1', + 'scitools-iris>=3.11', 'seaborn', 'seawater', 'shapely>=2', From 1180afa3b6f3414e19a3c4ec5ea5ce5e8f537e66 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 14 Nov 2024 13:56:18 +0000 Subject: [PATCH 6/8] unrun GA --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 187a7b5266..8b3c9ceb39 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,6 @@ on: push: branches: - main - - update_environment_Nov24 schedule: - cron: '0 0 * * *' From 5b8ca820e5a9eba4795a8bf9b9a45cdb2b25111a Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 14 Nov 2024 16:04:05 +0000 Subject: [PATCH 7/8] Update environment.yml Co-authored-by: Manuel Schlund <32543114+schlunma@users.noreply.github.com> --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index cb6a175012..72ccf127f6 100644 --- a/environment.yml +++ b/environment.yml @@ -41,7 +41,7 @@ dependencies: - nc-time-axis - netCDF4 - numba - - numpy !=1.24.3 + - 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 From 8d1deaf33e0e910562245c8a78b3639a98f3dba2 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 14 Nov 2024 16:09:00 +0000 Subject: [PATCH 8/8] remove comment as suggested by Manu --- environment_osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_osx.yml b/environment_osx.yml index 790f5c64b2..242f0a4f56 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -22,7 +22,7 @@ dependencies: - distributed - ecmwf-api-client - eofs - - esmpy # <8.6 safe https://github.com/SciTools/iris-esmf-regrid/issues/415 + - esmpy - esmvalcore 2.11.* - fiona - fire