diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2024-11-10 16:00:34 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2024-11-11 01:54:57 -0800 |
| commit | 6961514122e04f3509c5e4a095060b056c38f5e9 (patch) | |
| tree | 70d98bbd256aa700dae2b4f1387cbb0780f74001 /var | |
| parent | a9e60749964e976382fc87bf5e8b9a0d40b816d2 (diff) | |
| download | spack-6961514122e04f3509c5e4a095060b056c38f5e9.tar.gz spack-6961514122e04f3509c5e4a095060b056c38f5e9.tar.bz2 spack-6961514122e04f3509c5e4a095060b056c38f5e9.tar.xz spack-6961514122e04f3509c5e4a095060b056c38f5e9.zip | |
imports: move `conditional` to `directives.py`
`conditional()`, which defines conditional variant values, and the other ways to declare
variant values should probably be in a layer above `spack.variant`. This does the simple
thing and moves *just* `conditional()` to `spack.directives` to avoid a circular import.
We can revisit the public variant interface later, when we split packages from core.
Co-authored-by: Harmen Stoppels <me@harmenstoppels.nl>
Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/geant4/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vecgeom/package.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 8dd3f18b5d..38ebb060fb 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * -from spack.variant import _ConditionalVariantValues +from spack.variant import ConditionalVariantValues class Geant4(CMakePackage): @@ -180,7 +180,7 @@ class Geant4(CMakePackage): def std_when(values): for v in values: - if isinstance(v, _ConditionalVariantValues): + if isinstance(v, ConditionalVariantValues): for c in v: yield (c.value, c.when) else: diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index d48585ad13..ff0fdd145d 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -5,7 +5,7 @@ from spack.package import * -from spack.variant import _ConditionalVariantValues +from spack.variant import ConditionalVariantValues class Vecgeom(CMakePackage, CudaPackage): @@ -196,7 +196,7 @@ class Vecgeom(CMakePackage, CudaPackage): def std_when(values): for v in values: - if isinstance(v, _ConditionalVariantValues): + if isinstance(v, ConditionalVariantValues): for c in v: yield (c.value, c.when) else: |