From f21de698f78af1724805bed5b6d7c0707f5fbbc9 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <me@harmenstoppels.nl>
Date: Thu, 30 Jan 2025 09:18:47 +0100
Subject: [PATCH] builtin: remove redundant imports (#48765)

* builtin: remove redundant llnl.util.filesystem import
* remove redundant import spack.version
* unsorted fixes
* more spack.version
---
 .../builtin/packages/additivefoam/package.py    |  1 -
 .../repos/builtin/packages/gasnet/package.py    |  4 ++--
 .../repos/builtin/packages/gem5/package.py      |  3 +--
 .../repos/builtin/packages/genie/package.py     |  1 -
 .../repos/builtin/packages/gromacs/package.py   |  6 ++----
 .../builtin/packages/hpx-kokkos/package.py      |  4 +---
 .../repos/builtin/packages/julia/package.py     |  1 -
 .../repos/builtin/packages/meme/package.py      |  1 -
 var/spack/repos/builtin/packages/mmg/package.py |  1 -
 .../repos/builtin/packages/nektar/package.py    |  4 +---
 .../builtin/packages/ninja-fortran/package.py   |  3 +--
 .../repos/builtin/packages/octopus/package.py   |  5 ++---
 .../repos/builtin/packages/openmpi/package.py   | 17 ++++++++---------
 .../repos/builtin/packages/papi/package.py      |  4 +---
 .../builtin/packages/py-pythran/package.py      |  4 +---
 .../builtin/packages/python-venv/package.py     |  4 +---
 .../builtin/packages/singularity-eos/package.py |  3 +--
 var/spack/repos/builtin/packages/tcl/package.py |  2 --
 var/spack/repos/builtin/packages/tk/package.py  |  2 --
 19 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/var/spack/repos/builtin/packages/additivefoam/package.py b/var/spack/repos/builtin/packages/additivefoam/package.py
index 5512578bf70..9be606e1fec 100644
--- a/var/spack/repos/builtin/packages/additivefoam/package.py
+++ b/var/spack/repos/builtin/packages/additivefoam/package.py
@@ -9,7 +9,6 @@
 
 import spack.pkg.builtin.openfoam as openfoam
 from spack.package import *
-from spack.version import Version
 
 
 class Additivefoam(Package):
diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py
index 6f938f5f66d..4b169407883 100644
--- a/var/spack/repos/builtin/packages/gasnet/package.py
+++ b/var/spack/repos/builtin/packages/gasnet/package.py
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 import os
+import warnings
 
-import spack.main
 from spack.package import *
 
 
@@ -147,7 +147,7 @@ def install(self, spec, prefix):
                 git = which("git")
                 git("describe", "--long", "--always", output="version.git")
             except ProcessError:
-                spack.main.send_warning_to_tty("Omitting version stamp due to git error")
+                warnings.warn("Omitting version stamp due to git error")
 
         # The GASNet-EX library has a highly multi-dimensional configure space,
         # to accomodate the varying behavioral requirements of each client runtime.
diff --git a/var/spack/repos/builtin/packages/gem5/package.py b/var/spack/repos/builtin/packages/gem5/package.py
index adb258815e6..b39b78f2fe2 100644
--- a/var/spack/repos/builtin/packages/gem5/package.py
+++ b/var/spack/repos/builtin/packages/gem5/package.py
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-import spack.config
 from spack.package import *
 
 
@@ -64,7 +63,7 @@ def install(self, spec, prefix):
     def build_args(self, spec, prefix):
         args = []
         args.append("build/ALL/gem5.opt")
-        args.append(f"-j{spack.config.determine_number_of_jobs(parallel=True)}")
+        args.append(f"-j{determine_number_of_jobs(parallel=True)}")
         args.append("--ignore-style")
 
         return args
diff --git a/var/spack/repos/builtin/packages/genie/package.py b/var/spack/repos/builtin/packages/genie/package.py
index 8cc81e28d96..a49736dee66 100644
--- a/var/spack/repos/builtin/packages/genie/package.py
+++ b/var/spack/repos/builtin/packages/genie/package.py
@@ -6,7 +6,6 @@
 import os
 
 from spack.package import *
-from spack.version import Version
 
 
 class Genie(Package):
diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py
index ea9af54c6cb..4d678131b2b 100644
--- a/var/spack/repos/builtin/packages/gromacs/package.py
+++ b/var/spack/repos/builtin/packages/gromacs/package.py
@@ -4,8 +4,6 @@
 
 import os
 
-import llnl.util.filesystem as fs
-
 import spack.build_systems.cmake
 from spack.package import *
 
@@ -660,7 +658,7 @@ def build_test_binaries(self):
         not be intended with ``--test``.
         """
         if self.pkg.run_tests:
-            with fs.working_dir(self.build_directory):
+            with working_dir(self.build_directory):
                 make("tests")
 
     def check(self):
@@ -669,7 +667,7 @@ def check(self):
         Override the standard CMakeBuilder behavior. GROMACS has both `test`
         and `check` targets, but we are only interested in the latter.
         """
-        with fs.working_dir(self.build_directory):
+        with working_dir(self.build_directory):
             if self.generator == "Unix Makefiles":
                 make("check")
             elif self.generator == "Ninja":
diff --git a/var/spack/repos/builtin/packages/hpx-kokkos/package.py b/var/spack/repos/builtin/packages/hpx-kokkos/package.py
index b23e9891ac2..d634d26abf3 100644
--- a/var/spack/repos/builtin/packages/hpx-kokkos/package.py
+++ b/var/spack/repos/builtin/packages/hpx-kokkos/package.py
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-import llnl.util.filesystem as fs
-
 from spack.package import *
 
 
@@ -95,7 +93,7 @@ def cmake_args(self):
 
     def check(self):
         if self.run_tests:
-            with fs.working_dir(self.build_directory):
+            with working_dir(self.build_directory):
                 cmake("--build", ".", "--target", "tests")
                 cmake("--build", ".", "--target", "benchmarks")
                 ctest("--output-on-failure")
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 1c31fcd9cc4..7a628496575 100644
--- a/var/spack/repos/builtin/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -6,7 +6,6 @@
 import os
 
 from spack.package import *
-from spack.version import ver
 
 
 def get_best_target(microarch, compiler_name, compiler_version):
diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py
index 7ecc81ffeec..e2bf79e2187 100644
--- a/var/spack/repos/builtin/packages/meme/package.py
+++ b/var/spack/repos/builtin/packages/meme/package.py
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack.package import *
-from spack.version import Version
 
 
 class Meme(AutotoolsPackage):
diff --git a/var/spack/repos/builtin/packages/mmg/package.py b/var/spack/repos/builtin/packages/mmg/package.py
index 50383d65641..2bb7df4b2af 100644
--- a/var/spack/repos/builtin/packages/mmg/package.py
+++ b/var/spack/repos/builtin/packages/mmg/package.py
@@ -6,7 +6,6 @@
 
 import spack.build_systems.cmake
 from spack.package import *
-from spack.util.executable import which
 
 
 class Mmg(CMakePackage):
diff --git a/var/spack/repos/builtin/packages/nektar/package.py b/var/spack/repos/builtin/packages/nektar/package.py
index 50e1602a1c4..a48d55b2b0c 100644
--- a/var/spack/repos/builtin/packages/nektar/package.py
+++ b/var/spack/repos/builtin/packages/nektar/package.py
@@ -4,8 +4,6 @@
 
 import os
 
-import llnl.util.filesystem as fs
-
 from spack.package import *
 
 
@@ -167,7 +165,7 @@ def install(self, spec, prefix):
         super(Nektar, self).install(spec, prefix)
         if "+python" in spec:
             python = which("python")
-            with fs.working_dir(self.build_directory):
+            with working_dir(self.build_directory):
                 python("setup.py", "install", "--prefix", prefix)
 
     def setup_run_environment(self, env):
diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py
index 5bb0bb2ea91..54f4dd93bb2 100644
--- a/var/spack/repos/builtin/packages/ninja-fortran/package.py
+++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-import spack.version
 from spack.package import *
 
 
@@ -63,7 +62,7 @@ def url_for_version(self, version):
         split_ver = str(ver).split(".")
         url_version = ".".join(split_ver[:3]) + "." + split_ver[4]
 
-        if version < spack.version.Version("1.8.2.1"):
+        if version < Version("1.8.2.1"):
             url = "https://github.com/Kitware/ninja/archive/v{0}.kitware.dyndep-1.tar.gz"
         else:
             url = (
diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py
index 6e03884c3fb..86fde1094ae 100644
--- a/var/spack/repos/builtin/packages/octopus/package.py
+++ b/var/spack/repos/builtin/packages/octopus/package.py
@@ -4,7 +4,6 @@
 
 import os
 
-import llnl.util.filesystem as fs
 import llnl.util.tty as tty
 
 from spack.package import *
@@ -370,7 +369,7 @@ def test_recipe(self):
 
         with working_dir("example-recipe", create=True):
             print("Current working directory (in example-recipe)")
-            fs.copy(join_path(os.path.dirname(__file__), "test", "recipe.inp"), "inp")
+            copy(join_path(os.path.dirname(__file__), "test", "recipe.inp"), "inp")
             exe = which(self.spec.prefix.bin.octopus)
             out = exe(output=str.split, error=str.split)
             check_outputs(expected, out)
@@ -399,7 +398,7 @@ def test_he(self):
 
         with working_dir("example-he", create=True):
             print("Current working directory (in example-he)")
-            fs.copy(join_path(os.path.dirname(__file__), "test", "he.inp"), "inp")
+            copy(join_path(os.path.dirname(__file__), "test", "he.inp"), "inp")
             exe = which(self.spec.prefix.bin.octopus)
             out = exe(output=str.split, error=str.split)
             check_outputs(expected, out)
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index dbac515db93..b2f7d05ffe2 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -10,7 +10,6 @@
 import llnl.util.tty as tty
 
 import spack.compilers
-import spack.version
 from spack.package import *
 
 
@@ -736,7 +735,7 @@ def determine_variants(cls, exes, version):
                 variants.append("+atomics")
 
             # java
-            if version in spack.version.ver("1.7.4:"):
+            if version in ver("1.7.4:"):
                 match = re.search(r"\bJava bindings: (\S+)", output)
                 if match and is_enabled(match.group(1)):
                     variants.append("+java")
@@ -754,7 +753,7 @@ def determine_variants(cls, exes, version):
                 variants.append("~static")
 
             # sqlite
-            if version in spack.version.ver("1.7.3:1"):
+            if version in ver("1.7.3:1"):
                 if re.search(r"\bMCA db: sqlite", output):
                     variants.append("+sqlite3")
                 else:
@@ -765,7 +764,7 @@ def determine_variants(cls, exes, version):
                 variants.append("+vt")
 
             # thread_multiple
-            if version in spack.version.ver("1.5.4:2"):
+            if version in ver("1.5.4:2"):
                 match = re.search(r"MPI_THREAD_MULTIPLE: (\S+?),?", output)
                 if match and is_enabled(match.group(1)):
                     variants.append("+thread_multiple")
@@ -782,7 +781,7 @@ def determine_variants(cls, exes, version):
                 variants.append("~cuda")
 
             # wrapper-rpath
-            if version in spack.version.ver("1.7.4:"):
+            if version in ver("1.7.4:"):
                 match = re.search(r"\bWrapper compiler rpath: (\S+)", output)
                 if match and is_enabled(match.group(1)):
                     variants.append("+wrapper-rpath")
@@ -790,7 +789,7 @@ def determine_variants(cls, exes, version):
                     variants.append("~wrapper-rpath")
 
             # cxx
-            if version in spack.version.ver(":4"):
+            if version in ver(":4"):
                 match = re.search(r"\bC\+\+ bindings: (\S+)", output)
                 if match and match.group(1) == "yes":
                     variants.append("+cxx")
@@ -798,7 +797,7 @@ def determine_variants(cls, exes, version):
                     variants.append("~cxx")
 
             # cxx_exceptions
-            if version in spack.version.ver(":4"):
+            if version in ver(":4"):
                 match = re.search(r"\bC\+\+ exceptions: (\S+)", output)
                 if match and match.group(1) == "yes":
                     variants.append("+cxx_exceptions")
@@ -806,7 +805,7 @@ def determine_variants(cls, exes, version):
                     variants.append("~cxx_exceptions")
 
             # singularity
-            if version in spack.version.ver(":4"):
+            if version in ver(":4"):
                 if re.search(r"--with-singularity", output):
                     variants.append("+singularity")
 
@@ -822,7 +821,7 @@ def determine_variants(cls, exes, version):
                 variants.append("~memchecker")
 
             # pmi
-            if version in spack.version.ver("1.5.5:4"):
+            if version in ver("1.5.5:4"):
                 if re.search(r"\bMCA (?:ess|prrte): pmi", output):
                     variants.append("+pmi")
                 else:
diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py
index 2d19a9e7958..74aa8627c85 100644
--- a/var/spack/repos/builtin/packages/papi/package.py
+++ b/var/spack/repos/builtin/packages/papi/package.py
@@ -6,8 +6,6 @@
 import os
 import sys
 
-import llnl.util.filesystem as fs
-
 import spack.util.environment
 from spack.package import *
 
@@ -211,7 +209,7 @@ def fix_darwin_install(self):
                 join_path(self.prefix.lib, "libpapi.so"),
                 join_path(self.prefix.lib, "libpapi.dylib"),
             )
-            fs.fix_darwin_install_name(self.prefix.lib)
+            fix_darwin_install_name(self.prefix.lib)
 
     test_src_dir = "src/smoke_tests"
     test_requires_compiler = True
diff --git a/var/spack/repos/builtin/packages/py-pythran/package.py b/var/spack/repos/builtin/packages/py-pythran/package.py
index e45dc4915a3..b259907ca14 100644
--- a/var/spack/repos/builtin/packages/py-pythran/package.py
+++ b/var/spack/repos/builtin/packages/py-pythran/package.py
@@ -4,8 +4,6 @@
 
 import sys
 
-import llnl.util.filesystem as fs
-
 from spack.package import *
 
 
@@ -88,7 +86,7 @@ def headers(self):
         # Pythran is mainly meant to be used as a compiler, so return no headers to
         # avoid issue https://github.com/spack/spack/issues/33237 This can be refined
         # later to allow using pythran also as a library.
-        return fs.HeaderList([])
+        return HeaderList([])
 
     def patch(self):
         # Compiler is used at run-time to determine name of OpenMP library to search for
diff --git a/var/spack/repos/builtin/packages/python-venv/package.py b/var/spack/repos/builtin/packages/python-venv/package.py
index d08dd646bf5..f085ccbaa48 100644
--- a/var/spack/repos/builtin/packages/python-venv/package.py
+++ b/var/spack/repos/builtin/packages/python-venv/package.py
@@ -5,8 +5,6 @@
 import os
 import shutil
 
-import llnl.util.filesystem as fs
-
 from spack.package import *
 
 
@@ -36,7 +34,7 @@ def add_files_to_view(self, view, merge_map: Dict[str, str], skip_if_exists=True
             # Replace the VIRTUAL_ENV variable in the activate scripts after copying
             if name.lower().startswith("activate"):
                 shutil.copy(src, dst)
-                fs.filter_file(
+                filter_file(
                     self.spec.prefix,
                     os.path.abspath(view.get_projection_for_spec(self.spec)),
                     dst,
diff --git a/var/spack/repos/builtin/packages/singularity-eos/package.py b/var/spack/repos/builtin/packages/singularity-eos/package.py
index d850e358666..a30953631cf 100644
--- a/var/spack/repos/builtin/packages/singularity-eos/package.py
+++ b/var/spack/repos/builtin/packages/singularity-eos/package.py
@@ -5,7 +5,6 @@
 import os
 
 import spack
-import spack.version
 from spack.package import *
 
 
@@ -118,7 +117,7 @@ class SingularityEos(CMakePackage, CudaPackage):
     depends_on("kokkos +wrapper+cuda_lambda", when="+cuda+kokkos")
 
     # fix for older spacks
-    if spack.version.Version(spack.spack_version) >= spack.version.Version("0.17"):
+    if Version(spack.spack_version) >= Version("0.17"):
         depends_on("kokkos-kernels ~shared", when="+kokkos-kernels")
 
     for _flag in list(CudaPackage.cuda_arch_values):
diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py
index c2a9bd65673..5d5419a5c99 100644
--- a/var/spack/repos/builtin/packages/tcl/package.py
+++ b/var/spack/repos/builtin/packages/tcl/package.py
@@ -5,8 +5,6 @@
 import os
 import sys
 
-from llnl.util.filesystem import find_first
-
 import spack.build_systems.autotools
 import spack.build_systems.nmake
 from spack.package import *
diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py
index b4c2bfa02bd..91e461a41b8 100644
--- a/var/spack/repos/builtin/packages/tk/package.py
+++ b/var/spack/repos/builtin/packages/tk/package.py
@@ -4,8 +4,6 @@
 
 import os
 
-from llnl.util.filesystem import find_first
-
 from spack.package import *