From 489665d9b84c3c808c5815e9c0725041529724e7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 22 Aug 2024 18:26:25 -0600 Subject: [PATCH] Bug fix: configure neptune-env variants in three templates: neptune-dev, skylab-dev, unified-dev (#1268) This is a bug fix PR: Configure neptune-env variants in three templates: neptune-dev, skylab-dev, unified-dev. This commit must have gotten lost in #1265. --- configs/templates/neptune-dev/spack.yaml | 2 +- configs/templates/skylab-dev/spack.yaml | 1 + configs/templates/unified-dev/spack.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml index be3b8d816..5f3332f79 100644 --- a/configs/templates/neptune-dev/spack.yaml +++ b/configs/templates/neptune-dev/spack.yaml @@ -8,7 +8,7 @@ spack: definitions: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - - neptune-env +python ^esmf@8.7.0b11 snapshot=b11 + - neptune-env +espc +python +xnrl ^esmf@8.7.0b11 snapshot=b11 specs: - matrix: diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 75523e091..1ba272a63 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -17,6 +17,7 @@ spack: - jedi-neptune-env ^esmf@=8.7.0b11 snapshot=b11 - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env + - neptune-env ~espc +python ~xnrl ^esmf@=8.7.0b11 snapshot=b11 - soca-env # Various crtm tags (list all to avoid duplicate packages) diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 46a6f3037..a05ed4a75 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -21,7 +21,7 @@ spack: - jedi-tools-env - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env - - neptune-env ~python ^esmf@=8.7.0b11 snapshot=b11 + - neptune-env ~espc +python ~xnrl ^esmf@=8.7.0b11 snapshot=b11 - soca-env - ufs-srw-app-env ^esmf@=8.6.1 - ufs-weather-model-env ^esmf@=8.6.1