diff options
| -rw-r--r-- | lib/spack/spack/container/writers/__init__.py | 5 | ||||
| -rw-r--r-- | lib/spack/spack/mirror.py | 1 | ||||
| -rw-r--r-- | lib/spack/spack/modules/common.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/stage.py | 5 |
4 files changed, 5 insertions, 9 deletions
diff --git a/lib/spack/spack/container/writers/__init__.py b/lib/spack/spack/container/writers/__init__.py index cf186b5764..eabc25d218 100644 --- a/lib/spack/spack/container/writers/__init__.py +++ b/lib/spack/spack/container/writers/__init__.py @@ -308,8 +308,7 @@ class PathContext(tengine.Context): return t.render(**self.to_dict()) -import spack.container.writers.docker # noqa: E402 - # Import after function definition all the modules in this package, # so that registration of writers will happen automatically -import spack.container.writers.singularity # noqa: E402 +from . import docker # noqa: F401 E402 +from . import singularity # noqa: F401 E402 diff --git a/lib/spack/spack/mirror.py b/lib/spack/spack/mirror.py index 8caa272137..02ddeae42a 100644 --- a/lib/spack/spack/mirror.py +++ b/lib/spack/spack/mirror.py @@ -29,7 +29,6 @@ import spack.caches import spack.config import spack.error import spack.fetch_strategy -import spack.mirror import spack.oci.image import spack.repo import spack.spec diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index 5e46ca4c6c..e4f7a197f3 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -46,7 +46,6 @@ import spack.config import spack.deptypes as dt import spack.environment import spack.error -import spack.modules.common import spack.paths import spack.projections as proj import spack.repo @@ -352,7 +351,7 @@ def get_module(module_type, spec, get_full_path, module_set_name="default", requ except spack.repo.UnknownPackageError: upstream, record = spack.store.STORE.db.query_by_spec_hash(spec.dag_hash()) if upstream: - module = spack.modules.common.upstream_module_index.upstream_module(spec, module_type) + module = upstream_module_index.upstream_module(spec, module_type) if not module: return None diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index 752ac42e4e..a8e945e748 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -39,7 +39,6 @@ import spack.mirror import spack.paths import spack.resource import spack.spec -import spack.stage import spack.util.crypto import spack.util.lock import spack.util.path as sup @@ -981,8 +980,8 @@ def interactive_version_filter( data = buffer.getvalue().encode("utf-8") short_hash = hashlib.sha1(data).hexdigest()[:7] - filename = f"{spack.stage.stage_prefix}versions-{short_hash}.txt" - filepath = os.path.join(spack.stage.get_stage_root(), filename) + filename = f"{stage_prefix}versions-{short_hash}.txt" + filepath = os.path.join(get_stage_root(), filename) # Write contents with open(filepath, "wb") as f: |