From 5d03e4f2afb687fbb0e97f4be897919bea2496a4 Mon Sep 17 00:00:00 2001
From: rbeucher <romain.beucher@anu.edu.au>
Date: Tue, 23 Jul 2024 15:24:39 +1000
Subject: [PATCH] Build new environment for ILAMB workflow

---
 environments/access-med/config.sh       | 11 ++++++-----
 environments/access-med/environment.yml |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/environments/access-med/config.sh b/environments/access-med/config.sh
index 4ae4e32..f54ead1 100644
--- a/environments/access-med/config.sh
+++ b/environments/access-med/config.sh
@@ -9,15 +9,16 @@
 
 
 ### Optional config for custom deploy script
-export VERSION_TO_MODIFY=0.7
+export VERSION_TO_MODIFY=0.8
 export STABLE_VERSION=0.3
-export UNSTABLE_VERSION=0.7
+export UNSTABLE_VERSION=0.8
 
 ### Version settings
-export ENVIRONMENT=access-med
+export ENVIRONMENT=esmvaltool
 export FULLENV="${ENVIRONMENT}-${VERSION_TO_MODIFY}"
 
 declare -a rpms_to_remove=( "openssh-clients" "openssh-server" "openssh" )
-declare -a replace_from_apps=( "openmpi/4.1.5" "ucx/1.14.0" )
+declare -a replace_from_apps=( "ucx/1.15.0" )
 declare -a outside_commands_to_include=( "pbs_tmrsh" "ssh" )
-declare -a outside_files_to_copy=( "/g/data/hh5/public/apps/nci-intake-catalogue/catalogue_new.yaml" )
+declare -a outside_files_to_copy=( "/g/data/hh5/public/apps/nci-intake-catalogue/catalogue_new.yaml" "/g/data/hh5/public/apps/openmpi/4.1.6" )
+declare -a replace_with_external=( "/g/data/hh5/public/apps/openmpi/4.1.6" )
\ No newline at end of file
diff --git a/environments/access-med/environment.yml b/environments/access-med/environment.yml
index 61e2e89..2329523 100644
--- a/environments/access-med/environment.yml
+++ b/environments/access-med/environment.yml
@@ -7,7 +7,7 @@ variables:
 dependencies:
 - apscheduler
 - fs
-- python>=3.9
+- python>=3.10
 - libnetcdf>=4.7.4=mpi_openmpi* # pinned for solver stability
 - pip
 - pytest >=3.9,!=6.0.0rc1,!=6.0.0
@@ -68,6 +68,7 @@ dependencies:
 - coecms::ucx-py
 - xgboost >1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
 - med-diagnostics==0.0.1 # pining for now
+- cdms2
 - access-med-tools
 - pip:
   - railroad-diagrams ### Unlisted dependency of pip and pyparsing