From aabc0d56b149b5d2fe626da8aa4e6322646966cd Mon Sep 17 00:00:00 2001 From: Andrew Kimler Date: Tue, 7 Jul 2026 13:26:55 -0600 Subject: [PATCH 1/3] Arrange llnl imports to be used as the first attempt and the new imports as the fallback --- install.py | 5 ++++- manager/__init__.py | 4 ++-- manager/manager_cmds/develop.py | 5 ++++- manager/manager_cmds/distribution.py | 7 +++++-- manager/manager_cmds/external.py | 5 ++++- manager/manager_cmds/include.py | 5 ++++- manager/manager_cmds/lock_diff.py | 5 ++++- manager/manager_cmds/make.py | 7 +++++-- manager/manager_cmds/pin.py | 5 ++++- manager/projects.py | 4 ++-- 10 files changed, 38 insertions(+), 14 deletions(-) diff --git a/install.py b/install.py index 524a411d..ea581d01 100755 --- a/install.py +++ b/install.py @@ -16,7 +16,10 @@ import os import sys -import spack.llnl.util.tty as tty +try: + import spack.llnl.util.tty as tty +except ImportError: + import spack.util.tty as tty import spack.main spec = importlib.util.spec_from_file_location( diff --git a/manager/__init__.py b/manager/__init__.py index e4965c44..6c06d2b6 100644 --- a/manager/__init__.py +++ b/manager/__init__.py @@ -17,9 +17,9 @@ import spack.util.spack_yaml as syaml try: - import spack.util.filesystem as fs -except ImportError: import spack.llnl.util.filesystem as fs +except ImportError: + import spack.util.filesystem as fs _default_config = """ diff --git a/manager/manager_cmds/develop.py b/manager/manager_cmds/develop.py index eab39098..ae710c6f 100644 --- a/manager/manager_cmds/develop.py +++ b/manager/manager_cmds/develop.py @@ -9,7 +9,10 @@ import shutil import spack.cmd -import spack.llnl.util.tty as tty +try: + import spack.llnl.util.tty as tty +except ImportError: + import spack.util.tty as tty import spack.util.executable from spack.cmd.develop import develop as s_develop from spack.cmd.develop import setup_parser as s_setup_parser diff --git a/manager/manager_cmds/distribution.py b/manager/manager_cmds/distribution.py index 726f6f24..09b9ecf1 100644 --- a/manager/manager_cmds/distribution.py +++ b/manager/manager_cmds/distribution.py @@ -16,10 +16,13 @@ import spack.extensions try: + import spack.llnl.util.filesystem as fs +except ImportError: import spack.util.filesystem as fs +try: + import spack.llnl.util.tty as tty except ImportError: - import spack.llnl.util.filesystem as fs -import spack.llnl.util.tty as tty + import spack.util.tty as tty import spack.main import spack.solver.asp import spack.spec diff --git a/manager/manager_cmds/external.py b/manager/manager_cmds/external.py index d75c4df2..5db951e4 100644 --- a/manager/manager_cmds/external.py +++ b/manager/manager_cmds/external.py @@ -10,7 +10,10 @@ import spack import spack.config import spack.environment as ev -import spack.llnl.util.tty as tty +try: + import spack.llnl.util.tty as tty +except ImportError: + import spack.util.tty as tty import spack.util.spack_yaml as syaml from spack.detection.common import _pkg_config_dict from spack.extensions.manager.environment_utils import SpackManagerEnvironmentManifest diff --git a/manager/manager_cmds/include.py b/manager/manager_cmds/include.py index b98aba65..db25a069 100644 --- a/manager/manager_cmds/include.py +++ b/manager/manager_cmds/include.py @@ -8,7 +8,10 @@ import os import sys -import spack.llnl.util.tty as tty +try: + import spack.llnl.util.tty as tty +except ImportError: + import spack.util.tty as tty from .. import projects from .find_machine import find_machine, machine_defined diff --git a/manager/manager_cmds/lock_diff.py b/manager/manager_cmds/lock_diff.py index a2a50a8a..1c528e27 100644 --- a/manager/manager_cmds/lock_diff.py +++ b/manager/manager_cmds/lock_diff.py @@ -12,7 +12,10 @@ import sys import spack.environment as ev -import spack.llnl.util.tty as tty +try: + import spack.llnl.util.tty as tty +except ImportError: + import spack.util.tty as tty from spack.spec import Spec command_name = "lock-diff" diff --git a/manager/manager_cmds/make.py b/manager/manager_cmds/make.py index 9ecab134..1273f47a 100644 --- a/manager/manager_cmds/make.py +++ b/manager/manager_cmds/make.py @@ -13,10 +13,13 @@ import spack.paths try: + from spack.llnl.util.filesystem import working_dir +except ImportError: from spack.util.filesystem import working_dir +try: + import spack.llnl.util.tty as tty except ImportError: - from spack.llnl.util.filesystem import working_dir -import spack.llnl.util.tty as tty + import spack.util.tty as tty from spack.util.executable import Executable """ diff --git a/manager/manager_cmds/pin.py b/manager/manager_cmds/pin.py index 45e73c17..b4999be6 100644 --- a/manager/manager_cmds/pin.py +++ b/manager/manager_cmds/pin.py @@ -12,7 +12,10 @@ import os import spack.cmd -import spack.llnl.util.tty as tty +try: + import spack.llnl.util.tty as tty +except ImportError: + import spack.util.tty as tty import spack.main import spack.traverse as traverse import spack.util.executable diff --git a/manager/projects.py b/manager/projects.py index 20334d7f..e488e0bf 100644 --- a/manager/projects.py +++ b/manager/projects.py @@ -7,9 +7,9 @@ import os try: - import spack.util.lang as lang -except ImportError: import spack.llnl.util.lang as lang +except ImportError: + import spack.util.lang as lang from . import config_yaml from .manager_utils import canonicalize_path From 9e695835d91e1db78d1049ce4609bb78e812bd88 Mon Sep 17 00:00:00 2001 From: Andrew Kimler Date: Tue, 7 Jul 2026 13:37:23 -0600 Subject: [PATCH 2/3] Fix remaining llnl import --- manager/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manager/__init__.py b/manager/__init__.py index 6c06d2b6..2ac5308a 100644 --- a/manager/__init__.py +++ b/manager/__init__.py @@ -13,7 +13,10 @@ import os -import spack.llnl.util.tty as tty +try: + import spack.llnl.util.tty as tty +except ImportError: + import spack.util.tty as tty import spack.util.spack_yaml as syaml try: From ef31d3350f674d63ef7c6d9d35f45d42a4d34641 Mon Sep 17 00:00:00 2001 From: Andrew Kimler Date: Tue, 7 Jul 2026 14:07:24 -0600 Subject: [PATCH 3/3] Use ruff formatter --- manager/manager_cmds/develop.py | 1 + manager/manager_cmds/external.py | 1 + manager/manager_cmds/lock_diff.py | 1 + manager/manager_cmds/pin.py | 1 + 4 files changed, 4 insertions(+) diff --git a/manager/manager_cmds/develop.py b/manager/manager_cmds/develop.py index ae710c6f..bb79c7b3 100644 --- a/manager/manager_cmds/develop.py +++ b/manager/manager_cmds/develop.py @@ -9,6 +9,7 @@ import shutil import spack.cmd + try: import spack.llnl.util.tty as tty except ImportError: diff --git a/manager/manager_cmds/external.py b/manager/manager_cmds/external.py index 5db951e4..f9975b98 100644 --- a/manager/manager_cmds/external.py +++ b/manager/manager_cmds/external.py @@ -10,6 +10,7 @@ import spack import spack.config import spack.environment as ev + try: import spack.llnl.util.tty as tty except ImportError: diff --git a/manager/manager_cmds/lock_diff.py b/manager/manager_cmds/lock_diff.py index 1c528e27..d351fa00 100644 --- a/manager/manager_cmds/lock_diff.py +++ b/manager/manager_cmds/lock_diff.py @@ -12,6 +12,7 @@ import sys import spack.environment as ev + try: import spack.llnl.util.tty as tty except ImportError: diff --git a/manager/manager_cmds/pin.py b/manager/manager_cmds/pin.py index b4999be6..4c2ab019 100644 --- a/manager/manager_cmds/pin.py +++ b/manager/manager_cmds/pin.py @@ -12,6 +12,7 @@ import os import spack.cmd + try: import spack.llnl.util.tty as tty except ImportError: