_virt -> _virtual

JCSDA · Jan 24, 2025 · cf0a50d · cf0a50d
1 parent d6733b9
commit cf0a50d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
@@ -25,7 +25,6 @@ packages:
       D: [ldc]
       daal: [intel-oneapi-daal]
       elf: [elfutils]
-      esmf_virt: [esmf]
       fftw-api: [fftw, amdfftw]
       flame: [libflame, amdlibflame]
       fortran: [gcc]
@@ -35,7 +34,6 @@ packages:
       glu: [mesa-glu, openglu]
       golang: [go, gcc]
       go-or-gccgo-bootstrap: [go-bootstrap, gcc]
-      hdf5_virt: [hdf5]
       iconv: [libiconv]
       ipp: [intel-oneapi-ipp]
       java: [openjdk, jdk, ibm-java]
@@ -53,13 +51,11 @@ packages:
       mpe: [mpe2]
       mpi: [openmpi, mpich]
       mysql-client: [mysql, mariadb-c-client]
-      netcdf_c_virt: [netcdf-c]
       opencl: [pocl]
       onedal: [intel-oneapi-dal]
       pbs: [openpbs, torque]
       pil: [py-pillow]
       pkgconfig: [pkgconf, pkg-config]
-      python_virt: [python]
       qmake: [qt-base, qt]
       rpc: [libtirpc]
       scalapack: [netlib-scalapack, amdscalapack]
@@ -73,6 +69,11 @@ packages:
       yacc: [bison, byacc]
       ziglang: [zig]
       zlib-api: [zlib-ng+compat, zlib]
+      # Dummy providers for module hierarchy (JCSDA repo only):
+      esmf_virtual: [esmf]
+      hdf5_virtual: [hdf5]
+      netcdf_c_virtual: [netcdf-c]
+      python_virtual: [python]
     permissions:
       read: world
       write: user

diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py
@@ -66,8 +66,8 @@ class Esmf(MakefilePackage, PythonExtension):
         deprecated=True,
     )
 
-    # For WCOSS2 (JCSDA repo only):
-    provides("esmf_virt")
+    # For module hierarchy (JCSDA repo only):
+    provides("esmf_virtual")
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated

diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -109,8 +109,8 @@ class Hdf5(CMakePackage):
     version("1.8.12", sha256="b5cccea850096962b5fd9e96f22c4f47d2379224bb41130d9bc038bb6c37dfcb")
     version("1.8.10", sha256="4813b79c5fb8701a625b9924b8203bc7154a77f9b826ad4e034144b4056a160a")
 
-    # For WCOSS2 (JCSDA repo only):
-    provides("hdf5_virt")
+    # For module hierarchy (JCSDA repo only):
+    provides("hdf5_virtual")
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated

diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py
@@ -53,8 +53,8 @@ class NetcdfC(CMakePackage, AutotoolsPackage):
     version("4.3.3.1", sha256="f2ee78eb310637c007f001e7c18e2d773d23f3455242bde89647137b7344c2e2")
     version("4.3.3", sha256="3f16e21bc3dfeb3973252b9addf5defb48994f84fc9c9356081f871526a680e7")
 
-    # For WCOSS2 (JCSDA repo only):
-    provides("netcdf_c_virt")
+    # For module hierarchy (JCSDA repo only):
+    provides("netcdf_c_virtual")
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated

diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
@@ -222,8 +222,8 @@ class Python(Package):
         deprecated=True,
     )
 
-    # For WCOSS2 (JCSDA repo only):
-    provides("python_virt")
+    # For module hierarchy (JCSDA repo only):
+    provides("python_virtual")
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated