perl: remove a few imports

lib/spack/spack/variant.py

@@ -208,7 +208,7 @@ def variant_type(self) -> VariantType:
         else:
             return VariantType.SINGLE
 
-    def __str__(self) -> str:
+    def __str__(self):
         return (
             f"Variant('{self.name}', "
             f"default='{self.default}', "
@@ -491,14 +491,14 @@ class DisjointSetsOfValues(collections.abc.Sequence):
         *sets (list): mutually exclusive sets of values
     """
 
-    _empty_set = {"none"}
+    _empty_set = set(("none",))
 
-    def __init__(self, *sets: Tuple[str, ...]) -> None:
+    def __init__(self, *sets):
         self.sets = [set(_flatten(x)) for x in sets]
 
         # 'none' is a special value and can appear only in a set of
         # a single element
-        if any("none" in s and s != {"none"} for s in self.sets):
+        if any("none" in s and s != set(("none",)) for s in self.sets):
             raise spack.error.SpecError(
                 "The value 'none' represents the empty set,"
                 " and must appear alone in a set. Use the "

var/spack/repos/spack_repo/builtin/packages/abyss/package.py

@@ -5,10 +5,11 @@
 import numbers
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 def is_multiple_32(x):
     """multiple of 32"""

var/spack/repos/spack_repo/builtin/packages/akantu/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Akantu(CMakePackage):
     """

var/spack/repos/spack_repo/builtin/packages/amdblis/package.py

@@ -4,10 +4,10 @@
 
 import os
 
-from spack_repo.builtin.packages.blis.package import BlisBase
-
 from spack.package import *
 
+from ..blis.package import BlisBase
+
 
 class Amdblis(BlisBase):
     """AMD Optimized BLIS.

var/spack/repos/spack_repo/builtin/packages/amdfftw/package.py

@@ -4,10 +4,10 @@
 
 import os
 
-from spack_repo.builtin.packages.fftw.package import FftwBase
-
 from spack.package import *
 
+from ..fftw.package import FftwBase
+
 
 class Amdfftw(FftwBase):
     """FFTW (AMD Optimized version) is a comprehensive collection of

var/spack/repos/spack_repo/builtin/packages/amdlibflame/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems import autotools, cmake
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
-from spack_repo.builtin.packages.libflame.package import LibflameBase
 
 from spack.package import *
 
+from ..libflame.package import LibflameBase
+
 
 class Amdlibflame(CMakePackage, LibflameBase):
     """libFLAME (AMD Optimized version) is a portable library for

var/spack/repos/spack_repo/builtin/packages/amdscalapack/package.py

@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.packages.netlib_scalapack.package import ScalapackBase
-
 from spack.package import *
 
+from ..netlib_scalapack.package import ScalapackBase
+
 
 class Amdscalapack(ScalapackBase):
     """

var/spack/repos/spack_repo/builtin/packages/amp/package.py

@@ -2,10 +2,11 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Amp(CMakePackage):
     """The Advanced Multi-Physics (AMP) package.

var/spack/repos/spack_repo/builtin/packages/aocc/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
+from ..llvm.package import LlvmDetection
+
 
 class Aocc(Package, LlvmDetection, CompilerPackage):
     """

var/spack/repos/spack_repo/builtin/packages/aoflagger/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Aoflagger(CMakePackage):
     """RFI detector and quality analysis

var/spack/repos/spack_repo/builtin/packages/apple_clang/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems.bundle import BundlePackage
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
-from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
+from ..llvm.package import LlvmDetection
+
 
 class AppleClang(BundlePackage, LlvmDetection, CompilerPackage):
     """Apple's Clang compiler"""

var/spack/repos/spack_repo/builtin/packages/apple_glu/package.py

@@ -1,10 +1,10 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack_repo.builtin.packages.apple_gl.package import AppleGlBase
-
 from spack.package import *
 
+from ..apple_gl.package import AppleGlBase
+
 
 class AppleGlu(AppleGlBase):
     """Shim package for Apple implementation of OpenGL Utility Libray (GLU)"""

var/spack/repos/spack_repo/builtin/packages/apptainer/package.py

@@ -6,10 +6,10 @@
 from glob import glob
 from os.path import basename
 
-from spack_repo.builtin.packages.singularityce.package import SingularityBase
-
 from spack.package import *
 
+from ..singularityce.package import SingularityBase
+
 
 # Apptainer is the new name of Singularity, piggy-back on the original package
 class Apptainer(SingularityBase):

var/spack/repos/spack_repo/builtin/packages/augustus/package.py

@@ -5,10 +5,11 @@
 import glob
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Augustus(MakefilePackage):
     """AUGUSTUS is a program that predicts genes in eukaryotic

var/spack/repos/spack_repo/builtin/packages/automaded/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Automaded(CMakePackage):
     """AutomaDeD (Automata-based Debugging for Dissimilar parallel

var/spack/repos/spack_repo/builtin/packages/bcl2fastq2/package.py

@@ -6,10 +6,11 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 # This application uses cmake to build, but they wrap it with a
 # configure script that performs dark magic.  This package does it

var/spack/repos/spack_repo/builtin/packages/bohrium/package.py

@@ -6,11 +6,12 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 from spack.package_test import compare_output
 
+from ..boost.package import Boost
+
 
 class Bohrium(CMakePackage, CudaPackage):
     """Library for automatic acceleration of array operations"""

var/spack/repos/spack_repo/builtin/packages/branson/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Branson(CMakePackage):
     """Branson's purpose is to study different algorithms for parallel Monte

var/spack/repos/spack_repo/builtin/packages/cabana/package.py

@@ -5,10 +5,11 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.kokkos.package import Kokkos
 
 from spack.package import *
 
+from ..kokkos.package import Kokkos
+
 
 class Cabana(CMakePackage, CudaPackage, ROCmPackage):
     """The Exascale Co-Design Center for Particle Applications Toolkit"""

var/spack/repos/spack_repo/builtin/packages/caffe/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Caffe(CMakePackage, CudaPackage):
     """Caffe is a deep learning framework made with expression, speed, and

var/spack/repos/spack_repo/builtin/packages/cantera/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.scons import SConsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Cantera(SConsPackage):
     """Cantera is a suite of object-oriented software tools for problems

var/spack/repos/spack_repo/builtin/packages/care/package.py

@@ -12,10 +12,11 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
+from ..blt.package import llnl_link_helpers
+
 
 class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
     """

var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class CbtfArgonavis(CMakePackage):
     """CBTF Argo Navis project contains the CUDA collector and supporting

var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis_gui/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.qmake import QMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class CbtfArgonavisGui(QMakePackage):
     """CBTF Argo Navis GUI project contains the GUI that views OpenSpeedShop

var/spack/repos/spack_repo/builtin/packages/chai/package.py

@@ -12,10 +12,11 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
+from ..blt.package import llnl_link_helpers
+
 
 class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
     """

var/spack/repos/spack_repo/builtin/packages/channelflow/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Channelflow(CMakePackage):
     """Channelflow is a software system for numerical analysis of the

var/spack/repos/spack_repo/builtin/packages/cleverleaf/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Cleverleaf(CMakePackage):
     """CleverLeaf is a hydrodynamics mini-app that extends CloverLeaf with

var/spack/repos/spack_repo/builtin/packages/clfft/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Clfft(CMakePackage):
     """a software library containing FFT functions written in OpenCL"""

var/spack/repos/spack_repo/builtin/packages/clingo_bootstrap/package.py

@@ -4,12 +4,12 @@
 import glob
 import os
 
-from spack_repo.builtin.packages.clingo.package import Clingo
-
 import spack.paths
 import spack.user_environment
 from spack.package import *
 
+from ..clingo.package import Clingo
+
 
 class ClingoBootstrap(Clingo):
     """Clingo with some options used for bootstrapping"""

var/spack/repos/spack_repo/builtin/packages/cntk/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Cntk(Package):
     """The Microsoft Cognitive Toolkit is a unified deep-learning toolkit

var/spack/repos/spack_repo/builtin/packages/coin3d/package.py

@@ -5,10 +5,11 @@
 from spack_repo.builtin.build_systems import autotools, cmake
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Coin3d(AutotoolsPackage, CMakePackage):
     """Coin is an OpenGL-based, 3D graphics library that has its roots in the

var/spack/repos/spack_repo/builtin/packages/cray_mpich/package.py

@@ -7,11 +7,12 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.generic import Package
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 from spack.util.module_cmd import get_path_args_from_module_line, module
 
+from ..mpich.package import MpichEnvironmentModifications
+
 
 class CrayMpich(MpichEnvironmentModifications, Package, CudaPackage, ROCmPackage):
     """Cray's MPICH is a high performance and widely portable implementation of

var/spack/repos/spack_repo/builtin/packages/cray_mvapich2/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 
+from ..mpich.package import MpichEnvironmentModifications
+
 
 class CrayMvapich2(MpichEnvironmentModifications, Package):
     """Cray/HPE packaging of MVAPICH2 for HPE Apollo systems"""

var/spack/repos/spack_repo/builtin/packages/dakota/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 def submodules(package):
     submodules = []

var/spack/repos/spack_repo/builtin/packages/dbow2/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Dbow2(CMakePackage):
     """DBoW2 is an improved version of the DBow library, an open source C++

var/spack/repos/spack_repo/builtin/packages/dealii/package.py

@@ -6,10 +6,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Dealii(CMakePackage, CudaPackage):
     """C++ software library providing well-documented tools to build finite

var/spack/repos/spack_repo/builtin/packages/dssp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Dssp(AutotoolsPackage):
     """'mkdssp' utility. (dictionary of protein secondary structure)"""

var/spack/repos/spack_repo/builtin/packages/ecflow/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Ecflow(CMakePackage):
     """ecFlow is a work flow package that enables users to run a large number

var/spack/repos/spack_repo/builtin/packages/ethminer/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Ethminer(CMakePackage):
     """The ethminer is an Ethereum GPU mining worker."""

var/spack/repos/spack_repo/builtin/packages/exaca/package.py

@@ -5,10 +5,11 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.kokkos.package import Kokkos
 
 from spack.package import *
 
+from ..kokkos.package import Kokkos
+
 
 class Exaca(CMakePackage, CudaPackage, ROCmPackage):
     """ExaCA: an exascale cellular automata application for alloy solidification modeling"""

var/spack/repos/spack_repo/builtin/packages/extrae/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 # typical working line with extrae 3.0.1
 # ./configure
 #   --prefix=/usr/local

var/spack/repos/spack_repo/builtin/packages/fenics/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.python import PythonPipBuilder
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Fenics(CMakePackage):
     """FEniCS is organized as a collection of interoperable components

var/spack/repos/spack_repo/builtin/packages/foam_extend/package.py

@@ -33,15 +33,11 @@
 import re
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.openfoam.package import (
-    OpenfoamArch,
-    add_extra_files,
-    rewrite_environ_files,
-    write_environ,
-)
 
 from spack.package import *
 
+from ..openfoam.package import OpenfoamArch, add_extra_files, rewrite_environ_files, write_environ
+
 
 class FoamExtend(Package):
     """The Extend Project is a fork of the OpenFOAM opensource library

var/spack/repos/spack_repo/builtin/packages/foundationdb/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Foundationdb(CMakePackage):
     """FoundationDB is a distributed database designed to handle large

var/spack/repos/spack_repo/builtin/packages/fujitsu_fftw/package.py

@@ -1,10 +1,10 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack_repo.builtin.packages.fftw.package import FftwBase
-
 from spack.package import *
 
+from ..fftw.package import FftwBase
+
 
 class FujitsuFftw(FftwBase):
     """FFTW (Fujitsu Optimized version) is a comprehensive collection of

var/spack/repos/spack_repo/builtin/packages/fujitsu_frontistr/package.py

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack_repo.builtin.packages.frontistr.package import FrontistrBase
-
 from spack.package import *
 
+from ..frontistr.package import FrontistrBase
+
 
 class FujitsuFrontistr(FrontistrBase):
     """This is a fork repository of the FrontISTR tuned for A64FX."""

var/spack/repos/spack_repo/builtin/packages/geant4/package.py

@@ -5,10 +5,16 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 
 from spack.package import *
+from spack.variant import ConditionalVariantValues
 
 
 def _std_when(values):
-    return [(c.value, c.when) for v in values for c in v]
+    for v in values:
+        if isinstance(v, ConditionalVariantValues):
+            for c in v:
+                yield (c.value, c.when)
+        else:
+            yield (v, "")
 
 
 class Geant4(CMakePackage):

var/spack/repos/spack_repo/builtin/packages/gnuradio/package.py

@@ -4,10 +4,11 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Gnuradio(CMakePackage):
     """GNU Radio is a free & open-source software development toolkit

var/spack/repos/spack_repo/builtin/packages/gource/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Gource(AutotoolsPackage):
     """Software version control visualization."""

var/spack/repos/spack_repo/builtin/packages/graphblast/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Graphblast(MakefilePackage, CudaPackage):
     """High-Performance Linear Algebra-based Graph Primitives on GPUs"""

var/spack/repos/spack_repo/builtin/packages/gromacs_chain_coordinate/package.py

@@ -2,11 +2,11 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.packages.gromacs.package import CMakeBuilder as GromacsCMakeBuilder
-from spack_repo.builtin.packages.gromacs.package import Gromacs
-
 from spack.package import *
 
+from ..gromacs.package import CMakeBuilder as GromacsCMakeBuilder
+from ..gromacs.package import Gromacs
+
 
 class GromacsChainCoordinate(Gromacs):
     """

var/spack/repos/spack_repo/builtin/packages/gromacs_swaxs/package.py

@@ -2,11 +2,11 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.packages.gromacs.package import CMakeBuilder as GromacsCMakeBuilder
-from spack_repo.builtin.packages.gromacs.package import Gromacs
-
 from spack.package import *
 
+from ..gromacs.package import CMakeBuilder as GromacsCMakeBuilder
+from ..gromacs.package import Gromacs
+
 
 class GromacsSwaxs(Gromacs):
     """Modified Gromacs for small-angle scattering calculations (SAXS/WAXS/SANS)"""

var/spack/repos/spack_repo/builtin/packages/gunrock/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Gunrock(CMakePackage, CudaPackage):
     """High-Performance Graph Primitives on GPUs"""

var/spack/repos/spack_repo/builtin/packages/helics/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Helics(CMakePackage):
     """HELICS is a general-purpose, modular, highly-scalable co-simulation

var/spack/repos/spack_repo/builtin/packages/herwigpp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Herwigpp(AutotoolsPackage):
     """Herwig is a multi-purpose particle physics event generator.

var/spack/repos/spack_repo/builtin/packages/highfive/package.py

@@ -4,10 +4,11 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Highfive(CMakePackage):
     """HighFive - Header only C++ HDF5 interface"""

var/spack/repos/spack_repo/builtin/packages/hipblas/package.py

@@ -8,6 +8,7 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -56,7 +57,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=disjoint_sets(("auto",), amdgpu_targets)
+        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"

var/spack/repos/spack_repo/builtin/packages/hipcub/package.py

@@ -6,6 +6,7 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -49,7 +50,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=disjoint_sets(("auto",), amdgpu_targets)
+        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"

var/spack/repos/spack_repo/builtin/packages/hipfft/package.py

@@ -7,6 +7,7 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -56,7 +57,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=disjoint_sets(("auto",), amdgpu_targets)
+        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"

var/spack/repos/spack_repo/builtin/packages/hiprand/package.py

@@ -8,6 +8,7 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -56,7 +57,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=disjoint_sets(("auto",), amdgpu_targets)
+        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"

var/spack/repos/spack_repo/builtin/packages/hipsolver/package.py

@@ -9,6 +9,7 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -61,7 +62,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=disjoint_sets(("auto",), amdgpu_targets)
+        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"

var/spack/repos/spack_repo/builtin/packages/hipsparse/package.py

@@ -8,6 +8,7 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -53,7 +54,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=disjoint_sets(("auto",), amdgpu_targets)
+        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"

var/spack/repos/spack_repo/builtin/packages/hipsparselt/package.py

@@ -6,6 +6,7 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -40,7 +41,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=disjoint_sets(("auto",), amdgpu_targets)
+        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"

var/spack/repos/spack_repo/builtin/packages/hisea/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Hisea(MakefilePackage):
     """HISEA is an efficient all-vs-all long read aligner for SMRT sequencing

var/spack/repos/spack_repo/builtin/packages/hpx/package.py

@@ -8,10 +8,11 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Hpx(CMakePackage, CudaPackage, ROCmPackage):
     """C++ runtime system for parallel and distributed applications."""

var/spack/repos/spack_repo/builtin/packages/hssp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Hssp(AutotoolsPackage):
     """The source code for building the mkhssp and hsspconv programs is bundled

var/spack/repos/spack_repo/builtin/packages/hybrid_lambda/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class HybridLambda(AutotoolsPackage):
     """Hybrid-Lambda is a software package that can simulate gene trees

var/spack/repos/spack_repo/builtin/packages/ibmisc/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Ibmisc(CMakePackage):
     """Misc. reusable utilities used by IceBin."""

var/spack/repos/spack_repo/builtin/packages/imp/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Imp(CMakePackage):
     """IMP, the Integrative Modeling Platform."""

var/spack/repos/spack_repo/builtin/packages/intel_oneapi_runtime/package.py

@@ -5,10 +5,11 @@
 
 from spack_repo.builtin.build_systems.generic import Package
 from spack_repo.builtin.build_systems.oneapi import IntelOneApiPackage
-from spack_repo.builtin.packages.gcc_runtime.package import get_elf_libraries
 
 from spack.package import *
 
+from ..gcc_runtime.package import get_elf_libraries
+
 
 @IntelOneApiPackage.update_description
 class IntelOneapiRuntime(Package):

var/spack/repos/spack_repo/builtin/packages/jali/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Jali(CMakePackage):
     """Jali is a parallel, unstructured mesh infrastructure library designed

var/spack/repos/spack_repo/builtin/packages/kea/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Kea(AutotoolsPackage):
     """Modern, open source DHCPv4 & DHCPv6 server."""

var/spack/repos/spack_repo/builtin/packages/kicad/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Kicad(CMakePackage):
     """KiCad is an open source software suite for Electronic Design

var/spack/repos/spack_repo/builtin/packages/lammps_example_plugin/package.py

@@ -5,10 +5,11 @@
 import datetime as dt
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.lammps.package import Lammps
 
 from spack.package import *
 
+from ..lammps.package import Lammps
+
 
 class LammpsExamplePlugin(CMakePackage):
     """LAMMPS Example Plugin"""

var/spack/repos/spack_repo/builtin/packages/libcudf/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libcudf(CMakePackage):
     """Built based on the Apache Arrow columnar memory format,

var/spack/repos/spack_repo/builtin/packages/libfive/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libfive(CMakePackage):
     """libfive is a software library and set of tools for solid modeling."""

var/spack/repos/spack_repo/builtin/packages/libint/package.py

@@ -5,10 +5,11 @@
 import os
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 TUNE_VARIANTS = (
     "none",
     "cp2k-lmax-4",

var/spack/repos/spack_repo/builtin/packages/libkml/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libkml(CMakePackage):
     """Reference implementation of OGC KML 2.2."""

var/spack/repos/spack_repo/builtin/packages/libmesh/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libmesh(AutotoolsPackage):
     """The libMesh library provides a framework for the numerical simulation of

var/spack/repos/spack_repo/builtin/packages/libpulsar/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Libpulsar(CMakePackage):
     """libpulsar is a C/C++ client library implementation of the Apache Pulsar

var/spack/repos/spack_repo/builtin/packages/librom/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Librom(AutotoolsPackage):
     """libROM: library for computing large-scale reduced order models"""

var/spack/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py

@@ -7,10 +7,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
-from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
+from ..llvm.package import LlvmDetection
+
 
 class LlvmAmdgpu(CMakePackage, LlvmDetection, CompilerPackage):
     """Toolkit for the construction of highly optimized compilers,

var/spack/repos/spack_repo/builtin/packages/lordec/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Lordec(MakefilePackage):
     """LoRDEC is a program to correct sequencing errors in long reads from

var/spack/repos/spack_repo/builtin/packages/lua_luajit/package.py

@@ -4,10 +4,10 @@
 
 import os
 
-from spack_repo.builtin.packages.lua.package import LuaImplPackage
-
 from spack.package import *
 
+from ..lua.package import LuaImplPackage
+
 
 class LuaLuajit(LuaImplPackage):
     """Flast flexible JITed lua"""

var/spack/repos/spack_repo/builtin/packages/lua_luajit_openresty/package.py

@@ -4,10 +4,10 @@
 
 import os
 
-from spack_repo.builtin.packages.lua.package import LuaImplPackage
-
 from spack.package import *
 
+from ..lua.package import LuaImplPackage
+
 
 class LuaLuajitOpenresty(LuaImplPackage):
     """Flast flexible JITed lua - OpenResty maintained fork"""

var/spack/repos/spack_repo/builtin/packages/mallocmc/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Mallocmc(CMakePackage):
     """mallocMC: Memory Allocator for Many Core Architectures.

var/spack/repos/spack_repo/builtin/packages/mapnik/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Mapnik(AutotoolsPackage):
     """

var/spack/repos/spack_repo/builtin/packages/mariadb/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Mariadb(CMakePackage):
     """MariaDB Server is one of the most popular database servers

var/spack/repos/spack_repo/builtin/packages/masurca/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.generic import Package
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Masurca(Package):
     """MaSuRCA is whole genome assembly software. It combines the efficiency

var/spack/repos/spack_repo/builtin/packages/meraculous/package.py

@@ -4,10 +4,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.sourceforge import SourceforgePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Meraculous(CMakePackage, SourceforgePackage):
     """Meraculous is a while genome assembler for Next Generation Sequencing

var/spack/repos/spack_repo/builtin/packages/mesa/package.py

@@ -6,6 +6,7 @@
 from spack_repo.builtin.build_systems import meson
 from spack_repo.builtin.build_systems.meson import MesonPackage
 
+import spack.variant
 from spack.package import *
 
 
@@ -84,7 +85,9 @@ class Mesa(MesonPackage):
     #   @:21  - swr was removed in 22.0
     variant(
         "swr",
-        values=disjoint_sets(("none",), ("auto",), ("avx", "avx2", "knl", "skx"))
+        values=spack.variant.DisjointSetsOfValues(
+            ("none",), ("auto",), ("avx", "avx2", "knl", "skx")
+        )
         .with_non_feature_values("auto")
         .with_non_feature_values("none")
         .with_default("auto"),

var/spack/repos/spack_repo/builtin/packages/metabat/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Metabat(CMakePackage):
     """MetaBAT, an efficient tool for accurately reconstructing single

var/spack/repos/spack_repo/builtin/packages/metacarpa/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Metacarpa(MakefilePackage):
     """

var/spack/repos/spack_repo/builtin/packages/metall/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Metall(CMakePackage):
     """A Persistent Memory Allocator For Data-Centric Analytics"""

var/spack/repos/spack_repo/builtin/packages/miopen_hip/package.py

@@ -5,10 +5,11 @@
 import re
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class MiopenHip(CMakePackage):
     """AMD's library for high performance machine learning primitives."""

var/spack/repos/spack_repo/builtin/packages/miopen_opencl/package.py

@@ -5,10 +5,11 @@
 import re
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class MiopenOpencl(CMakePackage):
     """AMD's library for high performance machine learning primitives."""

var/spack/repos/spack_repo/builtin/packages/mira/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Mira(AutotoolsPackage):
     """MIRA is a multi-pass DNA sequence data assembler/mapper for whole genome

var/spack/repos/spack_repo/builtin/packages/mrnet/package.py

@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
+from ..boost.package import Boost
+
 
 class Mrnet(AutotoolsPackage):
     """The MRNet Multi-Cast Reduction Network."""

var/spack/repos/spack_repo/builtin/packages/mvapich/package.py

@@ -7,10 +7,11 @@
 import sys
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 
+from ..mpich.package import MpichEnvironmentModifications
+
 
 class Mvapich(MpichEnvironmentModifications, AutotoolsPackage):
     """Mvapich is a High-Performance MPI Library for clusters with diverse

var/spack/repos/spack_repo/builtin/packages/mvapich2/package.py

@@ -7,11 +7,12 @@
 import sys
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
-from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 import spack.compilers.config
 from spack.package import *
 
+from ..mpich.package import MpichEnvironmentModifications
+
 
 class Mvapich2(MpichEnvironmentModifications, AutotoolsPackage):
     """Mvapich2 is a High-Performance MPI Library for clusters with diverse