checksum: fix circular imports on macOS (#45187)

This commit is contained in:
Massimiliano Culpo 2024-07-11 10:49:29 +02:00 committed by GitHub
parent 2be9b41362
commit 2153f6056d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 6 deletions

View File

@ -18,7 +18,6 @@
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.filesystem import path_contains_subdirectory, paths_containing_libs from llnl.util.filesystem import path_contains_subdirectory, paths_containing_libs
import spack.compilers
import spack.error import spack.error
import spack.schema.environment import spack.schema.environment
import spack.spec import spack.spec

View File

@ -488,7 +488,7 @@ def supported_compilers_for_host_platform() -> List[str]:
return supported_compilers_for_platform(host_plat) 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 """Return a set of compiler class objects supported by Spack
that are also supported by the provided platform that are also supported by the provided platform

View File

@ -39,7 +39,6 @@
from llnl.util import filesystem, lang, tty from llnl.util import filesystem, lang, tty
import spack.compilers
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.schema import spack.schema

View File

@ -590,7 +590,7 @@ def __init__(
self, self,
package_checker: FastPackageChecker, package_checker: FastPackageChecker,
namespace: str, namespace: str,
cache: spack.caches.FileCacheType, cache: "spack.caches.FileCacheType",
): ):
self.checker = package_checker self.checker = package_checker
self.packages_path = self.checker.packages_path self.packages_path = self.checker.packages_path
@ -683,7 +683,7 @@ class RepoPath:
def __init__( def __init__(
self, self,
*repos: Union[str, "Repo"], *repos: Union[str, "Repo"],
cache: spack.caches.FileCacheType, cache: "spack.caches.FileCacheType",
overrides: Optional[Dict[str, Any]] = None, overrides: Optional[Dict[str, Any]] = None,
) -> None: ) -> None:
self.repos: List[Repo] = [] self.repos: List[Repo] = []
@ -950,7 +950,7 @@ def __init__(
self, self,
root: str, root: str,
*, *,
cache: spack.caches.FileCacheType, cache: "spack.caches.FileCacheType",
overrides: Optional[Dict[str, Any]] = None, overrides: Optional[Dict[str, Any]] = None,
) -> None: ) -> None:
"""Instantiate a package repository from a filesystem path. """Instantiate a package repository from a filesystem path.