From 55e0ef1e647ff1bbaab6c39589a6f9225fde64b0 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 16 Sep 2024 12:54:16 +0200 Subject: [PATCH] Add missing & remove redundant imports (#46407) --- lib/spack/spack/audit.py | 1 - lib/spack/spack/binary_distribution.py | 2 -- lib/spack/spack/bootstrap/core.py | 6 ------ lib/spack/spack/bootstrap/environment.py | 2 -- lib/spack/spack/build_environment.py | 4 ---- lib/spack/spack/caches.py | 1 - lib/spack/spack/ci.py | 1 - lib/spack/spack/cmd/bootstrap.py | 1 - lib/spack/spack/cmd/buildcache.py | 5 ----- lib/spack/spack/cmd/checksum.py | 1 - lib/spack/spack/cmd/ci.py | 1 - lib/spack/spack/cmd/clean.py | 3 --- lib/spack/spack/cmd/common/arguments.py | 1 - lib/spack/spack/cmd/common/env_utility.py | 1 - lib/spack/spack/cmd/config.py | 2 -- lib/spack/spack/cmd/create.py | 1 - lib/spack/spack/cmd/debug.py | 1 - lib/spack/spack/cmd/dependencies.py | 1 - lib/spack/spack/cmd/develop.py | 1 - lib/spack/spack/cmd/diff.py | 1 - lib/spack/spack/cmd/env.py | 4 ---- lib/spack/spack/cmd/external.py | 1 - lib/spack/spack/cmd/fetch.py | 1 - lib/spack/spack/cmd/find.py | 1 - lib/spack/spack/cmd/install.py | 2 -- lib/spack/spack/cmd/load.py | 2 -- lib/spack/spack/cmd/mark.py | 3 --- lib/spack/spack/cmd/mirror.py | 1 - lib/spack/spack/cmd/patch.py | 1 - lib/spack/spack/cmd/pkg.py | 1 - lib/spack/spack/cmd/restage.py | 1 - lib/spack/spack/cmd/solve.py | 1 - lib/spack/spack/cmd/stage.py | 2 -- lib/spack/spack/cmd/tags.py | 1 - lib/spack/spack/cmd/test.py | 1 - lib/spack/spack/cmd/unload.py | 1 - lib/spack/spack/compilers/__init__.py | 1 - lib/spack/spack/compilers/apple_clang.py | 1 - lib/spack/spack/concretize.py | 8 -------- lib/spack/spack/directives.py | 2 -- lib/spack/spack/fetch_strategy.py | 1 - lib/spack/spack/install_test.py | 15 ++++++++++++--- lib/spack/spack/installer.py | 1 - lib/spack/spack/main.py | 1 - lib/spack/spack/oci/oci.py | 6 ------ lib/spack/spack/oci/opener.py | 1 - lib/spack/spack/package_base.py | 3 --- lib/spack/spack/relocate.py | 4 ---- lib/spack/spack/repo.py | 1 - lib/spack/spack/report.py | 1 - lib/spack/spack/reporters/cdash.py | 3 --- lib/spack/spack/rewiring.py | 2 -- lib/spack/spack/schema/env.py | 1 - lib/spack/spack/solver/asp.py | 3 --- lib/spack/spack/spec.py | 1 - lib/spack/spack/stage.py | 1 - lib/spack/spack/test/bindist.py | 1 - lib/spack/spack/test/build_distribution.py | 2 -- lib/spack/spack/test/build_systems.py | 1 - lib/spack/spack/test/cc.py | 1 - lib/spack/spack/test/ci.py | 2 -- lib/spack/spack/test/cmd/blame.py | 1 - lib/spack/spack/test/cmd/buildcache.py | 1 - lib/spack/spack/test/cmd/ci.py | 2 -- lib/spack/spack/test/cmd/create.py | 1 - lib/spack/spack/test/cmd/debug.py | 1 - lib/spack/spack/test/cmd/dev_build.py | 1 - lib/spack/spack/test/cmd/diff.py | 2 -- lib/spack/spack/test/cmd/edit.py | 1 - lib/spack/spack/test/cmd/gpg.py | 1 - lib/spack/spack/test/cmd/install.py | 1 - lib/spack/spack/test/cmd/load.py | 1 - lib/spack/spack/test/cmd/stage.py | 2 -- lib/spack/spack/test/cmd/test.py | 3 --- lib/spack/spack/test/compilers/basics.py | 1 - lib/spack/spack/test/concretize.py | 1 - lib/spack/spack/test/concretize_requirements.py | 1 - lib/spack/spack/test/config.py | 3 --- lib/spack/spack/test/conftest.py | 5 ----- lib/spack/spack/test/container/cli.py | 1 - lib/spack/spack/test/cray_manifest.py | 1 - lib/spack/spack/test/flag_handlers.py | 1 - lib/spack/spack/test/flag_mixing.py | 4 ---- lib/spack/spack/test/gcs_fetch.py | 2 -- lib/spack/spack/test/graph.py | 1 - lib/spack/spack/test/hg_fetch.py | 1 - lib/spack/spack/test/installer.py | 4 ---- lib/spack/spack/test/mirror.py | 1 - lib/spack/spack/test/modules/common.py | 1 - lib/spack/spack/test/modules/conftest.py | 4 ---- lib/spack/spack/test/multimethod.py | 1 - lib/spack/spack/test/oci/integration_test.py | 1 - lib/spack/spack/test/packaging.py | 2 -- lib/spack/spack/test/patch.py | 1 - lib/spack/spack/test/relocate.py | 5 ----- lib/spack/spack/test/reporters.py | 1 - lib/spack/spack/test/sbang.py | 1 - lib/spack/spack/test/solver/intermediate.py | 1 - lib/spack/spack/test/spec_dag.py | 1 - lib/spack/spack/test/spec_syntax.py | 1 - lib/spack/spack/test/stage.py | 1 - lib/spack/spack/test/svn_fetch.py | 1 - lib/spack/spack/test/tag.py | 1 - lib/spack/spack/test/url_fetch.py | 1 - lib/spack/spack/test/util/spack_lock_wrapper.py | 2 +- lib/spack/spack/test/web.py | 1 - lib/spack/spack/user_environment.py | 1 - lib/spack/spack/util/lock.py | 1 - lib/spack/spack/util/package_hash.py | 2 +- lib/spack/spack/verify.py | 1 - lib/spack/spack/version/git_ref_lookup.py | 1 - 111 files changed, 14 insertions(+), 189 deletions(-) diff --git a/lib/spack/spack/audit.py b/lib/spack/spack/audit.py index 14fe7a5f33a..d682cc6d587 100644 --- a/lib/spack/spack/audit.py +++ b/lib/spack/spack/audit.py @@ -53,7 +53,6 @@ def _search_duplicate_compilers(error_cls): import spack.config import spack.patch -import spack.paths import spack.repo import spack.spec import spack.util.crypto diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 61db2bebe12..ad236ff056c 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -33,7 +33,6 @@ from llnl.util.symlink import readlink import spack.caches -import spack.cmd import spack.config as config import spack.database as spack_db import spack.error @@ -47,7 +46,6 @@ import spack.paths import spack.platforms import spack.relocate as relocate -import spack.repo import spack.spec import spack.stage import spack.store diff --git a/lib/spack/spack/bootstrap/core.py b/lib/spack/spack/bootstrap/core.py index 02909cbdf7b..9713e2866a8 100644 --- a/lib/spack/spack/bootstrap/core.py +++ b/lib/spack/spack/bootstrap/core.py @@ -37,16 +37,10 @@ import spack.binary_distribution import spack.config import spack.detection -import spack.environment -import spack.modules -import spack.paths import spack.platforms -import spack.platforms.linux -import spack.repo import spack.spec import spack.store import spack.user_environment -import spack.util.environment import spack.util.executable import spack.util.path import spack.util.spack_yaml diff --git a/lib/spack/spack/bootstrap/environment.py b/lib/spack/spack/bootstrap/environment.py index 13942ba86f4..ac8db642bf6 100644 --- a/lib/spack/spack/bootstrap/environment.py +++ b/lib/spack/spack/bootstrap/environment.py @@ -15,8 +15,6 @@ import spack.environment import spack.tengine -import spack.util.cpus -import spack.util.executable from ._common import _root_spec from .config import root_path, spec_for_current_python, store_path diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index e807bf6fd02..3dfda841011 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -65,16 +65,12 @@ import spack.package_base import spack.paths import spack.platforms -import spack.repo import spack.schema.environment import spack.spec import spack.stage import spack.store import spack.subprocess_context -import spack.user_environment import spack.util.executable -import spack.util.path -import spack.util.pattern from spack import traverse from spack.context import Context from spack.error import NoHeadersError, NoLibrariesError diff --git a/lib/spack/spack/caches.py b/lib/spack/spack/caches.py index 1ffef9343b0..58594059a58 100644 --- a/lib/spack/spack/caches.py +++ b/lib/spack/spack/caches.py @@ -11,7 +11,6 @@ from llnl.util.filesystem import mkdirp import spack.config -import spack.error import spack.fetch_strategy import spack.paths import spack.util.file_cache diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index c40b88d9e2e..2420bf4df78 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -38,7 +38,6 @@ import spack.paths import spack.repo import spack.spec -import spack.stage import spack.util.git import spack.util.gpg as gpg_util import spack.util.spack_yaml as syaml diff --git a/lib/spack/spack/cmd/bootstrap.py b/lib/spack/spack/cmd/bootstrap.py index c321b121309..ffc46152780 100644 --- a/lib/spack/spack/cmd/bootstrap.py +++ b/lib/spack/spack/cmd/bootstrap.py @@ -16,7 +16,6 @@ import spack.bootstrap.config import spack.bootstrap.core import spack.config -import spack.main import spack.mirror import spack.spec import spack.stage diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py index 7839f315129..960f468c7d1 100644 --- a/lib/spack/spack/cmd/buildcache.py +++ b/lib/spack/spack/cmd/buildcache.py @@ -23,14 +23,9 @@ import spack.error import spack.mirror import spack.oci.oci -import spack.oci.opener -import spack.relocate -import spack.repo import spack.spec import spack.stage import spack.store -import spack.user_environment -import spack.util.crypto import spack.util.parallel import spack.util.url as url_util import spack.util.web as web_util diff --git a/lib/spack/spack/cmd/checksum.py b/lib/spack/spack/cmd/checksum.py index 44478c61ce7..92413f6f003 100644 --- a/lib/spack/spack/cmd/checksum.py +++ b/lib/spack/spack/cmd/checksum.py @@ -15,7 +15,6 @@ import spack.repo import spack.spec import spack.stage -import spack.util.crypto import spack.util.web as web_util from spack.cmd.common import arguments from spack.package_base import ( diff --git a/lib/spack/spack/cmd/ci.py b/lib/spack/spack/cmd/ci.py index 934acc0d4e1..44557488fef 100644 --- a/lib/spack/spack/cmd/ci.py +++ b/lib/spack/spack/cmd/ci.py @@ -19,7 +19,6 @@ import spack.cmd.buildcache as buildcache import spack.config as cfg import spack.environment as ev -import spack.environment.depfile import spack.hash_types as ht import spack.mirror import spack.util.gpg as gpg_util diff --git a/lib/spack/spack/cmd/clean.py b/lib/spack/spack/cmd/clean.py index 9dd3efa4599..4a8d238dbd1 100644 --- a/lib/spack/spack/cmd/clean.py +++ b/lib/spack/spack/cmd/clean.py @@ -10,11 +10,8 @@ import llnl.util.filesystem import llnl.util.tty as tty -import spack.bootstrap import spack.caches -import spack.cmd.test import spack.config -import spack.repo import spack.stage import spack.store import spack.util.path diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index aa652919f84..456ad0f5ac2 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -15,7 +15,6 @@ import spack.deptypes as dt import spack.environment as ev import spack.mirror -import spack.modules import spack.reporters import spack.spec import spack.store diff --git a/lib/spack/spack/cmd/common/env_utility.py b/lib/spack/spack/cmd/common/env_utility.py index 1d04e199d9c..6371ef65a83 100644 --- a/lib/spack/spack/cmd/common/env_utility.py +++ b/lib/spack/spack/cmd/common/env_utility.py @@ -10,7 +10,6 @@ import spack.cmd import spack.deptypes as dt import spack.error -import spack.paths import spack.spec import spack.store from spack import build_environment, traverse diff --git a/lib/spack/spack/cmd/config.py b/lib/spack/spack/cmd/config.py index ca68cbbd9d1..fdecc0156ee 100644 --- a/lib/spack/spack/cmd/config.py +++ b/lib/spack/spack/cmd/config.py @@ -13,9 +13,7 @@ import spack.config import spack.environment as ev -import spack.repo import spack.schema.env -import spack.schema.packages import spack.store import spack.util.spack_yaml as syaml from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index e2f198b06da..1aa61914970 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -13,7 +13,6 @@ import spack.repo import spack.stage -import spack.util.web from spack.spec import Spec from spack.url import ( UndetectableNameError, diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index 9a93cc0a14d..a920784e545 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -14,7 +14,6 @@ from llnl.util.filesystem import working_dir import spack -import spack.config import spack.paths import spack.platforms import spack.util.git diff --git a/lib/spack/spack/cmd/dependencies.py b/lib/spack/spack/cmd/dependencies.py index 676da2f089f..51d2389f796 100644 --- a/lib/spack/spack/cmd/dependencies.py +++ b/lib/spack/spack/cmd/dependencies.py @@ -11,7 +11,6 @@ import spack.cmd import spack.environment as ev import spack.package_base -import spack.repo import spack.store from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/develop.py b/lib/spack/spack/cmd/develop.py index cc181d9a926..0a9b7d13875 100644 --- a/lib/spack/spack/cmd/develop.py +++ b/lib/spack/spack/cmd/develop.py @@ -10,7 +10,6 @@ import spack.cmd import spack.config import spack.fetch_strategy -import spack.package_base import spack.repo import spack.spec import spack.stage diff --git a/lib/spack/spack/cmd/diff.py b/lib/spack/spack/cmd/diff.py index a841986355b..3a9311e0e6f 100644 --- a/lib/spack/spack/cmd/diff.py +++ b/lib/spack/spack/cmd/diff.py @@ -12,7 +12,6 @@ import spack.cmd import spack.environment as ev import spack.solver.asp as asp -import spack.util.environment import spack.util.spack_json as sjson from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/env.py b/lib/spack/spack/cmd/env.py index b943f3d3bd3..5494773c2f4 100644 --- a/lib/spack/spack/cmd/env.py +++ b/lib/spack/spack/cmd/env.py @@ -21,15 +21,11 @@ import spack.cmd import spack.cmd.common import spack.cmd.common.arguments -import spack.cmd.install import spack.cmd.modules -import spack.cmd.uninstall import spack.config import spack.environment as ev import spack.environment.depfile as depfile import spack.environment.shell -import spack.schema.env -import spack.spec import spack.tengine from spack.cmd.common import arguments from spack.util.environment import EnvironmentModifications diff --git a/lib/spack/spack/cmd/external.py b/lib/spack/spack/cmd/external.py index 421685d42a3..2c0d26edc25 100644 --- a/lib/spack/spack/cmd/external.py +++ b/lib/spack/spack/cmd/external.py @@ -20,7 +20,6 @@ import spack.error import spack.repo import spack.spec -import spack.util.environment from spack.cmd.common import arguments description = "manage external packages in Spack configuration" diff --git a/lib/spack/spack/cmd/fetch.py b/lib/spack/spack/cmd/fetch.py index 0d794eb5478..ef831dd0541 100644 --- a/lib/spack/spack/cmd/fetch.py +++ b/lib/spack/spack/cmd/fetch.py @@ -8,7 +8,6 @@ import spack.cmd import spack.config import spack.environment as ev -import spack.repo import spack.traverse from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/find.py b/lib/spack/spack/cmd/find.py index d09b2d84238..3674cae4cfb 100644 --- a/lib/spack/spack/cmd/find.py +++ b/lib/spack/spack/cmd/find.py @@ -10,7 +10,6 @@ import llnl.util.tty as tty import llnl.util.tty.color as color -import spack.bootstrap import spack.cmd as cmd import spack.environment as ev import spack.repo diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 8458e7ce050..c262d569bc2 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -17,8 +17,6 @@ import spack.cmd import spack.config import spack.environment as ev -import spack.fetch_strategy -import spack.package_base import spack.paths import spack.report import spack.spec diff --git a/lib/spack/spack/cmd/load.py b/lib/spack/spack/cmd/load.py index 81f13194844..a868494a32c 100644 --- a/lib/spack/spack/cmd/load.py +++ b/lib/spack/spack/cmd/load.py @@ -6,11 +6,9 @@ import sys import spack.cmd -import spack.cmd.find import spack.environment as ev import spack.store import spack.user_environment as uenv -import spack.util.environment from spack.cmd.common import arguments description = "add package to the user environment" diff --git a/lib/spack/spack/cmd/mark.py b/lib/spack/spack/cmd/mark.py index cf816a21f54..38701b97475 100644 --- a/lib/spack/spack/cmd/mark.py +++ b/lib/spack/spack/cmd/mark.py @@ -8,9 +8,6 @@ from llnl.util import tty import spack.cmd -import spack.error -import spack.package_base -import spack.repo import spack.store from spack.cmd.common import arguments from spack.database import InstallStatuses diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py index d25a9018e88..af6a45e3990 100644 --- a/lib/spack/spack/cmd/mirror.py +++ b/lib/spack/spack/cmd/mirror.py @@ -17,7 +17,6 @@ import spack.mirror import spack.repo import spack.spec -import spack.util.path import spack.util.web as web_util from spack.cmd.common import arguments from spack.error import SpackError diff --git a/lib/spack/spack/cmd/patch.py b/lib/spack/spack/cmd/patch.py index b5805afd805..885ff2f746c 100644 --- a/lib/spack/spack/cmd/patch.py +++ b/lib/spack/spack/cmd/patch.py @@ -9,7 +9,6 @@ import spack.config import spack.environment as ev import spack.package_base -import spack.repo import spack.traverse from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/pkg.py b/lib/spack/spack/cmd/pkg.py index b21313cbc49..fa4084437ff 100644 --- a/lib/spack/spack/cmd/pkg.py +++ b/lib/spack/spack/cmd/pkg.py @@ -12,7 +12,6 @@ from llnl.util.tty.colify import colify import spack.cmd -import spack.paths import spack.repo import spack.util.executable as exe import spack.util.package_hash as ph diff --git a/lib/spack/spack/cmd/restage.py b/lib/spack/spack/cmd/restage.py index a21317405c4..d3d596fa129 100644 --- a/lib/spack/spack/cmd/restage.py +++ b/lib/spack/spack/cmd/restage.py @@ -6,7 +6,6 @@ import llnl.util.tty as tty import spack.cmd -import spack.repo from spack.cmd.common import arguments description = "revert checked out package source code" diff --git a/lib/spack/spack/cmd/solve.py b/lib/spack/spack/cmd/solve.py index 2d6197f7584..47d733fe63f 100644 --- a/lib/spack/spack/cmd/solve.py +++ b/lib/spack/spack/cmd/solve.py @@ -15,7 +15,6 @@ import spack.config import spack.environment import spack.hash_types as ht -import spack.package_base import spack.solver.asp as asp from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/stage.py b/lib/spack/spack/cmd/stage.py index 10a94e34102..af5fa412ea7 100644 --- a/lib/spack/spack/cmd/stage.py +++ b/lib/spack/spack/cmd/stage.py @@ -11,8 +11,6 @@ import spack.config import spack.environment as ev import spack.package_base -import spack.repo -import spack.stage import spack.traverse from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/tags.py b/lib/spack/spack/cmd/tags.py index a4f9786b93d..736b3062c59 100644 --- a/lib/spack/spack/cmd/tags.py +++ b/lib/spack/spack/cmd/tags.py @@ -10,7 +10,6 @@ import llnl.util.tty.colify as colify import spack.repo -import spack.store import spack.tag description = "show package tags and associated packages" diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 5aded576b05..4eedb0d3707 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -17,7 +17,6 @@ import spack.cmd import spack.environment as ev import spack.install_test -import spack.package_base import spack.repo import spack.report from spack.cmd.common import arguments diff --git a/lib/spack/spack/cmd/unload.py b/lib/spack/spack/cmd/unload.py index 65daabcd468..a6ea80e5820 100644 --- a/lib/spack/spack/cmd/unload.py +++ b/lib/spack/spack/cmd/unload.py @@ -9,7 +9,6 @@ import spack.cmd import spack.error import spack.user_environment as uenv -import spack.util.environment from spack.cmd.common import arguments description = "remove package from the user environment" diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index aec829cd017..8c14ab759cd 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -25,7 +25,6 @@ import spack.platforms import spack.repo import spack.spec -import spack.version from spack.operating_systems import windows_os from spack.util.environment import get_path from spack.util.naming import mod_to_class diff --git a/lib/spack/spack/compilers/apple_clang.py b/lib/spack/spack/compilers/apple_clang.py index 9201b164027..7537620709a 100644 --- a/lib/spack/spack/compilers/apple_clang.py +++ b/lib/spack/spack/compilers/apple_clang.py @@ -8,7 +8,6 @@ import spack.compiler import spack.compilers.clang -import spack.util.executable from spack.version import Version diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 9aed68f34d7..387c7f2de27 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -8,16 +8,8 @@ from contextlib import contextmanager from itertools import chain -import spack.compilers import spack.config -import spack.environment 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 diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index 55b040e68aa..7119339d5a3 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -40,10 +40,8 @@ class OpenMpi(Package): import llnl.util.tty.color import spack.deptypes as dt -import spack.error import spack.patch import spack.spec -import spack.url import spack.util.crypto import spack.variant from spack.dependency import Dependency diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 82b01121736..a4e8fcc2030 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -46,7 +46,6 @@ import spack.config import spack.error import spack.oci.opener -import spack.url import spack.util.archive import spack.util.crypto as crypto import spack.util.git diff --git a/lib/spack/spack/install_test.py b/lib/spack/spack/install_test.py index 559b5b389c1..f0b62523d1d 100644 --- a/lib/spack/spack/install_test.py +++ b/lib/spack/spack/install_test.py @@ -17,12 +17,21 @@ import llnl.util.filesystem as fs import llnl.util.tty as tty +import llnl.util.tty.log from llnl.string import plural from llnl.util.lang import nullcontext from llnl.util.tty.color import colorize +import spack.build_environment +import spack.builder +import spack.config import spack.error +import spack.package_base import spack.paths +import spack.repo +import spack.spec +import spack.util.executable +import spack.util.path import spack.util.spack_json as sjson from spack.installer import InstallError from spack.spec import Spec @@ -42,7 +51,7 @@ 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") PackageObjectOrClass = Union[Pb, Type[Pb]] @@ -280,7 +289,7 @@ def __init__(self, pkg: Pb): def logger(self) -> Optional[LogType]: """The current logger or, if none, sets to one.""" 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 @@ -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.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] tty.msg("Testing package " + colorize(r"@*g{" + self.pkg_id + r"}")) diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py index 1adc5b9ee31..42325e22f73 100644 --- a/lib/spack/spack/installer.py +++ b/lib/spack/spack/installer.py @@ -48,7 +48,6 @@ import spack.binary_distribution as binary_distribution import spack.build_environment -import spack.compilers import spack.config import spack.database import spack.deptypes as dt diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 9ca5453f23c..db5d45034cc 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -40,7 +40,6 @@ import spack.paths import spack.platforms import spack.repo -import spack.solver.asp import spack.spec import spack.store import spack.util.debug diff --git a/lib/spack/spack/oci/oci.py b/lib/spack/spack/oci/oci.py index ae70e287a6d..1b84860d268 100644 --- a/lib/spack/spack/oci/oci.py +++ b/lib/spack/spack/oci/oci.py @@ -15,16 +15,10 @@ import llnl.util.tty as tty -import spack.config -import spack.error import spack.fetch_strategy import spack.mirror import spack.oci.opener -import spack.repo -import spack.spec import spack.stage -import spack.traverse -import spack.util.crypto import spack.util.url from .image import Digest, ImageReference diff --git a/lib/spack/spack/oci/opener.py b/lib/spack/spack/oci/opener.py index 53535b85ed7..906d5d2b92c 100644 --- a/lib/spack/spack/oci/opener.py +++ b/lib/spack/spack/oci/opener.py @@ -22,7 +22,6 @@ import spack.config import spack.mirror import spack.parser -import spack.repo import spack.util.web from .image import ImageReference diff --git a/lib/spack/spack/package_base.py b/lib/spack/spack/package_base.py index d157ab4a66c..382d0b25f7a 100644 --- a/lib/spack/spack/package_base.py +++ b/lib/spack/spack/package_base.py @@ -38,16 +38,13 @@ import spack.dependency import spack.deptypes as dt import spack.directives -import spack.directory_layout import spack.environment import spack.error import spack.fetch_strategy as fs import spack.hooks import spack.mirror -import spack.mixins import spack.multimethod import spack.patch -import spack.paths import spack.repo import spack.spec import spack.store diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 364e72f7c3c..c376a261a63 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -17,15 +17,11 @@ from llnl.util.lang import memoized from llnl.util.symlink import readlink, symlink -import spack.paths import spack.platforms -import spack.repo -import spack.spec import spack.store import spack.util.elf as elf import spack.util.executable as executable import spack.util.filesystem as ssys -import spack.util.path from .relocate_text import BinaryFilePrefixReplacer, TextFilePrefixReplacer diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index 1e95b4ec648..fd1609df830 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -41,7 +41,6 @@ import spack.provider_index import spack.spec import spack.tag -import spack.util.file_cache import spack.util.git import spack.util.naming as nm import spack.util.path diff --git a/lib/spack/spack/report.py b/lib/spack/spack/report.py index 9c56e7edbe0..409810f58a9 100644 --- a/lib/spack/spack/report.py +++ b/lib/spack/spack/report.py @@ -15,7 +15,6 @@ import llnl.util.lang import spack.build_environment -import spack.fetch_strategy import spack.install_test import spack.installer import spack.package_base diff --git a/lib/spack/spack/reporters/cdash.py b/lib/spack/spack/reporters/cdash.py index 5d50f05c60e..2ecfacb60bd 100644 --- a/lib/spack/spack/reporters/cdash.py +++ b/lib/spack/spack/reporters/cdash.py @@ -20,9 +20,6 @@ from llnl.util.filesystem import working_dir import spack -import spack.build_environment -import spack.fetch_strategy -import spack.package_base import spack.paths import spack.platforms import spack.util.git diff --git a/lib/spack/spack/rewiring.py b/lib/spack/spack/rewiring.py index fa95d339b3b..f2a01cd6d1a 100644 --- a/lib/spack/spack/rewiring.py +++ b/lib/spack/spack/rewiring.py @@ -14,9 +14,7 @@ import spack.binary_distribution as bindist import spack.error import spack.hooks -import spack.paths import spack.relocate as relocate -import spack.stage import spack.store diff --git a/lib/spack/spack/schema/env.py b/lib/spack/spack/schema/env.py index 8b37f3e236f..17cf29d4c6c 100644 --- a/lib/spack/spack/schema/env.py +++ b/lib/spack/spack/schema/env.py @@ -14,7 +14,6 @@ import spack.schema.gitlab_ci # DEPRECATED import spack.schema.merged -import spack.schema.projections from .spec_list import spec_list_schema diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index af6d3c94f7e..9b694d38505 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -27,7 +27,6 @@ import spack import spack.binary_distribution -import spack.cmd import spack.compilers import spack.config import spack.config as sc @@ -36,13 +35,11 @@ import spack.error import spack.package_base import spack.package_prefs -import spack.parser import spack.platforms import spack.repo import spack.spec import spack.store import spack.util.crypto -import spack.util.elf import spack.util.libc import spack.util.path import spack.util.timer diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index be1d08399e7..1e23ebc63f2 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -84,7 +84,6 @@ import spack.store import spack.target import spack.traverse as traverse -import spack.util.crypto import spack.util.executable import spack.util.hash import spack.util.module_cmd as md diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index a8e945e7485..776b3ce6b94 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -36,7 +36,6 @@ import spack.error import spack.fetch_strategy as fs import spack.mirror -import spack.paths import spack.resource import spack.spec import spack.util.crypto diff --git a/lib/spack/spack/test/bindist.py b/lib/spack/spack/test/bindist.py index fcc781b1422..a418ef360ac 100644 --- a/lib/spack/spack/test/bindist.py +++ b/lib/spack/spack/test/bindist.py @@ -32,7 +32,6 @@ import spack.hooks.sbang as sbang import spack.main import spack.mirror -import spack.repo import spack.store import spack.util.gpg import spack.util.spack_yaml as syaml diff --git a/lib/spack/spack/test/build_distribution.py b/lib/spack/spack/test/build_distribution.py index cdfd961e3a2..dc1e763e2a9 100644 --- a/lib/spack/spack/test/build_distribution.py +++ b/lib/spack/spack/test/build_distribution.py @@ -9,10 +9,8 @@ import pytest import spack.binary_distribution as bd -import spack.main import spack.mirror import spack.spec -import spack.util.url pytestmark = pytest.mark.not_on_windows("does not run on windows") diff --git a/lib/spack/spack/test/build_systems.py b/lib/spack/spack/test/build_systems.py index 57516b445c1..f224982e1a6 100644 --- a/lib/spack/spack/test/build_systems.py +++ b/lib/spack/spack/test/build_systems.py @@ -17,7 +17,6 @@ import spack.build_systems.cmake import spack.environment import spack.platforms -import spack.repo from spack.build_environment import ChildError, setup_package from spack.spec import Spec from spack.util.executable import which diff --git a/lib/spack/spack/test/cc.py b/lib/spack/spack/test/cc.py index 27d05fb7861..4a394680f48 100644 --- a/lib/spack/spack/test/cc.py +++ b/lib/spack/spack/test/cc.py @@ -13,7 +13,6 @@ import spack.build_environment import spack.config -import spack.spec from spack.paths import build_env_path from spack.util.environment import SYSTEM_DIR_CASE_ENTRY, set_env from spack.util.executable import Executable, ProcessError diff --git a/lib/spack/spack/test/ci.py b/lib/spack/spack/test/ci.py index 9eb0d45d2d1..6742e02c748 100644 --- a/lib/spack/spack/test/ci.py +++ b/lib/spack/spack/test/ci.py @@ -10,12 +10,10 @@ import llnl.util.filesystem as fs import spack.ci as ci -import spack.config import spack.environment as ev import spack.error import spack.paths as spack_paths import spack.util.git -import spack.util.gpg @pytest.fixture diff --git a/lib/spack/spack/test/cmd/blame.py b/lib/spack/spack/test/cmd/blame.py index dcc26c91539..2514750b881 100644 --- a/lib/spack/spack/test/cmd/blame.py +++ b/lib/spack/spack/test/cmd/blame.py @@ -9,7 +9,6 @@ from llnl.util.filesystem import working_dir -import spack.cmd import spack.paths import spack.util.spack_json as sjson from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/buildcache.py b/lib/spack/spack/test/cmd/buildcache.py index de0e40c05af..30c779e7056 100644 --- a/lib/spack/spack/test/cmd/buildcache.py +++ b/lib/spack/spack/test/cmd/buildcache.py @@ -13,7 +13,6 @@ import spack.binary_distribution import spack.cmd.buildcache -import spack.deptypes import spack.environment as ev import spack.error import spack.main diff --git a/lib/spack/spack/test/cmd/ci.py b/lib/spack/spack/test/cmd/ci.py index e2d87d5bb0a..01e3e4e5694 100644 --- a/lib/spack/spack/test/cmd/ci.py +++ b/lib/spack/spack/test/cmd/ci.py @@ -18,13 +18,11 @@ import spack.binary_distribution import spack.ci as ci import spack.cmd.ci -import spack.config import spack.environment as ev import spack.hash_types as ht import spack.main import spack.paths as spack_paths import spack.repo as repo -import spack.util.gpg import spack.util.spack_yaml as syaml from spack.cmd.ci import FAILED_CREATE_BUILDCACHE_CODE from spack.schema.buildcache_spec import schema as specfile_schema diff --git a/lib/spack/spack/test/cmd/create.py b/lib/spack/spack/test/cmd/create.py index bc3854e9f55..13967adb52b 100644 --- a/lib/spack/spack/test/cmd/create.py +++ b/lib/spack/spack/test/cmd/create.py @@ -9,7 +9,6 @@ import pytest import spack.cmd.create -import spack.util.editor from spack.main import SpackCommand from spack.url import UndetectableNameError from spack.util.executable import which diff --git a/lib/spack/spack/test/cmd/debug.py b/lib/spack/spack/test/cmd/debug.py index 4e16cc92c96..2cff3b29c63 100644 --- a/lib/spack/spack/test/cmd/debug.py +++ b/lib/spack/spack/test/cmd/debug.py @@ -10,7 +10,6 @@ import pytest import spack -import spack.config import spack.platforms from spack.main import SpackCommand from spack.util.executable import which diff --git a/lib/spack/spack/test/cmd/dev_build.py b/lib/spack/spack/test/cmd/dev_build.py index 16252b1af7e..8545a9dc529 100644 --- a/lib/spack/spack/test/cmd/dev_build.py +++ b/lib/spack/spack/test/cmd/dev_build.py @@ -9,7 +9,6 @@ import llnl.util.filesystem as fs -import spack.build_environment import spack.environment as ev import spack.error import spack.spec diff --git a/lib/spack/spack/test/cmd/diff.py b/lib/spack/spack/test/cmd/diff.py index 259f6b871af..322b33b3d4e 100644 --- a/lib/spack/spack/test/cmd/diff.py +++ b/lib/spack/spack/test/cmd/diff.py @@ -6,9 +6,7 @@ import pytest import spack.cmd.diff -import spack.config import spack.main -import spack.store import spack.util.spack_json as sjson from spack.test.conftest import create_test_repo diff --git a/lib/spack/spack/test/cmd/edit.py b/lib/spack/spack/test/cmd/edit.py index 93b4bd7949a..1735f7f4a5c 100644 --- a/lib/spack/spack/test/cmd/edit.py +++ b/lib/spack/spack/test/cmd/edit.py @@ -5,7 +5,6 @@ import os -import spack.paths import spack.repo import spack.util.editor from spack.build_systems import autotools, cmake diff --git a/lib/spack/spack/test/cmd/gpg.py b/lib/spack/spack/test/cmd/gpg.py index d342897db7f..b720b7d9e62 100644 --- a/lib/spack/spack/test/cmd/gpg.py +++ b/lib/spack/spack/test/cmd/gpg.py @@ -9,7 +9,6 @@ import llnl.util.filesystem as fs -import spack.bootstrap import spack.util.executable import spack.util.gpg from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 47dd194f879..748c162db79 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -24,7 +24,6 @@ import spack.hash_types as ht import spack.package_base import spack.store -import spack.util.executable from spack.error import SpackError from spack.main import SpackCommand from spack.parser import SpecSyntaxError diff --git a/lib/spack/spack/test/cmd/load.py b/lib/spack/spack/test/cmd/load.py index 73a062ebd41..1c36bcc86ab 100644 --- a/lib/spack/spack/test/cmd/load.py +++ b/lib/spack/spack/test/cmd/load.py @@ -10,7 +10,6 @@ import spack.spec import spack.user_environment as uenv -import spack.util.environment from spack.main import SpackCommand load = SpackCommand("load") diff --git a/lib/spack/spack/test/cmd/stage.py b/lib/spack/spack/test/cmd/stage.py index e91d2ed7662..ba37eff0dc9 100644 --- a/lib/spack/spack/test/cmd/stage.py +++ b/lib/spack/spack/test/cmd/stage.py @@ -10,8 +10,6 @@ import spack.config import spack.environment as ev import spack.package_base -import spack.repo -import spack.stage import spack.traverse from spack.main import SpackCommand, SpackCommandError from spack.version import Version diff --git a/lib/spack/spack/test/cmd/test.py b/lib/spack/spack/test/cmd/test.py index 3cfaa5b58f2..3b3785a9aed 100644 --- a/lib/spack/spack/test/cmd/test.py +++ b/lib/spack/spack/test/cmd/test.py @@ -11,14 +11,11 @@ from llnl.util.filesystem import copy_tree import spack.cmd.common.arguments -import spack.cmd.install import spack.cmd.test import spack.config import spack.install_test -import spack.package_base import spack.paths import spack.spec -import spack.store from spack.install_test import TestStatus from spack.main import SpackCommand diff --git a/lib/spack/spack/test/compilers/basics.py b/lib/spack/spack/test/compilers/basics.py index 8f8d7fb876d..59edeaea151 100644 --- a/lib/spack/spack/test/compilers/basics.py +++ b/lib/spack/spack/test/compilers/basics.py @@ -13,7 +13,6 @@ import spack.compiler import spack.compilers import spack.spec -import spack.util.environment import spack.util.module_cmd from spack.compiler import Compiler from spack.util.executable import Executable, ProcessError diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 7349e4227d7..e362cc27ff0 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -28,7 +28,6 @@ import spack.solver.version_order import spack.store import spack.util.file_cache -import spack.util.libc import spack.variant as vt from spack.concretize import find_spec from spack.spec import CompilerSpec, Spec diff --git a/lib/spack/spack/test/concretize_requirements.py b/lib/spack/spack/test/concretize_requirements.py index 386ad1c1940..db919415764 100644 --- a/lib/spack/spack/test/concretize_requirements.py +++ b/lib/spack/spack/test/concretize_requirements.py @@ -7,7 +7,6 @@ import pytest -import spack.build_systems.generic import spack.config import spack.error import spack.package_base diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py index 7c1c8f365b6..abe9f9121bf 100644 --- a/lib/spack/spack/test/config.py +++ b/lib/spack/spack/test/config.py @@ -18,8 +18,6 @@ import spack.config import spack.directory_layout import spack.environment as ev -import spack.fetch_strategy -import spack.main import spack.package_base import spack.paths import spack.repo @@ -27,7 +25,6 @@ import spack.schema.config import spack.schema.env import spack.schema.mirrors -import spack.schema.packages import spack.schema.repos import spack.store import spack.util.path as spack_path diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 2db0206bec5..b8cec8611d4 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -35,16 +35,12 @@ import spack.binary_distribution import spack.bootstrap.core import spack.caches -import spack.cmd.buildcache import spack.compiler import spack.compilers import spack.config -import spack.database -import spack.directory_layout import spack.environment as ev import spack.error import spack.package_base -import spack.package_prefs import spack.paths import spack.platforms import spack.repo @@ -52,7 +48,6 @@ import spack.stage import spack.store import spack.subprocess_context -import spack.test.cray_manifest import spack.util.executable import spack.util.git import spack.util.gpg diff --git a/lib/spack/spack/test/container/cli.py b/lib/spack/spack/test/container/cli.py index 660f84aef19..5e1ecd58a74 100644 --- a/lib/spack/spack/test/container/cli.py +++ b/lib/spack/spack/test/container/cli.py @@ -8,7 +8,6 @@ import spack.container.images import spack.main -import spack.platforms containerize = spack.main.SpackCommand("containerize") diff --git a/lib/spack/spack/test/cray_manifest.py b/lib/spack/spack/test/cray_manifest.py index 532261b3ee8..dd5bd3e4a64 100644 --- a/lib/spack/spack/test/cray_manifest.py +++ b/lib/spack/spack/test/cray_manifest.py @@ -18,7 +18,6 @@ import spack.cmd import spack.cmd.external import spack.compilers -import spack.config import spack.cray_manifest as cray_manifest import spack.solver.asp import spack.spec diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index d2b67d63bc3..fd63de4b82f 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -8,7 +8,6 @@ import pytest import spack.build_environment -import spack.repo import spack.spec from spack.package import build_system_flags, env_flags, inject_flags diff --git a/lib/spack/spack/test/flag_mixing.py b/lib/spack/spack/test/flag_mixing.py index f1c2cf7defb..d3db72625f1 100644 --- a/lib/spack/spack/test/flag_mixing.py +++ b/lib/spack/spack/test/flag_mixing.py @@ -4,14 +4,10 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import pytest -import spack.build_systems.generic import spack.config import spack.environment as ev -import spack.error -import spack.package_base import spack.repo import spack.util.spack_yaml as syaml -import spack.version from spack.spec import Spec from spack.test.conftest import create_test_repo diff --git a/lib/spack/spack/test/gcs_fetch.py b/lib/spack/spack/test/gcs_fetch.py index ec53f0b633c..8e226242220 100644 --- a/lib/spack/spack/test/gcs_fetch.py +++ b/lib/spack/spack/test/gcs_fetch.py @@ -3,8 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import spack.config -import spack.error import spack.fetch_strategy import spack.stage diff --git a/lib/spack/spack/test/graph.py b/lib/spack/spack/test/graph.py index 001091d22c6..c26363bb46d 100644 --- a/lib/spack/spack/test/graph.py +++ b/lib/spack/spack/test/graph.py @@ -5,7 +5,6 @@ import io import spack.graph -import spack.repo import spack.spec diff --git a/lib/spack/spack/test/hg_fetch.py b/lib/spack/spack/test/hg_fetch.py index 6d63f64dc89..f186ea14541 100644 --- a/lib/spack/spack/test/hg_fetch.py +++ b/lib/spack/spack/test/hg_fetch.py @@ -10,7 +10,6 @@ from llnl.util.filesystem import mkdirp, touch, working_dir import spack.config -import spack.repo from spack.fetch_strategy import HgFetchStrategy from spack.spec import Spec from spack.stage import Stage diff --git a/lib/spack/spack/test/installer.py b/lib/spack/spack/test/installer.py index 95084ba8ee6..8d7669f544a 100644 --- a/lib/spack/spack/test/installer.py +++ b/lib/spack/spack/test/installer.py @@ -17,9 +17,6 @@ import llnl.util.tty as tty import spack.binary_distribution -import spack.compilers -import spack.concretize -import spack.config import spack.database import spack.deptypes as dt import spack.installer as inst @@ -29,7 +26,6 @@ import spack.spec import spack.store import spack.util.lock as lk -import spack.version def _mock_repo(root, namespace): diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index 5609595f464..10d375a7fb6 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -15,7 +15,6 @@ import spack.fetch_strategy import spack.mirror import spack.patch -import spack.repo import spack.stage import spack.util.executable import spack.util.spack_json as sjson diff --git a/lib/spack/spack/test/modules/common.py b/lib/spack/spack/test/modules/common.py index f6688963460..694f3f65380 100644 --- a/lib/spack/spack/test/modules/common.py +++ b/lib/spack/spack/test/modules/common.py @@ -14,7 +14,6 @@ import spack.error import spack.modules.tcl import spack.package_base -import spack.schema.modules import spack.spec from spack.modules.common import UpstreamModuleIndex from spack.spec import Spec diff --git a/lib/spack/spack/test/modules/conftest.py b/lib/spack/spack/test/modules/conftest.py index 57396da426f..8869d60d8d9 100644 --- a/lib/spack/spack/test/modules/conftest.py +++ b/lib/spack/spack/test/modules/conftest.py @@ -6,11 +6,7 @@ import pytest -import spack.config -import spack.modules.common -import spack.paths import spack.spec -import spack.util.path @pytest.fixture() diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py index 84272a15d10..974985d5b88 100644 --- a/lib/spack/spack/test/multimethod.py +++ b/lib/spack/spack/test/multimethod.py @@ -8,7 +8,6 @@ import pytest import spack.platforms -import spack.repo import spack.spec from spack.multimethod import NoSuchMethodError diff --git a/lib/spack/spack/test/oci/integration_test.py b/lib/spack/spack/test/oci/integration_test.py index 10ec12e406e..85673e953aa 100644 --- a/lib/spack/spack/test/oci/integration_test.py +++ b/lib/spack/spack/test/oci/integration_test.py @@ -17,7 +17,6 @@ import pytest import spack.binary_distribution -import spack.cmd.buildcache import spack.database import spack.environment as ev import spack.error diff --git a/lib/spack/spack/test/packaging.py b/lib/spack/spack/test/packaging.py index 2356515c059..9fb7e3b1527 100644 --- a/lib/spack/spack/test/packaging.py +++ b/lib/spack/spack/test/packaging.py @@ -24,8 +24,6 @@ import spack.error import spack.fetch_strategy import spack.package_base -import spack.repo -import spack.store import spack.util.gpg import spack.util.url as url_util from spack.fetch_strategy import URLFetchStrategy diff --git a/lib/spack/spack/test/patch.py b/lib/spack/spack/test/patch.py index 04bce857c54..8c8ea24227f 100644 --- a/lib/spack/spack/test/patch.py +++ b/lib/spack/spack/test/patch.py @@ -17,7 +17,6 @@ import spack.patch import spack.paths import spack.repo -import spack.util.compression import spack.util.url as url_util from spack.spec import Spec from spack.stage import Stage diff --git a/lib/spack/spack/test/relocate.py b/lib/spack/spack/test/relocate.py index e02bc9ae3ac..31c206264ac 100644 --- a/lib/spack/spack/test/relocate.py +++ b/lib/spack/spack/test/relocate.py @@ -9,14 +9,9 @@ import pytest -import spack.concretize -import spack.paths import spack.platforms import spack.relocate import spack.relocate_text as relocate_text -import spack.spec -import spack.store -import spack.tengine import spack.util.executable pytestmark = pytest.mark.not_on_windows("Tests fail on Windows") diff --git a/lib/spack/spack/test/reporters.py b/lib/spack/spack/test/reporters.py index d1a78f6d7e4..72fb8ddd522 100644 --- a/lib/spack/spack/test/reporters.py +++ b/lib/spack/spack/test/reporters.py @@ -10,7 +10,6 @@ import llnl.util.tty as tty import spack.reporters.extract -import spack.spec from spack.install_test import TestStatus from spack.reporters import CDash, CDashConfiguration diff --git a/lib/spack/spack/test/sbang.py b/lib/spack/spack/test/sbang.py index e409f49c61b..24cc098d697 100644 --- a/lib/spack/spack/test/sbang.py +++ b/lib/spack/spack/test/sbang.py @@ -18,7 +18,6 @@ import llnl.util.filesystem as fs import spack.hooks.sbang as sbang -import spack.paths import spack.store import spack.util.spack_yaml as syaml from spack.util.executable import which diff --git a/lib/spack/spack/test/solver/intermediate.py b/lib/spack/spack/test/solver/intermediate.py index 42fdb316aa1..f3d624cbd36 100644 --- a/lib/spack/spack/test/solver/intermediate.py +++ b/lib/spack/spack/test/solver/intermediate.py @@ -6,7 +6,6 @@ import pytest import spack.compilers -import spack.config import spack.spec from spack.concretize import UnavailableCompilerVersionError from spack.solver import asp diff --git a/lib/spack/spack/test/spec_dag.py b/lib/spack/spack/test/spec_dag.py index e66c3e1390c..e0ecfce90a7 100644 --- a/lib/spack/spack/test/spec_dag.py +++ b/lib/spack/spack/test/spec_dag.py @@ -9,7 +9,6 @@ import spack.deptypes as dt import spack.error -import spack.package_base import spack.parser import spack.repo import spack.util.hash as hashutil diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index affa69e48ca..33bb9bdf7b3 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -12,7 +12,6 @@ import spack.cmd import spack.platforms.test import spack.spec -import spack.variant from spack.parser import ( UNIX_FILENAME, WINDOWS_FILENAME, diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py index 084d95475cf..63cd20eb2aa 100644 --- a/lib/spack/spack/test/stage.py +++ b/lib/spack/spack/test/stage.py @@ -19,7 +19,6 @@ import spack.error import spack.fetch_strategy -import spack.paths import spack.stage import spack.util.executable import spack.util.url as url_util diff --git a/lib/spack/spack/test/svn_fetch.py b/lib/spack/spack/test/svn_fetch.py index 0b375000143..de47864fc24 100644 --- a/lib/spack/spack/test/svn_fetch.py +++ b/lib/spack/spack/test/svn_fetch.py @@ -10,7 +10,6 @@ from llnl.util.filesystem import mkdirp, touch, working_dir import spack.config -import spack.repo from spack.fetch_strategy import SvnFetchStrategy from spack.spec import Spec from spack.stage import Stage diff --git a/lib/spack/spack/test/tag.py b/lib/spack/spack/test/tag.py index 6a979eca4b6..1d493d3a791 100644 --- a/lib/spack/spack/test/tag.py +++ b/lib/spack/spack/test/tag.py @@ -7,7 +7,6 @@ import pytest -import spack.cmd.install import spack.tag from spack.main import SpackCommand diff --git a/lib/spack/spack/test/url_fetch.py b/lib/spack/spack/test/url_fetch.py index b86a2f5cce1..ff7e4a142e8 100644 --- a/lib/spack/spack/test/url_fetch.py +++ b/lib/spack/spack/test/url_fetch.py @@ -17,7 +17,6 @@ import spack.config import spack.error import spack.fetch_strategy as fs -import spack.repo import spack.util.crypto as crypto import spack.util.executable import spack.util.web as web_util diff --git a/lib/spack/spack/test/util/spack_lock_wrapper.py b/lib/spack/spack/test/util/spack_lock_wrapper.py index 9838324a03e..bf162627f53 100644 --- a/lib/spack/spack/test/util/spack_lock_wrapper.py +++ b/lib/spack/spack/test/util/spack_lock_wrapper.py @@ -10,7 +10,7 @@ from llnl.util.filesystem import getuid, group_ids -import spack.config +import spack.error import spack.util.lock as lk diff --git a/lib/spack/spack/test/web.py b/lib/spack/spack/test/web.py index 1ae76c6e8db..8998d89efc5 100644 --- a/lib/spack/spack/test/web.py +++ b/lib/spack/spack/test/web.py @@ -17,7 +17,6 @@ import spack.mirror import spack.paths import spack.url -import spack.util.path import spack.util.s3 import spack.util.url as url_util import spack.util.web diff --git a/lib/spack/spack/user_environment.py b/lib/spack/spack/user_environment.py index 756b7c09a2f..b5b455fad64 100644 --- a/lib/spack/spack/user_environment.py +++ b/lib/spack/spack/user_environment.py @@ -8,7 +8,6 @@ import spack.build_environment import spack.config -import spack.error import spack.spec import spack.util.environment as environment from spack import traverse diff --git a/lib/spack/spack/util/lock.py b/lib/spack/spack/util/lock.py index 3f6480b26ae..f96145518b2 100644 --- a/lib/spack/spack/util/lock.py +++ b/lib/spack/spack/util/lock.py @@ -19,7 +19,6 @@ from llnl.util.lock import WriteTransaction # noqa: F401 import spack.error -import spack.paths class Lock(llnl.util.lock.Lock): diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index 7a4fd39115a..ab10d561ab6 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -7,11 +7,11 @@ import spack.directives_meta import spack.error +import spack.fetch_strategy import spack.package_base import spack.repo import spack.spec import spack.util.hash -import spack.util.naming from spack.util.unparse import unparse diff --git a/lib/spack/spack/verify.py b/lib/spack/spack/verify.py index 7125481c6d6..9854e8906f4 100644 --- a/lib/spack/spack/verify.py +++ b/lib/spack/spack/verify.py @@ -11,7 +11,6 @@ import llnl.util.tty as tty from llnl.util.symlink import readlink -import spack.filesystem_view import spack.store import spack.util.file_permissions as fp import spack.util.spack_json as sjson diff --git a/lib/spack/spack/version/git_ref_lookup.py b/lib/spack/spack/version/git_ref_lookup.py index 6168fc44a52..e7a3b02ce81 100644 --- a/lib/spack/spack/version/git_ref_lookup.py +++ b/lib/spack/spack/version/git_ref_lookup.py @@ -17,7 +17,6 @@ import spack.util.executable import spack.util.hash import spack.util.spack_json as sjson -import spack.version from .common import VersionLookupError from .lookup import AbstractRefLookup