Add missing & remove redundant imports (#46407)

This commit is contained in:
Harmen Stoppels
2024-09-16 12:54:16 +02:00
committed by GitHub
parent ef0e54726d
commit 55e0ef1e64
111 changed files with 14 additions and 189 deletions

View File

@@ -53,7 +53,6 @@ def _search_duplicate_compilers(error_cls):
import spack.config import spack.config
import spack.patch import spack.patch
import spack.paths
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.util.crypto import spack.util.crypto

View File

@@ -33,7 +33,6 @@
from llnl.util.symlink import readlink from llnl.util.symlink import readlink
import spack.caches import spack.caches
import spack.cmd
import spack.config as config import spack.config as config
import spack.database as spack_db import spack.database as spack_db
import spack.error import spack.error
@@ -47,7 +46,6 @@
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.relocate as relocate import spack.relocate as relocate
import spack.repo
import spack.spec import spack.spec
import spack.stage import spack.stage
import spack.store import spack.store

View File

@@ -37,16 +37,10 @@
import spack.binary_distribution import spack.binary_distribution
import spack.config import spack.config
import spack.detection import spack.detection
import spack.environment
import spack.modules
import spack.paths
import spack.platforms import spack.platforms
import spack.platforms.linux
import spack.repo
import spack.spec import spack.spec
import spack.store import spack.store
import spack.user_environment import spack.user_environment
import spack.util.environment
import spack.util.executable import spack.util.executable
import spack.util.path import spack.util.path
import spack.util.spack_yaml import spack.util.spack_yaml

View File

@@ -15,8 +15,6 @@
import spack.environment import spack.environment
import spack.tengine import spack.tengine
import spack.util.cpus
import spack.util.executable
from ._common import _root_spec from ._common import _root_spec
from .config import root_path, spec_for_current_python, store_path from .config import root_path, spec_for_current_python, store_path

View File

@@ -65,16 +65,12 @@
import spack.package_base import spack.package_base
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.repo
import spack.schema.environment import spack.schema.environment
import spack.spec import spack.spec
import spack.stage import spack.stage
import spack.store import spack.store
import spack.subprocess_context import spack.subprocess_context
import spack.user_environment
import spack.util.executable import spack.util.executable
import spack.util.path
import spack.util.pattern
from spack import traverse from spack import traverse
from spack.context import Context from spack.context import Context
from spack.error import NoHeadersError, NoLibrariesError from spack.error import NoHeadersError, NoLibrariesError

View File

@@ -11,7 +11,6 @@
from llnl.util.filesystem import mkdirp from llnl.util.filesystem import mkdirp
import spack.config import spack.config
import spack.error
import spack.fetch_strategy import spack.fetch_strategy
import spack.paths import spack.paths
import spack.util.file_cache import spack.util.file_cache

View File

@@ -38,7 +38,6 @@
import spack.paths import spack.paths
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.stage
import spack.util.git import spack.util.git
import spack.util.gpg as gpg_util import spack.util.gpg as gpg_util
import spack.util.spack_yaml as syaml import spack.util.spack_yaml as syaml

View File

@@ -16,7 +16,6 @@
import spack.bootstrap.config import spack.bootstrap.config
import spack.bootstrap.core import spack.bootstrap.core
import spack.config import spack.config
import spack.main
import spack.mirror import spack.mirror
import spack.spec import spack.spec
import spack.stage import spack.stage

View File

@@ -23,14 +23,9 @@
import spack.error import spack.error
import spack.mirror import spack.mirror
import spack.oci.oci import spack.oci.oci
import spack.oci.opener
import spack.relocate
import spack.repo
import spack.spec import spack.spec
import spack.stage import spack.stage
import spack.store import spack.store
import spack.user_environment
import spack.util.crypto
import spack.util.parallel import spack.util.parallel
import spack.util.url as url_util import spack.util.url as url_util
import spack.util.web as web_util import spack.util.web as web_util

View File

@@ -15,7 +15,6 @@
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.stage import spack.stage
import spack.util.crypto
import spack.util.web as web_util import spack.util.web as web_util
from spack.cmd.common import arguments from spack.cmd.common import arguments
from spack.package_base import ( from spack.package_base import (

View File

@@ -19,7 +19,6 @@
import spack.cmd.buildcache as buildcache import spack.cmd.buildcache as buildcache
import spack.config as cfg import spack.config as cfg
import spack.environment as ev import spack.environment as ev
import spack.environment.depfile
import spack.hash_types as ht import spack.hash_types as ht
import spack.mirror import spack.mirror
import spack.util.gpg as gpg_util import spack.util.gpg as gpg_util

View File

@@ -10,11 +10,8 @@
import llnl.util.filesystem import llnl.util.filesystem
import llnl.util.tty as tty import llnl.util.tty as tty
import spack.bootstrap
import spack.caches import spack.caches
import spack.cmd.test
import spack.config import spack.config
import spack.repo
import spack.stage import spack.stage
import spack.store import spack.store
import spack.util.path import spack.util.path

View File

@@ -15,7 +15,6 @@
import spack.deptypes as dt import spack.deptypes as dt
import spack.environment as ev import spack.environment as ev
import spack.mirror import spack.mirror
import spack.modules
import spack.reporters import spack.reporters
import spack.spec import spack.spec
import spack.store import spack.store

View File

@@ -10,7 +10,6 @@
import spack.cmd import spack.cmd
import spack.deptypes as dt import spack.deptypes as dt
import spack.error import spack.error
import spack.paths
import spack.spec import spack.spec
import spack.store import spack.store
from spack import build_environment, traverse from spack import build_environment, traverse

View File

@@ -13,9 +13,7 @@
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.repo
import spack.schema.env import spack.schema.env
import spack.schema.packages
import spack.store import spack.store
import spack.util.spack_yaml as syaml import spack.util.spack_yaml as syaml
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -13,7 +13,6 @@
import spack.repo import spack.repo
import spack.stage import spack.stage
import spack.util.web
from spack.spec import Spec from spack.spec import Spec
from spack.url import ( from spack.url import (
UndetectableNameError, UndetectableNameError,

View File

@@ -14,7 +14,6 @@
from llnl.util.filesystem import working_dir from llnl.util.filesystem import working_dir
import spack import spack
import spack.config
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.util.git import spack.util.git

View File

@@ -11,7 +11,6 @@
import spack.cmd import spack.cmd
import spack.environment as ev import spack.environment as ev
import spack.package_base import spack.package_base
import spack.repo
import spack.store import spack.store
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -10,7 +10,6 @@
import spack.cmd import spack.cmd
import spack.config import spack.config
import spack.fetch_strategy import spack.fetch_strategy
import spack.package_base
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.stage import spack.stage

View File

@@ -12,7 +12,6 @@
import spack.cmd import spack.cmd
import spack.environment as ev import spack.environment as ev
import spack.solver.asp as asp import spack.solver.asp as asp
import spack.util.environment
import spack.util.spack_json as sjson import spack.util.spack_json as sjson
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -21,15 +21,11 @@
import spack.cmd import spack.cmd
import spack.cmd.common import spack.cmd.common
import spack.cmd.common.arguments import spack.cmd.common.arguments
import spack.cmd.install
import spack.cmd.modules import spack.cmd.modules
import spack.cmd.uninstall
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.environment.depfile as depfile import spack.environment.depfile as depfile
import spack.environment.shell import spack.environment.shell
import spack.schema.env
import spack.spec
import spack.tengine import spack.tengine
from spack.cmd.common import arguments from spack.cmd.common import arguments
from spack.util.environment import EnvironmentModifications from spack.util.environment import EnvironmentModifications

View File

@@ -20,7 +20,6 @@
import spack.error import spack.error
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.util.environment
from spack.cmd.common import arguments from spack.cmd.common import arguments
description = "manage external packages in Spack configuration" description = "manage external packages in Spack configuration"

View File

@@ -8,7 +8,6 @@
import spack.cmd import spack.cmd
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.repo
import spack.traverse import spack.traverse
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -10,7 +10,6 @@
import llnl.util.tty as tty import llnl.util.tty as tty
import llnl.util.tty.color as color import llnl.util.tty.color as color
import spack.bootstrap
import spack.cmd as cmd import spack.cmd as cmd
import spack.environment as ev import spack.environment as ev
import spack.repo import spack.repo

View File

@@ -17,8 +17,6 @@
import spack.cmd import spack.cmd
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.fetch_strategy
import spack.package_base
import spack.paths import spack.paths
import spack.report import spack.report
import spack.spec import spack.spec

View File

@@ -6,11 +6,9 @@
import sys import sys
import spack.cmd import spack.cmd
import spack.cmd.find
import spack.environment as ev import spack.environment as ev
import spack.store import spack.store
import spack.user_environment as uenv import spack.user_environment as uenv
import spack.util.environment
from spack.cmd.common import arguments from spack.cmd.common import arguments
description = "add package to the user environment" description = "add package to the user environment"

View File

@@ -8,9 +8,6 @@
from llnl.util import tty from llnl.util import tty
import spack.cmd import spack.cmd
import spack.error
import spack.package_base
import spack.repo
import spack.store import spack.store
from spack.cmd.common import arguments from spack.cmd.common import arguments
from spack.database import InstallStatuses from spack.database import InstallStatuses

View File

@@ -17,7 +17,6 @@
import spack.mirror import spack.mirror
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.util.path
import spack.util.web as web_util import spack.util.web as web_util
from spack.cmd.common import arguments from spack.cmd.common import arguments
from spack.error import SpackError from spack.error import SpackError

View File

@@ -9,7 +9,6 @@
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.package_base import spack.package_base
import spack.repo
import spack.traverse import spack.traverse
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -12,7 +12,6 @@
from llnl.util.tty.colify import colify from llnl.util.tty.colify import colify
import spack.cmd import spack.cmd
import spack.paths
import spack.repo import spack.repo
import spack.util.executable as exe import spack.util.executable as exe
import spack.util.package_hash as ph import spack.util.package_hash as ph

View File

@@ -6,7 +6,6 @@
import llnl.util.tty as tty import llnl.util.tty as tty
import spack.cmd import spack.cmd
import spack.repo
from spack.cmd.common import arguments from spack.cmd.common import arguments
description = "revert checked out package source code" description = "revert checked out package source code"

View File

@@ -15,7 +15,6 @@
import spack.config import spack.config
import spack.environment import spack.environment
import spack.hash_types as ht import spack.hash_types as ht
import spack.package_base
import spack.solver.asp as asp import spack.solver.asp as asp
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -11,8 +11,6 @@
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.package_base import spack.package_base
import spack.repo
import spack.stage
import spack.traverse import spack.traverse
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -10,7 +10,6 @@
import llnl.util.tty.colify as colify import llnl.util.tty.colify as colify
import spack.repo import spack.repo
import spack.store
import spack.tag import spack.tag
description = "show package tags and associated packages" description = "show package tags and associated packages"

View File

@@ -17,7 +17,6 @@
import spack.cmd import spack.cmd
import spack.environment as ev import spack.environment as ev
import spack.install_test import spack.install_test
import spack.package_base
import spack.repo import spack.repo
import spack.report import spack.report
from spack.cmd.common import arguments from spack.cmd.common import arguments

View File

@@ -9,7 +9,6 @@
import spack.cmd import spack.cmd
import spack.error import spack.error
import spack.user_environment as uenv import spack.user_environment as uenv
import spack.util.environment
from spack.cmd.common import arguments from spack.cmd.common import arguments
description = "remove package from the user environment" description = "remove package from the user environment"

View File

@@ -25,7 +25,6 @@
import spack.platforms import spack.platforms
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.version
from spack.operating_systems import windows_os from spack.operating_systems import windows_os
from spack.util.environment import get_path from spack.util.environment import get_path
from spack.util.naming import mod_to_class from spack.util.naming import mod_to_class

View File

@@ -8,7 +8,6 @@
import spack.compiler import spack.compiler
import spack.compilers.clang import spack.compilers.clang
import spack.util.executable
from spack.version import Version from spack.version import Version

View File

@@ -8,16 +8,8 @@
from contextlib import contextmanager from contextlib import contextmanager
from itertools import chain from itertools import chain
import spack.compilers
import spack.config import spack.config
import spack.environment
import spack.error import spack.error
import spack.platforms
import spack.repo
import spack.spec
import spack.target
import spack.tengine
import spack.util.path
CHECK_COMPILER_EXISTENCE = True CHECK_COMPILER_EXISTENCE = True

View File

@@ -40,10 +40,8 @@ class OpenMpi(Package):
import llnl.util.tty.color import llnl.util.tty.color
import spack.deptypes as dt import spack.deptypes as dt
import spack.error
import spack.patch import spack.patch
import spack.spec import spack.spec
import spack.url
import spack.util.crypto import spack.util.crypto
import spack.variant import spack.variant
from spack.dependency import Dependency from spack.dependency import Dependency

View File

@@ -46,7 +46,6 @@
import spack.config import spack.config
import spack.error import spack.error
import spack.oci.opener import spack.oci.opener
import spack.url
import spack.util.archive import spack.util.archive
import spack.util.crypto as crypto import spack.util.crypto as crypto
import spack.util.git import spack.util.git

View File

@@ -17,12 +17,21 @@
import llnl.util.filesystem as fs import llnl.util.filesystem as fs
import llnl.util.tty as tty import llnl.util.tty as tty
import llnl.util.tty.log
from llnl.string import plural from llnl.string import plural
from llnl.util.lang import nullcontext from llnl.util.lang import nullcontext
from llnl.util.tty.color import colorize from llnl.util.tty.color import colorize
import spack.build_environment
import spack.builder
import spack.config
import spack.error import spack.error
import spack.package_base
import spack.paths import spack.paths
import spack.repo
import spack.spec
import spack.util.executable
import spack.util.path
import spack.util.spack_json as sjson import spack.util.spack_json as sjson
from spack.installer import InstallError from spack.installer import InstallError
from spack.spec import Spec from spack.spec import Spec
@@ -42,7 +51,7 @@
ListOrStringType = Union[str, List[str]] ListOrStringType = Union[str, List[str]]
LogType = Union["tty.log.nixlog", "tty.log.winlog"] LogType = Union[llnl.util.tty.log.nixlog, llnl.util.tty.log.winlog]
Pb = TypeVar("Pb", bound="spack.package_base.PackageBase") Pb = TypeVar("Pb", bound="spack.package_base.PackageBase")
PackageObjectOrClass = Union[Pb, Type[Pb]] PackageObjectOrClass = Union[Pb, Type[Pb]]
@@ -280,7 +289,7 @@ def __init__(self, pkg: Pb):
def logger(self) -> Optional[LogType]: def logger(self) -> Optional[LogType]:
"""The current logger or, if none, sets to one.""" """The current logger or, if none, sets to one."""
if not self._logger: if not self._logger:
self._logger = tty.log.log_output(self.test_log_file) self._logger = llnl.util.tty.log.log_output(self.test_log_file)
return self._logger return self._logger
@@ -297,7 +306,7 @@ def test_logger(self, verbose: bool = False, externals: bool = False):
fs.touch(self.test_log_file) # Otherwise log_parse complains fs.touch(self.test_log_file) # Otherwise log_parse complains
fs.set_install_permissions(self.test_log_file) fs.set_install_permissions(self.test_log_file)
with tty.log.log_output(self.test_log_file, verbose) as self._logger: with llnl.util.tty.log.log_output(self.test_log_file, verbose) as self._logger:
with self.logger.force_echo(): # type: ignore[union-attr] with self.logger.force_echo(): # type: ignore[union-attr]
tty.msg("Testing package " + colorize(r"@*g{" + self.pkg_id + r"}")) tty.msg("Testing package " + colorize(r"@*g{" + self.pkg_id + r"}"))

View File

@@ -48,7 +48,6 @@
import spack.binary_distribution as binary_distribution import spack.binary_distribution as binary_distribution
import spack.build_environment import spack.build_environment
import spack.compilers
import spack.config import spack.config
import spack.database import spack.database
import spack.deptypes as dt import spack.deptypes as dt

View File

@@ -40,7 +40,6 @@
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.repo import spack.repo
import spack.solver.asp
import spack.spec import spack.spec
import spack.store import spack.store
import spack.util.debug import spack.util.debug

View File

@@ -15,16 +15,10 @@
import llnl.util.tty as tty import llnl.util.tty as tty
import spack.config
import spack.error
import spack.fetch_strategy import spack.fetch_strategy
import spack.mirror import spack.mirror
import spack.oci.opener import spack.oci.opener
import spack.repo
import spack.spec
import spack.stage import spack.stage
import spack.traverse
import spack.util.crypto
import spack.util.url import spack.util.url
from .image import Digest, ImageReference from .image import Digest, ImageReference

View File

@@ -22,7 +22,6 @@
import spack.config import spack.config
import spack.mirror import spack.mirror
import spack.parser import spack.parser
import spack.repo
import spack.util.web import spack.util.web
from .image import ImageReference from .image import ImageReference

View File

@@ -38,16 +38,13 @@
import spack.dependency import spack.dependency
import spack.deptypes as dt import spack.deptypes as dt
import spack.directives import spack.directives
import spack.directory_layout
import spack.environment import spack.environment
import spack.error import spack.error
import spack.fetch_strategy as fs import spack.fetch_strategy as fs
import spack.hooks import spack.hooks
import spack.mirror import spack.mirror
import spack.mixins
import spack.multimethod import spack.multimethod
import spack.patch import spack.patch
import spack.paths
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.store import spack.store

View File

@@ -17,15 +17,11 @@
from llnl.util.lang import memoized from llnl.util.lang import memoized
from llnl.util.symlink import readlink, symlink from llnl.util.symlink import readlink, symlink
import spack.paths
import spack.platforms import spack.platforms
import spack.repo
import spack.spec
import spack.store import spack.store
import spack.util.elf as elf import spack.util.elf as elf
import spack.util.executable as executable import spack.util.executable as executable
import spack.util.filesystem as ssys import spack.util.filesystem as ssys
import spack.util.path
from .relocate_text import BinaryFilePrefixReplacer, TextFilePrefixReplacer from .relocate_text import BinaryFilePrefixReplacer, TextFilePrefixReplacer

View File

@@ -41,7 +41,6 @@
import spack.provider_index import spack.provider_index
import spack.spec import spack.spec
import spack.tag import spack.tag
import spack.util.file_cache
import spack.util.git import spack.util.git
import spack.util.naming as nm import spack.util.naming as nm
import spack.util.path import spack.util.path

View File

@@ -15,7 +15,6 @@
import llnl.util.lang import llnl.util.lang
import spack.build_environment import spack.build_environment
import spack.fetch_strategy
import spack.install_test import spack.install_test
import spack.installer import spack.installer
import spack.package_base import spack.package_base

View File

@@ -20,9 +20,6 @@
from llnl.util.filesystem import working_dir from llnl.util.filesystem import working_dir
import spack import spack
import spack.build_environment
import spack.fetch_strategy
import spack.package_base
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.util.git import spack.util.git

View File

@@ -14,9 +14,7 @@
import spack.binary_distribution as bindist import spack.binary_distribution as bindist
import spack.error import spack.error
import spack.hooks import spack.hooks
import spack.paths
import spack.relocate as relocate import spack.relocate as relocate
import spack.stage
import spack.store import spack.store

View File

@@ -14,7 +14,6 @@
import spack.schema.gitlab_ci # DEPRECATED import spack.schema.gitlab_ci # DEPRECATED
import spack.schema.merged import spack.schema.merged
import spack.schema.projections
from .spec_list import spec_list_schema from .spec_list import spec_list_schema

View File

@@ -27,7 +27,6 @@
import spack import spack
import spack.binary_distribution import spack.binary_distribution
import spack.cmd
import spack.compilers import spack.compilers
import spack.config import spack.config
import spack.config as sc import spack.config as sc
@@ -36,13 +35,11 @@
import spack.error import spack.error
import spack.package_base import spack.package_base
import spack.package_prefs import spack.package_prefs
import spack.parser
import spack.platforms import spack.platforms
import spack.repo import spack.repo
import spack.spec import spack.spec
import spack.store import spack.store
import spack.util.crypto import spack.util.crypto
import spack.util.elf
import spack.util.libc import spack.util.libc
import spack.util.path import spack.util.path
import spack.util.timer import spack.util.timer

View File

@@ -84,7 +84,6 @@
import spack.store import spack.store
import spack.target import spack.target
import spack.traverse as traverse import spack.traverse as traverse
import spack.util.crypto
import spack.util.executable import spack.util.executable
import spack.util.hash import spack.util.hash
import spack.util.module_cmd as md import spack.util.module_cmd as md

View File

@@ -36,7 +36,6 @@
import spack.error import spack.error
import spack.fetch_strategy as fs import spack.fetch_strategy as fs
import spack.mirror import spack.mirror
import spack.paths
import spack.resource import spack.resource
import spack.spec import spack.spec
import spack.util.crypto import spack.util.crypto

View File

@@ -32,7 +32,6 @@
import spack.hooks.sbang as sbang import spack.hooks.sbang as sbang
import spack.main import spack.main
import spack.mirror import spack.mirror
import spack.repo
import spack.store import spack.store
import spack.util.gpg import spack.util.gpg
import spack.util.spack_yaml as syaml import spack.util.spack_yaml as syaml

View File

@@ -9,10 +9,8 @@
import pytest import pytest
import spack.binary_distribution as bd import spack.binary_distribution as bd
import spack.main
import spack.mirror import spack.mirror
import spack.spec import spack.spec
import spack.util.url
pytestmark = pytest.mark.not_on_windows("does not run on windows") pytestmark = pytest.mark.not_on_windows("does not run on windows")

View File

@@ -17,7 +17,6 @@
import spack.build_systems.cmake import spack.build_systems.cmake
import spack.environment import spack.environment
import spack.platforms import spack.platforms
import spack.repo
from spack.build_environment import ChildError, setup_package from spack.build_environment import ChildError, setup_package
from spack.spec import Spec from spack.spec import Spec
from spack.util.executable import which from spack.util.executable import which

View File

@@ -13,7 +13,6 @@
import spack.build_environment import spack.build_environment
import spack.config import spack.config
import spack.spec
from spack.paths import build_env_path from spack.paths import build_env_path
from spack.util.environment import SYSTEM_DIR_CASE_ENTRY, set_env from spack.util.environment import SYSTEM_DIR_CASE_ENTRY, set_env
from spack.util.executable import Executable, ProcessError from spack.util.executable import Executable, ProcessError

View File

@@ -10,12 +10,10 @@
import llnl.util.filesystem as fs import llnl.util.filesystem as fs
import spack.ci as ci import spack.ci as ci
import spack.config
import spack.environment as ev import spack.environment as ev
import spack.error import spack.error
import spack.paths as spack_paths import spack.paths as spack_paths
import spack.util.git import spack.util.git
import spack.util.gpg
@pytest.fixture @pytest.fixture

View File

@@ -9,7 +9,6 @@
from llnl.util.filesystem import working_dir from llnl.util.filesystem import working_dir
import spack.cmd
import spack.paths import spack.paths
import spack.util.spack_json as sjson import spack.util.spack_json as sjson
from spack.main import SpackCommand from spack.main import SpackCommand

View File

@@ -13,7 +13,6 @@
import spack.binary_distribution import spack.binary_distribution
import spack.cmd.buildcache import spack.cmd.buildcache
import spack.deptypes
import spack.environment as ev import spack.environment as ev
import spack.error import spack.error
import spack.main import spack.main

View File

@@ -18,13 +18,11 @@
import spack.binary_distribution import spack.binary_distribution
import spack.ci as ci import spack.ci as ci
import spack.cmd.ci import spack.cmd.ci
import spack.config
import spack.environment as ev import spack.environment as ev
import spack.hash_types as ht import spack.hash_types as ht
import spack.main import spack.main
import spack.paths as spack_paths import spack.paths as spack_paths
import spack.repo as repo import spack.repo as repo
import spack.util.gpg
import spack.util.spack_yaml as syaml import spack.util.spack_yaml as syaml
from spack.cmd.ci import FAILED_CREATE_BUILDCACHE_CODE from spack.cmd.ci import FAILED_CREATE_BUILDCACHE_CODE
from spack.schema.buildcache_spec import schema as specfile_schema from spack.schema.buildcache_spec import schema as specfile_schema

View File

@@ -9,7 +9,6 @@
import pytest import pytest
import spack.cmd.create import spack.cmd.create
import spack.util.editor
from spack.main import SpackCommand from spack.main import SpackCommand
from spack.url import UndetectableNameError from spack.url import UndetectableNameError
from spack.util.executable import which from spack.util.executable import which

View File

@@ -10,7 +10,6 @@
import pytest import pytest
import spack import spack
import spack.config
import spack.platforms import spack.platforms
from spack.main import SpackCommand from spack.main import SpackCommand
from spack.util.executable import which from spack.util.executable import which

View File

@@ -9,7 +9,6 @@
import llnl.util.filesystem as fs import llnl.util.filesystem as fs
import spack.build_environment
import spack.environment as ev import spack.environment as ev
import spack.error import spack.error
import spack.spec import spack.spec

View File

@@ -6,9 +6,7 @@
import pytest import pytest
import spack.cmd.diff import spack.cmd.diff
import spack.config
import spack.main import spack.main
import spack.store
import spack.util.spack_json as sjson import spack.util.spack_json as sjson
from spack.test.conftest import create_test_repo from spack.test.conftest import create_test_repo

View File

@@ -5,7 +5,6 @@
import os import os
import spack.paths
import spack.repo import spack.repo
import spack.util.editor import spack.util.editor
from spack.build_systems import autotools, cmake from spack.build_systems import autotools, cmake

View File

@@ -9,7 +9,6 @@
import llnl.util.filesystem as fs import llnl.util.filesystem as fs
import spack.bootstrap
import spack.util.executable import spack.util.executable
import spack.util.gpg import spack.util.gpg
from spack.main import SpackCommand from spack.main import SpackCommand

View File

@@ -24,7 +24,6 @@
import spack.hash_types as ht import spack.hash_types as ht
import spack.package_base import spack.package_base
import spack.store import spack.store
import spack.util.executable
from spack.error import SpackError from spack.error import SpackError
from spack.main import SpackCommand from spack.main import SpackCommand
from spack.parser import SpecSyntaxError from spack.parser import SpecSyntaxError

View File

@@ -10,7 +10,6 @@
import spack.spec import spack.spec
import spack.user_environment as uenv import spack.user_environment as uenv
import spack.util.environment
from spack.main import SpackCommand from spack.main import SpackCommand
load = SpackCommand("load") load = SpackCommand("load")

View File

@@ -10,8 +10,6 @@
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.package_base import spack.package_base
import spack.repo
import spack.stage
import spack.traverse import spack.traverse
from spack.main import SpackCommand, SpackCommandError from spack.main import SpackCommand, SpackCommandError
from spack.version import Version from spack.version import Version

View File

@@ -11,14 +11,11 @@
from llnl.util.filesystem import copy_tree from llnl.util.filesystem import copy_tree
import spack.cmd.common.arguments import spack.cmd.common.arguments
import spack.cmd.install
import spack.cmd.test import spack.cmd.test
import spack.config import spack.config
import spack.install_test import spack.install_test
import spack.package_base
import spack.paths import spack.paths
import spack.spec import spack.spec
import spack.store
from spack.install_test import TestStatus from spack.install_test import TestStatus
from spack.main import SpackCommand from spack.main import SpackCommand

View File

@@ -13,7 +13,6 @@
import spack.compiler import spack.compiler
import spack.compilers import spack.compilers
import spack.spec import spack.spec
import spack.util.environment
import spack.util.module_cmd import spack.util.module_cmd
from spack.compiler import Compiler from spack.compiler import Compiler
from spack.util.executable import Executable, ProcessError from spack.util.executable import Executable, ProcessError

View File

@@ -28,7 +28,6 @@
import spack.solver.version_order import spack.solver.version_order
import spack.store import spack.store
import spack.util.file_cache import spack.util.file_cache
import spack.util.libc
import spack.variant as vt import spack.variant as vt
from spack.concretize import find_spec from spack.concretize import find_spec
from spack.spec import CompilerSpec, Spec from spack.spec import CompilerSpec, Spec

View File

@@ -7,7 +7,6 @@
import pytest import pytest
import spack.build_systems.generic
import spack.config import spack.config
import spack.error import spack.error
import spack.package_base import spack.package_base

View File

@@ -18,8 +18,6 @@
import spack.config import spack.config
import spack.directory_layout import spack.directory_layout
import spack.environment as ev import spack.environment as ev
import spack.fetch_strategy
import spack.main
import spack.package_base import spack.package_base
import spack.paths import spack.paths
import spack.repo import spack.repo
@@ -27,7 +25,6 @@
import spack.schema.config import spack.schema.config
import spack.schema.env import spack.schema.env
import spack.schema.mirrors import spack.schema.mirrors
import spack.schema.packages
import spack.schema.repos import spack.schema.repos
import spack.store import spack.store
import spack.util.path as spack_path import spack.util.path as spack_path

View File

@@ -35,16 +35,12 @@
import spack.binary_distribution import spack.binary_distribution
import spack.bootstrap.core import spack.bootstrap.core
import spack.caches import spack.caches
import spack.cmd.buildcache
import spack.compiler import spack.compiler
import spack.compilers import spack.compilers
import spack.config import spack.config
import spack.database
import spack.directory_layout
import spack.environment as ev import spack.environment as ev
import spack.error import spack.error
import spack.package_base import spack.package_base
import spack.package_prefs
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.repo import spack.repo
@@ -52,7 +48,6 @@
import spack.stage import spack.stage
import spack.store import spack.store
import spack.subprocess_context import spack.subprocess_context
import spack.test.cray_manifest
import spack.util.executable import spack.util.executable
import spack.util.git import spack.util.git
import spack.util.gpg import spack.util.gpg

View File

@@ -8,7 +8,6 @@
import spack.container.images import spack.container.images
import spack.main import spack.main
import spack.platforms
containerize = spack.main.SpackCommand("containerize") containerize = spack.main.SpackCommand("containerize")

View File

@@ -18,7 +18,6 @@
import spack.cmd import spack.cmd
import spack.cmd.external import spack.cmd.external
import spack.compilers import spack.compilers
import spack.config
import spack.cray_manifest as cray_manifest import spack.cray_manifest as cray_manifest
import spack.solver.asp import spack.solver.asp
import spack.spec import spack.spec

View File

@@ -8,7 +8,6 @@
import pytest import pytest
import spack.build_environment import spack.build_environment
import spack.repo
import spack.spec import spack.spec
from spack.package import build_system_flags, env_flags, inject_flags from spack.package import build_system_flags, env_flags, inject_flags

View File

@@ -4,14 +4,10 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import pytest import pytest
import spack.build_systems.generic
import spack.config import spack.config
import spack.environment as ev import spack.environment as ev
import spack.error
import spack.package_base
import spack.repo import spack.repo
import spack.util.spack_yaml as syaml import spack.util.spack_yaml as syaml
import spack.version
from spack.spec import Spec from spack.spec import Spec
from spack.test.conftest import create_test_repo from spack.test.conftest import create_test_repo

View File

@@ -3,8 +3,6 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import spack.config
import spack.error
import spack.fetch_strategy import spack.fetch_strategy
import spack.stage import spack.stage

View File

@@ -5,7 +5,6 @@
import io import io
import spack.graph import spack.graph
import spack.repo
import spack.spec import spack.spec

View File

@@ -10,7 +10,6 @@
from llnl.util.filesystem import mkdirp, touch, working_dir from llnl.util.filesystem import mkdirp, touch, working_dir
import spack.config import spack.config
import spack.repo
from spack.fetch_strategy import HgFetchStrategy from spack.fetch_strategy import HgFetchStrategy
from spack.spec import Spec from spack.spec import Spec
from spack.stage import Stage from spack.stage import Stage

View File

@@ -17,9 +17,6 @@
import llnl.util.tty as tty import llnl.util.tty as tty
import spack.binary_distribution import spack.binary_distribution
import spack.compilers
import spack.concretize
import spack.config
import spack.database import spack.database
import spack.deptypes as dt import spack.deptypes as dt
import spack.installer as inst import spack.installer as inst
@@ -29,7 +26,6 @@
import spack.spec import spack.spec
import spack.store import spack.store
import spack.util.lock as lk import spack.util.lock as lk
import spack.version
def _mock_repo(root, namespace): def _mock_repo(root, namespace):

View File

@@ -15,7 +15,6 @@
import spack.fetch_strategy import spack.fetch_strategy
import spack.mirror import spack.mirror
import spack.patch import spack.patch
import spack.repo
import spack.stage import spack.stage
import spack.util.executable import spack.util.executable
import spack.util.spack_json as sjson import spack.util.spack_json as sjson

View File

@@ -14,7 +14,6 @@
import spack.error import spack.error
import spack.modules.tcl import spack.modules.tcl
import spack.package_base import spack.package_base
import spack.schema.modules
import spack.spec import spack.spec
from spack.modules.common import UpstreamModuleIndex from spack.modules.common import UpstreamModuleIndex
from spack.spec import Spec from spack.spec import Spec

View File

@@ -6,11 +6,7 @@
import pytest import pytest
import spack.config
import spack.modules.common
import spack.paths
import spack.spec import spack.spec
import spack.util.path
@pytest.fixture() @pytest.fixture()

View File

@@ -8,7 +8,6 @@
import pytest import pytest
import spack.platforms import spack.platforms
import spack.repo
import spack.spec import spack.spec
from spack.multimethod import NoSuchMethodError from spack.multimethod import NoSuchMethodError

View File

@@ -17,7 +17,6 @@
import pytest import pytest
import spack.binary_distribution import spack.binary_distribution
import spack.cmd.buildcache
import spack.database import spack.database
import spack.environment as ev import spack.environment as ev
import spack.error import spack.error

View File

@@ -24,8 +24,6 @@
import spack.error import spack.error
import spack.fetch_strategy import spack.fetch_strategy
import spack.package_base import spack.package_base
import spack.repo
import spack.store
import spack.util.gpg import spack.util.gpg
import spack.util.url as url_util import spack.util.url as url_util
from spack.fetch_strategy import URLFetchStrategy from spack.fetch_strategy import URLFetchStrategy

View File

@@ -17,7 +17,6 @@
import spack.patch import spack.patch
import spack.paths import spack.paths
import spack.repo import spack.repo
import spack.util.compression
import spack.util.url as url_util import spack.util.url as url_util
from spack.spec import Spec from spack.spec import Spec
from spack.stage import Stage from spack.stage import Stage

View File

@@ -9,14 +9,9 @@
import pytest import pytest
import spack.concretize
import spack.paths
import spack.platforms import spack.platforms
import spack.relocate import spack.relocate
import spack.relocate_text as relocate_text import spack.relocate_text as relocate_text
import spack.spec
import spack.store
import spack.tengine
import spack.util.executable import spack.util.executable
pytestmark = pytest.mark.not_on_windows("Tests fail on Windows") pytestmark = pytest.mark.not_on_windows("Tests fail on Windows")

View File

@@ -10,7 +10,6 @@
import llnl.util.tty as tty import llnl.util.tty as tty
import spack.reporters.extract import spack.reporters.extract
import spack.spec
from spack.install_test import TestStatus from spack.install_test import TestStatus
from spack.reporters import CDash, CDashConfiguration from spack.reporters import CDash, CDashConfiguration

View File

@@ -18,7 +18,6 @@
import llnl.util.filesystem as fs import llnl.util.filesystem as fs
import spack.hooks.sbang as sbang import spack.hooks.sbang as sbang
import spack.paths
import spack.store import spack.store
import spack.util.spack_yaml as syaml import spack.util.spack_yaml as syaml
from spack.util.executable import which from spack.util.executable import which

View File

@@ -6,7 +6,6 @@
import pytest import pytest
import spack.compilers import spack.compilers
import spack.config
import spack.spec import spack.spec
from spack.concretize import UnavailableCompilerVersionError from spack.concretize import UnavailableCompilerVersionError
from spack.solver import asp from spack.solver import asp

View File

@@ -9,7 +9,6 @@
import spack.deptypes as dt import spack.deptypes as dt
import spack.error import spack.error
import spack.package_base
import spack.parser import spack.parser
import spack.repo import spack.repo
import spack.util.hash as hashutil import spack.util.hash as hashutil

View File

@@ -12,7 +12,6 @@
import spack.cmd import spack.cmd
import spack.platforms.test import spack.platforms.test
import spack.spec import spack.spec
import spack.variant
from spack.parser import ( from spack.parser import (
UNIX_FILENAME, UNIX_FILENAME,
WINDOWS_FILENAME, WINDOWS_FILENAME,

Some files were not shown because too many files have changed in this diff Show More