fix docs

lib/spack/docs/conf.py

@@ -75,6 +75,7 @@
     apidoc_args
     + [
         "_spack_root/lib/spack/spack",
+        "_spack_root/lib/spack/spack/package.py",  # sphinx struggles with os.chdir re-export.
         "_spack_root/lib/spack/spack/test/*.py",
         "_spack_root/lib/spack/spack/test/cmd/*.py",
     ]

lib/spack/spack/build_systems/_package_api_v1.py

@@ -0,0 +1,99 @@
+# Copyright Spack Project Developers. See COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+"""This module re-exports symbols that are part of the v1.0 Package API, but were removed in the
+v2.0 Package API after build systems were moved into the ``spack_repo.builtin`` package.
+In older versions of Spack, these symbols were re-exported from ``spack.package``."""
+
+from .aspell_dict import AspellDictPackage
+from .autotools import AutotoolsPackage
+from .bundle import BundlePackage
+from .cached_cmake import (
+    CachedCMakePackage,
+    cmake_cache_filepath,
+    cmake_cache_option,
+    cmake_cache_path,
+    cmake_cache_string,
+)
+from .cargo import CargoPackage
+from .cmake import CMakePackage, generator
+from .compiler import CompilerPackage
+from .cuda import CudaPackage
+from .generic import Package
+from .gnu import GNUMirrorPackage
+from .go import GoPackage
+from .intel import IntelPackage
+from .lua import LuaPackage
+from .makefile import MakefilePackage
+from .maven import MavenPackage
+from .meson import MesonPackage
+from .msbuild import MSBuildPackage
+from .nmake import NMakePackage
+from .octave import OctavePackage
+from .oneapi import (
+    INTEL_MATH_LIBRARIES,
+    IntelOneApiLibraryPackage,
+    IntelOneApiLibraryPackageWithSdk,
+    IntelOneApiPackage,
+    IntelOneApiStaticLibraryList,
+)
+from .perl import PerlPackage
+from .python import PythonExtension, PythonPackage
+from .qmake import QMakePackage
+from .r import RPackage
+from .racket import RacketPackage
+from .rocm import ROCmPackage
+from .ruby import RubyPackage
+from .scons import SConsPackage
+from .sip import SIPPackage
+from .sourceforge import SourceforgePackage
+from .sourceware import SourcewarePackage
+from .waf import WafPackage
+from .xorg import XorgPackage
+
+__all__ = [
+    "AspellDictPackage",
+    "AutotoolsPackage",
+    "BundlePackage",
+    "CachedCMakePackage",
+    "cmake_cache_filepath",
+    "cmake_cache_option",
+    "cmake_cache_path",
+    "cmake_cache_string",
+    "CargoPackage",
+    "CMakePackage",
+    "generator",
+    "CompilerPackage",
+    "CudaPackage",
+    "Package",
+    "GNUMirrorPackage",
+    "GoPackage",
+    "IntelPackage",
+    "IntelOneApiLibraryPackageWithSdk",
+    "IntelOneApiLibraryPackage",
+    "IntelOneApiStaticLibraryList",
+    "IntelOneApiPackage",
+    "INTEL_MATH_LIBRARIES",
+    "LuaPackage",
+    "MakefilePackage",
+    "MavenPackage",
+    "MesonPackage",
+    "MSBuildPackage",
+    "NMakePackage",
+    "OctavePackage",
+    "PerlPackage",
+    "PythonExtension",
+    "PythonPackage",
+    "QMakePackage",
+    "RacketPackage",
+    "RPackage",
+    "ROCmPackage",
+    "RubyPackage",
+    "SConsPackage",
+    "SIPPackage",
+    "SourceforgePackage",
+    "SourcewarePackage",
+    "WafPackage",
+    "XorgPackage",
+]

lib/spack/spack/cmd/create.py

@@ -52,6 +52,7 @@
 # See the Spack documentation for more information on packaging.
 # ----------------------------------------------------------------------------
 
+{package_class_import}
 from spack.package import *
 
 
@@ -85,6 +86,7 @@ class BundlePackageTemplate:
     """
 
     base_class_name = "BundlePackage"
