Add py-pyyaml to neptune-env, remove invalid Python variant from nept…

…une-env and add esmf+python to neptune-python-env
JCSDA · Oct 16, 2024 · d6641e4 · d6641e4
1 parent e9a1462
commit d6641e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/spack-ext/repos/spack-stack/packages/neptune-env/package.py b/spack-ext/repos/spack-stack/packages/neptune-env/package.py
@@ -36,8 +36,7 @@ class NeptuneEnv(BundlePackage):
  depends_on("ip@5:", type="run", when="%gcc")
  depends_on("ip@5:", type="run", when="%intel")
  depends_on("ip@5:", type="run", when="%oneapi")
- depends_on("esmf +python", when="+python", type="run")
- depends_on("esmf ~python", when="~python", type="run")
+ depends_on("esmf", type="run")
  depends_on("nco", type="run")
  depends_on("mct", type="run")
 
@@ -48,5 +47,6 @@ class NeptuneEnv(BundlePackage):
  # Basic Python dependencies that are always needed
  depends_on("py-f90nml", type="run")
  depends_on("py-python-dateutil", type="run")
+ depends_on("py-pyyaml", type="run")
 
  # There is no need for install() since there is no code.
diff --git a/spack-ext/repos/spack-stack/packages/neptune-python-env/package.py b/spack-ext/repos/spack-stack/packages/neptune-python-env/package.py
@@ -22,6 +22,8 @@ class NeptunePythonEnv(BundlePackage):
  variant("xnrl", default=False, description="Build non-pulic XNRL")
 
  depends_on("neptune-env", type="run")
+ # Enable the Python variant for ESMF
+ depends_on("esmf +python", type="run")
 
  depends_on("py-h5py", type="run")
  depends_on("py-netcdf4", type="run")