From 2153f6056de898e461a78f4739187f0d8127c619 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 11 Jul 2024 10:49:29 +0200 Subject: checksum: fix circular imports on macOS (#45187) --- lib/spack/spack/compiler.py | 1 - lib/spack/spack/compilers/__init__.py | 2 +- lib/spack/spack/config.py | 1 - lib/spack/spack/repo.py | 6 +++--- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 1a2ee36c88..13049883e7 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -18,7 +18,6 @@ import llnl.util.lang import llnl.util.tty as tty from llnl.util.filesystem import path_contains_subdirectory, paths_containing_libs -import spack.compilers import spack.error import spack.schema.environment import spack.spec diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index 3105616425..9712b63077 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -488,7 +488,7 @@ def supported_compilers_for_host_platform() -> List[str]: return supported_compilers_for_platform(host_plat) -def supported_compilers_for_platform(platform: spack.platforms.Platform) -> List[str]: +def supported_compilers_for_platform(platform: "spack.platforms.Platform") -> List[str]: """Return a set of compiler class objects supported by Spack that are also supported by the provided platform diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 100e11f0a0..8c84af00e8 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -39,7 +39,6 @@ from typing import Any, Callable, Dict, Generator, List, Optional, Tuple, Union from llnl.util import filesystem, lang, tty -import spack.compilers import spack.paths import spack.platforms import spack.schema diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index 8fe587d3fd..4f42ead467 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -590,7 +590,7 @@ class RepoIndex: self, package_checker: FastPackageChecker, namespace: str, - cache: spack.caches.FileCacheType, + cache: "spack.caches.FileCacheType", ): self.checker = package_checker self.packages_path = self.checker.packages_path @@ -683,7 +683,7 @@ class RepoPath: def __init__( self, *repos: Union[str, "Repo"], - cache: spack.caches.FileCacheType, + cache: "spack.caches.FileCacheType", overrides: Optional[Dict[str, Any]] = None, ) -> None: self.repos: List[Repo] = [] @@ -950,7 +950,7 @@ class Repo: self, root: str, *, - cache: spack.caches.FileCacheType, + cache: "spack.caches.FileCacheType", overrides: Optional[Dict[str, Any]] = None, ) -> None: """Instantiate a package repository from a filesystem path. -- cgit v1.2.3-70-g09d2