+    package_class_import = "from spack.build_systems.bundle import BundlePackage"
 
     dependencies = """\
     # FIXME: Add dependencies if required.
@@ -114,6 +116,7 @@ def write(self, pkg_path):
                     name=self.name,
                     class_name=self.class_name,
                     base_class_name=self.base_class_name,
+                    package_class_import=self.package_class_import,
                     url_def=self.url_def,
                     versions=self.versions,
                     dependencies="\n".join(all_deps),
@@ -126,6 +129,7 @@ class PackageTemplate(BundlePackageTemplate):
     """Provides the default values to be used for the package file template"""
 
     base_class_name = "Package"
+    package_class_import = "from spack.build_systems.generic import Package"
 
     body_def = """\
     def install(self, spec, prefix):
@@ -146,6 +150,7 @@ class AutotoolsPackageTemplate(PackageTemplate):
     that *do* come with a ``configure`` script"""
 
     base_class_name = "AutotoolsPackage"
+    package_class_import = "from spack.build_systems.autotools import AutotoolsPackage"
 
     body_def = """\
     def configure_args(self):
@@ -160,6 +165,7 @@ class AutoreconfPackageTemplate(PackageTemplate):
     that *do not* come with a ``configure`` script"""
 
     base_class_name = "AutotoolsPackage"
+    package_class_import = "from spack.build_systems.autotools import AutotoolsPackage"
 
     dependencies = """\
     depends_on("autoconf", type="build")
@@ -186,6 +192,7 @@ class CargoPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for cargo-based packages"""
 
     base_class_name = "CargoPackage"
+    package_class_import = "from spack.build_systems.cargo import CargoPackage"
 
     body_def = ""
 
@@ -194,6 +201,7 @@ class CMakePackageTemplate(PackageTemplate):
     """Provides appropriate overrides for CMake-based packages"""
 
     base_class_name = "CMakePackage"
+    package_class_import = "from spack.build_systems.cmake import CMakePackage"
 
     body_def = """\
     def cmake_args(self):
@@ -208,6 +216,7 @@ class GoPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for Go-module-based packages"""
 
     base_class_name = "GoPackage"
+    package_class_import = "from spack.build_systems.go import GoPackage"
 
     body_def = ""
 
@@ -216,6 +225,7 @@ class LuaPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for LuaRocks-based packages"""
 
     base_class_name = "LuaPackage"
+    package_class_import = "from spack.build_systems.lua import LuaPackage"
 
     body_def = """\
     def luarocks_args(self):
@@ -237,6 +247,7 @@ class MesonPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for meson-based packages"""
 
     base_class_name = "MesonPackage"
+    package_class_import = "from spack.build_systems.meson import MesonPackage"
 
     body_def = """\
     def meson_args(self):
@@ -249,6 +260,7 @@ class QMakePackageTemplate(PackageTemplate):
     """Provides appropriate overrides for QMake-based packages"""
 
     base_class_name = "QMakePackage"
+    package_class_import = "from spack.build_systems.qmake import QMakePackage"
 
     body_def = """\
     def qmake_args(self):
@@ -261,6 +273,7 @@ class MavenPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for Maven-based packages"""
 
     base_class_name = "MavenPackage"
+    package_class_import = "from spack.build_systems.maven import MavenPackage"
 
     body_def = """\
     def build(self, spec, prefix):
@@ -272,6 +285,7 @@ class SconsPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for SCons-based packages"""
 
     base_class_name = "SConsPackage"
+    package_class_import = "from spack.build_systems.scons import SConsPackage"
 
     body_def = """\
     def build_args(self, spec, prefix):
@@ -285,6 +299,7 @@ class WafPackageTemplate(PackageTemplate):
     """Provides appropriate override for Waf-based packages"""
 
     base_class_name = "WafPackage"
+    package_class_import = "from spack.build_systems.waf import WafPackage"
 
     body_def = """\
     # FIXME: Override configure_args(), build_args(),
@@ -308,6 +323,7 @@ class RacketPackageTemplate(PackageTemplate):
     """Provides approriate overrides for Racket extensions"""
 
     base_class_name = "RacketPackage"
+    package_class_import = "from spack.build_systems.racket import RacketPackage"
 
     url_line = """\
     # FIXME: set the proper location from which to fetch your package
@@ -345,6 +361,7 @@ class PythonPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for python extensions"""
 
     base_class_name = "PythonPackage"
+    package_class_import = "from spack.build_systems.python import PythonPackage"
 
     dependencies = """\
     # FIXME: Only add the python/pip/wheel dependencies if you need specific versions
