diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index f0ff5720d..f1f01c12a 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -135,12 +135,9 @@ packages: variants: '+pflogger' # If making changes here, also check the Discover site configs and the CI workflows met: - require: - - any_of: ['@=11.1.1', '@=9.1.3'] - - '+python +grib2' + require: '@=11.1.1 +python +grib2' metplus: - require: - - any_of: ['@=5.1.0', '@=3.1.1'] + require: '@=5.1.0' metis: require: '+int64 +real64' mpich: diff --git a/configs/templates/gsi-addon-dev/spack.yaml b/configs/templates/gsi-addon-dev/spack.yaml index c116daa8a..5ca410405 100644 --- a/configs/templates/gsi-addon-dev/spack.yaml +++ b/configs/templates/gsi-addon-dev/spack.yaml @@ -14,11 +14,17 @@ spack: definitions: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - - global-workflow-env ^metplus@3.1.1 ^met@9.1.3 + - global-workflow-env - ufs-weather-model-env - emc-verif-global-env - gsi-env + packages: + met: + require:: '@9.1.3 +python +grib2' + metplus: + require:: '@3.1.1 ^met@9.1.3' + specs: - matrix: - [$packages]