From 187b1019d85dfc943d6b2b6f89b3189a0f83f200 Mon Sep 17 00:00:00 2001 From: Romain Beucher Date: Thu, 12 Dec 2024 08:46:00 +1100 Subject: [PATCH 1/4] Update ILAMB Update ILAMB to v2.7.2 (use conda-forge package instead of git repo) Use access-nri channel in place of coecms for ucx-py --- environments/access-med/environment.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/environments/access-med/environment.yml b/environments/access-med/environment.yml index 37430d3..94ab047 100644 --- a/environments/access-med/environment.yml +++ b/environments/access-med/environment.yml @@ -62,7 +62,7 @@ dependencies: - shapely - cf_xarray - sparse -- coecms::ucx-py +- access-nri::ucx-py - xgboost >1.6.1 # github.com/ESMValGroup/ESMValTool/issues/2779 - med-diagnostics==0.0.1 # pining for now - access-med-tools==0.1.9 @@ -72,13 +72,11 @@ dependencies: - tqdm - moderngl - ffmpeg +- ilamb==2.7.2 - pip: - lavavu==1.8.84 - railroad-diagrams ### Unlisted dependency of pip and pyparsing - - git+https://github.com/rubisco-sfa/ILAMB.git@v2.7.1 - git+https://github.com/ACCESS-NRI/ACCESS-Vis.git@v1.0.1 - py360convert - numpy-quaternion -# Julia (dependencies installed by separate script) -- julia From 2d406bd50fbcae31e3086289e69e53883d972ac4 Mon Sep 17 00:00:00 2001 From: Romain Beucher Date: Thu, 12 Dec 2024 08:58:46 +1100 Subject: [PATCH 2/4] Update environment.yml --- environments/access-med/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environments/access-med/environment.yml b/environments/access-med/environment.yml index 94ab047..2dfc009 100644 --- a/environments/access-med/environment.yml +++ b/environments/access-med/environment.yml @@ -2,6 +2,7 @@ name: med-condaenv channels: - conda-forge - accessnri +- nodefaults variables: CARTOPY_USER_BACKGROUNDS: /g/data/xp65/public/apps/cartopy-data/backgrounds dependencies: From de60b560191fa6274909e55acabdb9f83bd5235b Mon Sep 17 00:00:00 2001 From: Romain Beucher Date: Thu, 12 Dec 2024 10:13:05 +1100 Subject: [PATCH 3/4] Update environment.yml --- environments/access-med/environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/access-med/environment.yml b/environments/access-med/environment.yml index 2dfc009..7d706c0 100644 --- a/environments/access-med/environment.yml +++ b/environments/access-med/environment.yml @@ -30,7 +30,7 @@ dependencies: - iris-esmf-regrid - iris-grib - intake -- access-nri-intake>=0.1.5 +- access-nri-intake - netcdf4<=1.6.0 ### Workaround for https://github.com/pydata/xarray/issues/7079 - mo_pack - nodejs>=20.0.0 @@ -63,7 +63,7 @@ dependencies: - shapely - cf_xarray - sparse -- access-nri::ucx-py +- accessnri::ucx-py - xgboost >1.6.1 # github.com/ESMValGroup/ESMValTool/issues/2779 - med-diagnostics==0.0.1 # pining for now - access-med-tools==0.1.9 From 9e321df04fbe46f4c4b9037e58bd762ffb282947 Mon Sep 17 00:00:00 2001 From: Romain Beucher Date: Thu, 12 Dec 2024 10:24:35 +1100 Subject: [PATCH 4/4] Update environment.yml --- environments/access-med/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/access-med/environment.yml b/environments/access-med/environment.yml index 7d706c0..b2b28e2 100644 --- a/environments/access-med/environment.yml +++ b/environments/access-med/environment.yml @@ -63,7 +63,7 @@ dependencies: - shapely - cf_xarray - sparse -- accessnri::ucx-py +- coecms::ucx-py - xgboost >1.6.1 # github.com/ESMValGroup/ESMValTool/issues/2779 - med-diagnostics==0.0.1 # pining for now - access-med-tools==0.1.9