@@ -432,6 +449,7 @@ class RPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for R extensions"""
 
     base_class_name = "RPackage"
+    package_class_import = "from spack.build_systems.r import RPackage"
 
     dependencies = """\
     # FIXME: Add dependencies if required.
@@ -472,6 +490,7 @@ class PerlmakePackageTemplate(PackageTemplate):
     that come with a Makefile.PL"""
 
     base_class_name = "PerlPackage"
+    package_class_import = "from spack.build_systems.perl import PerlPackage"
 
     dependencies = """\
     # FIXME: Add dependencies if required:
@@ -509,6 +528,7 @@ class OctavePackageTemplate(PackageTemplate):
     """Provides appropriate overrides for octave packages"""
 
     base_class_name = "OctavePackage"
+    package_class_import = "from spack.build_systems.octave import OctavePackage"
 
     dependencies = """\
     extends("octave")
@@ -531,6 +551,7 @@ class RubyPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for Ruby packages"""
 
     base_class_name = "RubyPackage"
+    package_class_import = "from spack.build_systems.ruby import RubyPackage"
 
     dependencies = """\
     # FIXME: Add dependencies if required. Only add the ruby dependency
@@ -559,6 +580,7 @@ class MakefilePackageTemplate(PackageTemplate):
     """Provides appropriate overrides for Makefile packages"""
 
     base_class_name = "MakefilePackage"
+    package_class_import = "from spack.build_systems.makefile import MakefilePackage"
 
     body_def = """\
     def edit(self, spec, prefix):
@@ -573,6 +595,7 @@ class IntelPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for licensed Intel software"""
 
     base_class_name = "IntelOneApiPackage"
+    package_class_import = "from spack.build_systems.oneapi import IntelOneApiPackage"
 
     body_def = """\
     # FIXME: Override `setup_environment` if necessary."""
@@ -582,6 +605,7 @@ class SIPPackageTemplate(PackageTemplate):
     """Provides appropriate overrides for SIP packages."""
 
     base_class_name = "SIPPackage"
