Update deprecated imports (#634)

* Update deprecated imports.

* Fix deprecated import.

* Fix deprecated imports.

* Remove tests for old Spack versions.

* Fix import ordering.

* Fix import ordering.

Author: jrood-nrel

.github/workflows/tests.yml

@@ -19,10 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.8, 3.9, 3.12]
-        spack-version: [v0.20.3, v0.21.2, v0.22.5, v0.23.1, develop]
-        exclude:
-          - python-version: 3.12
-            spack-version: v0.20.3
+        spack-version: [develop]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -88,10 +85,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.8, 3.9]
-        spack-version: [v0.20.3, v0.21.2, v0.22.0, v0.22.1, develop]
-        exclude:
-          - python-version: 3.12
-            spack-version: v0.20.3
+        spack-version: [develop]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -120,4 +114,3 @@ jobs:
         quick-create --dir unmanaged -s zlib
         spack env deactivate
         quick-create-dev --name develop -s [email protected]
-        

install.py

@@ -16,8 +16,7 @@
 import os
 import sys
 
-import llnl.util.tty as tty
-
+import spack.llnl.util.tty as tty
 import spack.main
 
 spec = importlib.util.spec_from_file_location(

manager/__init__.py

@@ -12,9 +12,8 @@
 """
 import os
 
-import llnl.util.filesystem as fs
-import llnl.util.tty as tty
-
+import spack.llnl.util.filesystem as fs
+import spack.llnl.util.tty as tty
 import spack.util.spack_yaml as syaml
 
 _default_config = """

manager/manager_cmds/develop.py

@@ -8,9 +8,8 @@
 import os
 import shutil
 
-import llnl.util.tty as tty
-
 import spack.cmd
+import spack.llnl.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

manager/manager_cmds/external.py

@@ -7,11 +7,10 @@
 
 import os
 
-import llnl.util.tty as tty
-
 import spack
 import spack.config
 import spack.environment as ev
+import spack.llnl.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

manager/manager_cmds/include.py

@@ -8,9 +8,8 @@
 import os
 import sys
 
-import llnl.util.tty as tty
-
 import spack.extensions.manager.projects as projects
+import spack.llnl.util.tty as tty
 from spack.extensions.manager.manager_cmds.find_machine import find_machine, machine_defined
 from spack.extensions.manager.manager_cmds.includes_creator import IncludesCreator
 

manager/manager_cmds/includes_creator.py

@@ -9,7 +9,7 @@
 
 import os
 
-import _vendoring.ruamel.yaml as yaml
+import spack.vendor.ruamel.yaml as yaml
 
 import spack.config
 import spack.util.spack_yaml as syaml

manager/manager_cmds/lock_diff.py

@@ -11,9 +11,8 @@
 import string
 import sys
 
-import llnl.util.tty as tty
-
 import spack.environment as ev
+import spack.llnl.util.tty as tty
 from spack.spec import Spec
 
 command_name = "lock-diff"

manager/manager_cmds/make.py

@@ -7,13 +7,12 @@
 
 import os
 
-import llnl.util.tty as tty
-from llnl.util.filesystem import working_dir
-
 import spack.build_environment as build_environment
 import spack.builder
 import spack.cmd
+import spack.llnl.util.tty as tty
 import spack.paths
+from spack.llnl.util.filesystem import working_dir
 from spack.util.executable import Executable
 
 """

manager/manager_cmds/pin.py

@@ -10,8 +10,7 @@
 """
 import os
 
-import llnl.util.tty as tty
-
+import spack.llnl.util.tty as tty
 import spack.main
 import spack.traverse as traverse
 import spack.util.executable