Skip to content

Commit 3d99034

Browse files
ci/package.py: update with spack v1 changes
1 parent 9cf112d commit 3d99034

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

ci/package.py

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5+
from spack_repo.builtin.build_systems.cmake import CMakePackage
6+
57
from spack.package import *
68

79

@@ -19,21 +21,6 @@ class UfsWeatherModel(CMakePackage):
1921
maintainers("AlexanderRichert-NOAA")
2022

2123
version("develop", branch="develop", submodules=True)
22-
version(
23-
"2.0.0",
24-
tag="ufs-v2.0.0",
25-
commit="e3cb92f1cd8941c019ee5ef7da5c9aef67d55cf8",
26-
submodules=True,
27-
)
28-
version(
29-
"1.1.0",
30-
tag="ufs-v1.1.0",
31-
commit="5bea16b6d41d810dc2e45cba0fa3841f45ea7c7a",
32-
submodules=True,
33-
)
34-
35-
depends_on("c", type="build") # generated
36-
depends_on("fortran", type="build") # generated
3724

3825
variant("mpi", default=True, description="Enable MPI")
3926
variant(
@@ -110,6 +97,9 @@ class UfsWeatherModel(CMakePackage):
11097

11198
variant("app", default="ATM", description="UFS application", when="@develop")
11299

100+
depends_on("c", type="build") # generated
101+
depends_on("fortran", type="build") # generated
102+
113103
depends_on("bacio@:2.4.1")
114104
depends_on("mpi", when="+mpi")
115105
depends_on("netcdf-c")
@@ -142,7 +132,7 @@ class UfsWeatherModel(CMakePackage):
142132
"HAFS-ALL",
143133
"LND",
144134
]:
145-
depends_on("parallelio@2.5.3: +fortran", when="@develop app=%s" % app)
135+
depends_on("parallelio@2.5.3: +fortran~pnetcdf~shared", when="@develop app=%s" % app)
146136
depends_on("python@3.6:", type="build", when="@develop")
147137
depends_on("sp@2.3.3:", when="@develop")
148138
depends_on("w3emc@2.9.2:", when="@develop")
@@ -163,7 +153,7 @@ class UfsWeatherModel(CMakePackage):
163153

164154
conflicts("%gcc@:8", when="@develop")
165155

166-
def setup_build_environment(self, env):
156+
def setup_build_environment(self, env: EnvironmentModifications) -> None:
167157
spec = self.spec
168158
env.set("CC", spec["mpi"].mpicc)
169159
env.set("CXX", spec["mpi"].mpicxx)

0 commit comments

Comments
 (0)