+    package_class_import = "from spack.build_systems.sip import SIPPackage"
 
     body_def = """\
     def configure_args(self, spec, prefix):

lib/spack/spack/package.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-# flake8: noqa: F401, E402
 """spack.package defines the public API for Spack packages, by re-exporting useful symbols from
 other modules. Packages should import this module, instead of importing from spack.* directly
 to ensure forward compatibility with future versions of Spack."""
@@ -13,17 +12,6 @@
 # import most common types used in packages
 from typing import Dict, List, Optional
 
-
-class tty:
-    import llnl.util.tty as _tty
-
-    debug = _tty.debug
-    error = _tty.error
-    info = _tty.info
-    msg = _tty.msg
-    warn = _tty.warn
-
-
 from llnl.util.filesystem import (
     FileFilter,
     FileList,
@@ -61,51 +49,6 @@ class tty:
 from llnl.util.symlink import symlink
 
 from spack.build_environment import MakeExecutable
-from spack.build_systems.aspell_dict import AspellDictPackage
-from spack.build_systems.autotools import AutotoolsPackage
-from spack.build_systems.bundle import BundlePackage
-from spack.build_systems.cached_cmake import (
-    CachedCMakePackage,
-    cmake_cache_filepath,
-    cmake_cache_option,
-    cmake_cache_path,
-    cmake_cache_string,
-)
-from spack.build_systems.cargo import CargoPackage
-from spack.build_systems.cmake import CMakePackage, generator
-from spack.build_systems.compiler import CompilerPackage
-from spack.build_systems.cuda import CudaPackage
-from spack.build_systems.generic import Package
-from spack.build_systems.gnu import GNUMirrorPackage
-from spack.build_systems.go import GoPackage
-from spack.build_systems.intel import IntelPackage
-from spack.build_systems.lua import LuaPackage
-from spack.build_systems.makefile import MakefilePackage
-from spack.build_systems.maven import MavenPackage
-from spack.build_systems.meson import MesonPackage
-from spack.build_systems.msbuild import MSBuildPackage
-from spack.build_systems.nmake import NMakePackage
-from spack.build_systems.octave import OctavePackage
-from spack.build_systems.oneapi import (
-    INTEL_MATH_LIBRARIES,
-    IntelOneApiLibraryPackage,
-    IntelOneApiLibraryPackageWithSdk,
-    IntelOneApiPackage,
-    IntelOneApiStaticLibraryList,
-)
-from spack.build_systems.perl import PerlPackage
-from spack.build_systems.python import PythonExtension, PythonPackage
-from spack.build_systems.qmake import QMakePackage
-from spack.build_systems.r import RPackage
-from spack.build_systems.racket import RacketPackage
-from spack.build_systems.rocm import ROCmPackage
-from spack.build_systems.ruby import RubyPackage
-from spack.build_systems.scons import SConsPackage
-from spack.build_systems.sip import SIPPackage
-from spack.build_systems.sourceforge import SourceforgePackage
-from spack.build_systems.sourceware import SourcewarePackage
-from spack.build_systems.waf import WafPackage
-from spack.build_systems.xorg import XorgPackage
 from spack.builder import BaseBuilder
 from spack.config import determine_number_of_jobs
 from spack.deptypes import ALL_TYPES as all_deptypes
@@ -158,6 +101,123 @@ class tty:
 cd = chdir
 pwd = getcwd
 
+
+class tty:
+    import llnl.util.tty as _tty
+
+    debug = _tty.debug
+    error = _tty.error
+    info = _tty.info
+    msg = _tty.msg
+    warn = _tty.warn
+
+
+__all__ = [
+    "chdir",
+    "environ",
+    "getcwd",
+    "makedirs",
+    "mkdir",
+    "remove",
+    "removedirs",
+    "move",
+    "rmtree",
+    "Dict",
+    "List",
+    "Optional",
+    "FileFilter",
+    "FileList",
+    "HeaderList",
+    "LibraryList",
+    "ancestor",
+    "can_access",
+    "change_sed_delimiter",
+    "copy",
+    "copy_tree",
+    "filter_file",
+    "find",
+    "find_all_headers",
+    "find_first",
+    "find_headers",
+    "find_libraries",
+    "find_system_libraries",
+    "force_remove",
+    "force_symlink",
+    "install",
+    "install_tree",
+    "is_exe",
+    "join_path",
+    "keep_modification_time",
+    "library_extensions",
+    "mkdirp",
+    "remove_directory_contents",
+    "remove_linked_tree",
+    "rename",
+    "set_executable",
+    "set_install_permissions",
+    "touch",
+    "working_dir",
+    "symlink",
+    "MakeExecutable",
+    "BaseBuilder",
+    "determine_number_of_jobs",
+    "all_deptypes",
+    "build_system",
+    "can_splice",
+    "conditional",
+    "conflicts",
+    "depends_on",
+    "extends",
+    "license",
+    "maintainers",
+    "patch",
+    "provides",
+    "redistribute",
+    "requires",
+    "resource",
+    "variant",
+    "version",
+    "InstallError",
+    "NoHeadersError",
+    "NoLibrariesError",
+    "SkipTest",
+    "cache_extra_test_sources",
+    "check_outputs",
+    "find_required_file",
+    "get_escaped_text_output",
+    "install_test_root",
+    "test_part",
+    "filter_compiler_wrappers",
+    "default_args",
+    "when",
+    "build_system_flags",
+    "env_flags",
+    "inject_flags",
+    "on_package_attributes",
+    "bash_completion_path",
+    "fish_completion_path",
+    "zsh_completion_path",
+    "run_after",
+    "run_before",
+    "Spec",
+    "EnvironmentModifications",
+    "Executable",
+    "ProcessError",
+    "which",
+    "which_string",
+    "fix_darwin_install_name",
+    "Prefix",
+    "any_combination_of",
+    "auto_or_any_combination_of",
+    "disjoint_sets",
+    "Version",
+    "ver",
+    "env",
+    "cd",
+    "pwd",
+    "tty",
+]
+
 # These are just here for editor support; they may be set when the build env is set up.
 configure: Executable
 make_jobs: int

lib/spack/spack/repo.py

@@ -79,6 +79,25 @@ def namespace_from_fullname(fullname: str) -> str:
     return fullname
 
 
+class _PrependFileLoader(importlib.machinery.SourceFileLoader):
+    def __init__(self, fullname: str, repo: "Repo", package_name: str) -> None:
+        self.repo = repo
+        self.package_name = package_name
+        path = repo.filename_for_package_name(package_name)
+        self.fullname = fullname
+        self.prepend = b"from spack.build_systems._package_api_v1 import *\n"
+        super().__init__(self.fullname, path)
+
+    def path_stats(self, path):
+        stats = dict(super().path_stats(path))
+        stats["size"] += len(self.prepend)
+        return stats
+
+    def get_data(self, path):
+        data = super().get_data(path)
+        return self.prepend + data if path == self.path else data
+
+
 class SpackNamespaceLoader:
     def create_module(self, spec):
         return SpackNamespace(spec.name)
@@ -125,8 +144,7 @@ def compute_loader(self, fullname: str):
                 # With 2 nested conditionals we can call "repo.real_name" only once
                 package_name = repo.real_name(module_name)
                 if package_name:
-                    module_path = repo.filename_for_package_name(package_name)
+                    return _PrependFileLoader(fullname, repo, package_name)
-                    return importlib.machinery.SourceFileLoader(fullname, module_path)
 
             # We are importing a full namespace like 'spack.pkg.builtin'
             if fullname == repo.full_namespace:

lib/spack/spack/test/audit.py

@@ -28,9 +28,6 @@
         (["invalid-selfhosted-gitlab-patch-url"], ["PKG-DIRECTIVES", "PKG-PROPERTIES"]),
         # This package has a stand-alone test method in build-time callbacks
         (["fail-test-audit"], ["PKG-PROPERTIES"]),
-        # This package implements and uses several deprecated stand-alone
-        # test methods
-        (["fail-test-audit-deprecated"], ["PKG-DEPRECATED-ATTRIBUTES"]),
         # This package has stand-alone test methods without non-trivial docstrings
         (["fail-test-audit-docstring"], ["PKG-PROPERTIES"]),
         # This package has a stand-alone test method without an implementation
@@ -54,6 +51,30 @@ def test_package_audits(packages, expected_errors, mock_packages):
         assert not actual_errors, msg
 
 
+@pytest.mark.parametrize(
+    "packages,expected_errors",
+    [
+        # This package implements and uses several deprecated stand-alone test methods
+        (["fail-test-audit-deprecated"], ["PKG-DEPRECATED-ATTRIBUTES"])
+    ],
+)
+@pytest.mark.xfail(
+    reason="inspect.getsource is not aware of package api v1 injected import statements"
+)
+def test_packge_audits_broken_by_magic_package_api_v1_injected_line(
+    packages, expected_errors, mock_packages
+):
+    reports = spack.audit.run_group("packages", pkgs=packages)
+
+    # Check that errors were reported only for the expected failure
+    actual_errors = [check for check, errors in reports if errors]
+    msg = "\n".join([str(e) for _, errors in reports for e in errors])
+    if expected_errors:
+        assert expected_errors == actual_errors, msg
+    else:
+        assert not actual_errors, msg
+
+
 # Data used in the test below to audit the double definition of a compiler
 _double_compiler_definition = [
     {

lib/spack/spack/test/data/conftest/diff-test/package-0.txt

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

lib/spack/spack/test/data/conftest/diff-test/package-1.txt

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

lib/spack/spack/test/data/conftest/diff-test/package-2.txt

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

lib/spack/spack/test/package_class.py

@@ -20,7 +20,6 @@
 import spack.deptypes as dt
 import spack.error
 import spack.install_test
-import spack.package
 import spack.package_base
 import spack.spec
 import spack.store
@@ -241,7 +240,7 @@ def test_cache_extra_sources_fails(install_mockery):
 def test_package_exes_and_libs():
     with pytest.raises(spack.error.SpackError, match="defines both"):
 
-        class BadDetectablePackage(spack.package.Package):
+        class BadDetectablePackage(spack.package_base.PackageBase):
             executables = ["findme"]
             libraries = ["libFindMe.a"]
 
@@ -249,7 +248,7 @@ class BadDetectablePackage(spack.package.Package):
 def test_package_url_and_urls():
     UrlsPackage = type(
         "URLsPackage",
-        (spack.package.Package,),
+        (spack.package_base.PackageBase,),
         {
             "__module__": "spack.pkg.builtin.urls_package",
             "url": "https://www.example.com/url-package-1.0.tgz",
@@ -265,7 +264,7 @@ def test_package_url_and_urls():
 def test_package_license():
     LicensedPackage = type(
         "LicensedPackage",
-        (spack.package.Package,),
+        (spack.package_base.PackageBase,),
         {"__module__": "spack.pkg.builtin.licensed_package"},
     )
 

lib/spack/spack/test/repo.py

@@ -440,7 +440,7 @@ def test_repo_v2_module_and_class_to_package_name(tmp_path: pathlib.Path, capsys
     (repo_dir / "packages" / "_1example_2_test").mkdir()
     (repo_dir / "packages" / "_1example_2_test" / "package.py").write_text(
         """
