zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix style

Browse Source
This commit is contained in:
Seth R Johnson 2025-02-11 17:35:02 -05:00
parent 61a3043fe0
commit 6b013519ce
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/celeritas/package.py
View File

@ -4,7 +4,6 @@
from spack.build_systems.cmake import CMakeBuilder from spack.build_systems.cmake import CMakeBuilder
from spack.package import * from spack.package import *
from spack.version import GitVersion
class Celeritas(CMakePackage, CudaPackage, ROCmPackage): class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
@ -156,14 +155,16 @@ def cmake_args(self):
args.append(define("CELERITAS_USE_JSON", True)) args.append(define("CELERITAS_USE_JSON", True))
if self.version >= Version("0.6"): if self.version >= Version("0.6"):
args.extend(( args.extend(
(
define(f"CELERITAS_BUILTIN_{pkg}", False) define(f"CELERITAS_BUILTIN_{pkg}", False)
for pkg in ["GTest", "nlohmann_json", "G4VG"])) for pkg in ["GTest", "nlohmann_json", "G4VG"]
)
)
if self.version == Version("develop"): if self.version == Version("develop"):
args.append(define("Celeritas_GIT_DESCRIBE", args.append(
[self.next_develop_version, define("Celeritas_GIT_DESCRIBE", [self.next_develop_version, "-dev", "spack"])
"-dev", )
"spack"]))
return args return args

6
var/spack/repos/builtin/packages/g4vg/package.py
View File

@ -3,7 +3,6 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack.package import * from spack.package import *
from spack.version import GitVersion
class G4vg(CMakePackage): class G4vg(CMakePackage):
@ -39,9 +38,6 @@ def cmake_args(self):
] ]
if self.version == Version("develop"): if self.version == Version("develop"):
args.append(define("G4VG_GIT_DESCRIBE", args.append(define("G4VG_GIT_DESCRIBE", [self.next_develop_version, "-dev", "spack"]))
[self.next_develop_version,
"-dev",
"spack"]))
return args return args