-from spack.package import Package
+from spack.build_systems.generic import Package
 
 class _1example2Test(Package):
     pass

share/spack/templates/mock-repository/package.pyt

@@ -1,3 +1,4 @@
+from spack.build_systems.generic import Package
 from spack.package import *
 
 class {{ cls_name }}(Package):

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage, generator
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import platform
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -8,6 +8,8 @@
 import re
 import shutil
 
+from spack.build_systems.generic import Package
+from spack.build_systems.sourceforge import SourceforgePackage
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -5,6 +5,7 @@
 
 import re
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import numbers
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 from ..boost.package import Boost

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

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
+from spack.build_systems.gnu import GNUMirrorPackage
 from spack.package import *
 
 

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.maven import MavenPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -5,6 +5,8 @@
 import os.path
 
 import spack.platforms
+from spack.build_systems.compiler import CompilerPackage
+from spack.build_systems.generic import Package
 from spack.package import *
 
 _os_map_before_23 = {

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -5,6 +5,7 @@
 import inspect
 import os
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 from ..openfoam import package as openfoam

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -5,7 +5,9 @@
 import os
 import sys
 
-from spack.build_systems.cmake import CMakeBuilder
+from spack.build_systems.cmake import CMakeBuilder, CMakePackage
+from spack.build_systems.cuda import CudaPackage
+from spack.build_systems.rocm import ROCmPackage
 from spack.package import *
 
 IS_WINDOWS = sys.platform == "win32"

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
 from spack.package import *
 
 

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

@@ -1,6 +1,7 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 from ..boost.package import Boost

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -5,6 +5,7 @@
 import os
 import sys
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
 from spack.package import *
 
 

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

@@ -4,6 +4,8 @@
 import os
 
 import spack.build_systems.makefile
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -5,6 +5,14 @@
 import os
 
 import spack.platforms.cray
+from spack.build_systems.cached_cmake import (
+    CachedCMakePackage,
+    cmake_cache_option,
+    cmake_cache_path,
+    cmake_cache_string,
+)
+from spack.build_systems.cuda import CudaPackage
+from spack.build_systems.rocm import ROCmPackage
 from spack.package import *
 
 

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

@@ -5,6 +5,8 @@
 import os
 import shutil
 
+from spack.build_systems.cuda import CudaPackage
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.bundle import BundlePackage
 from spack.package import *
 
 

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

@@ -5,6 +5,7 @@
 
 import spack.build_systems.autotools
 import spack.build_systems.cmake
+from spack.build_systems.cmake import CMakePackage, generator
 from spack.package import *
 
 from ..libflame.package import LibflameBase

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.scons import SConsPackage
 from spack.package import *
 
 

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,9 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
+from spack.build_systems.rocm import ROCmPackage
 from spack.package import *
 
 

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

@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -1,6 +1,7 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 from ..boost.package import Boost

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,9 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
+from spack.build_systems.rocm import ROCmPackage
 from spack.package import *
 
 

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

@@ -4,6 +4,9 @@
 
 import os
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
+from spack.build_systems.rocm import ROCmPackage
 from spack.package import *
 
 

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.cmake import CMakePackage
+from spack.build_systems.cuda import CudaPackage
 from spack.package import *
 
 

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

@@ -5,6 +5,7 @@
 import platform
 from os.path import split
 
+from spack.build_systems.generic import Package
 from spack.package import *
 
 

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

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.build_systems.autotools import AutotoolsPackage
 from spack.package import *
 
 

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

@@ -1,6 +1,7 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
+from spack.build_systems.makefile import MakefilePackage
 from spack.package import *
 
 

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

@@ -4,6 +4,7 @@
 
 import os
 
+from spack.build_systems.generic import Package
 from spack.package import *