diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index a7eb54734e4..910ba1b62e1 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -60,7 +60,6 @@ class tty: ) from llnl.util.symlink import symlink -# These props will be overridden when the build env is set up. from spack.build_environment import MakeExecutable from spack.build_systems.aspell_dict import AspellDictPackage from spack.build_systems.autotools import AutotoolsPackage @@ -147,8 +146,10 @@ class tty: ) from spack.phase_callbacks import run_after, run_before from spack.spec import Spec +from spack.util.environment import EnvironmentModifications from spack.util.executable import Executable, ProcessError, which, which_string from spack.util.filesystem import fix_darwin_install_name +from spack.util.prefix import Prefix from spack.variant import any_combination_of, auto_or_any_combination_of, disjoint_sets from spack.version import Version, ver diff --git a/var/spack/repos/builtin/packages/anaconda3/package.py b/var/spack/repos/builtin/packages/anaconda3/package.py index 6c7505d41a0..06cdd527f8f 100644 --- a/var/spack/repos/builtin/packages/anaconda3/package.py +++ b/var/spack/repos/builtin/packages/anaconda3/package.py @@ -6,7 +6,6 @@ from os.path import split from spack.package import * -from spack.util.environment import EnvironmentModifications class Anaconda3(Package): diff --git a/var/spack/repos/builtin/packages/aocl-da/package.py b/var/spack/repos/builtin/packages/aocl-da/package.py index cf61b5e2623..53beca51837 100644 --- a/var/spack/repos/builtin/packages/aocl-da/package.py +++ b/var/spack/repos/builtin/packages/aocl-da/package.py @@ -5,7 +5,6 @@ import os from spack.package import * -from spack.util.environment import EnvironmentModifications class AoclDa(CMakePackage): diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index a643867d631..e26df820a09 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -8,7 +8,6 @@ import spack.user_environment from spack.package import * from spack.pkg.builtin.clingo import Clingo -from spack.util.environment import EnvironmentModifications class ClingoBootstrap(Clingo): diff --git a/var/spack/repos/builtin/packages/conda4aarch64/package.py b/var/spack/repos/builtin/packages/conda4aarch64/package.py index 595b631dfe4..dc0f0e79c2d 100644 --- a/var/spack/repos/builtin/packages/conda4aarch64/package.py +++ b/var/spack/repos/builtin/packages/conda4aarch64/package.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * -from spack.util.environment import EnvironmentModifications class Conda4aarch64(Package): diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index f44601aea27..1dccd39b69a 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -39,7 +39,6 @@ rewrite_environ_files, write_environ, ) -from spack.util.environment import EnvironmentModifications class FoamExtend(Package): diff --git a/var/spack/repos/builtin/packages/freesurfer/package.py b/var/spack/repos/builtin/packages/freesurfer/package.py index 91b310c3a17..1d9be48082a 100644 --- a/var/spack/repos/builtin/packages/freesurfer/package.py +++ b/var/spack/repos/builtin/packages/freesurfer/package.py @@ -6,7 +6,6 @@ import os from spack.package import * -from spack.util.environment import EnvironmentModifications class Freesurfer(Package): diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py index f29c854d26c..058e1b4449a 100644 --- a/var/spack/repos/builtin/packages/fsl/package.py +++ b/var/spack/repos/builtin/packages/fsl/package.py @@ -7,7 +7,6 @@ import spack.util.environment from spack.package import * -from spack.util.environment import EnvironmentModifications class Fsl(Package, CudaPackage): diff --git a/var/spack/repos/builtin/packages/heasoft/package.py b/var/spack/repos/builtin/packages/heasoft/package.py index ed4b2071541..f87cc8bd205 100644 --- a/var/spack/repos/builtin/packages/heasoft/package.py +++ b/var/spack/repos/builtin/packages/heasoft/package.py @@ -5,7 +5,6 @@ import os from spack.package import * -from spack.util.environment import EnvironmentModifications class Heasoft(AutotoolsPackage): diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 0ab849f25dc..438f940ec35 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -8,7 +8,6 @@ import spack.build_environment from spack.hooks.sbang import filter_shebang from spack.package import * -from spack.util.prefix import Prefix class Hip(CMakePackage): diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py index 7cef56e7ccb..4e7dfdf634e 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py @@ -7,7 +7,6 @@ from spack.build_environment import dso_suffix from spack.package import * -from spack.util.environment import EnvironmentModifications versions = [ { diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index a30717532c6..be4d8ccbc69 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -6,7 +6,6 @@ import re from spack.package import * -from spack.util.prefix import Prefix class Jdk(Package): diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index 9ad5c1e5f60..e9d7c632965 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -5,7 +5,6 @@ from os.path import split from spack.package import * -from spack.util.environment import EnvironmentModifications class Miniconda2(Package): diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index 79c85415ee5..0bf8099bc43 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -6,7 +6,6 @@ from os.path import split from spack.package import * -from spack.util.environment import EnvironmentModifications _versions = { "24.7.1": { diff --git a/var/spack/repos/builtin/packages/miniforge3/package.py b/var/spack/repos/builtin/packages/miniforge3/package.py index a9865ddec7f..e4157bf13ae 100644 --- a/var/spack/repos/builtin/packages/miniforge3/package.py +++ b/var/spack/repos/builtin/packages/miniforge3/package.py @@ -6,7 +6,6 @@ from os.path import split from spack.package import * -from spack.util.environment import EnvironmentModifications _versions = { "24.3.0-0": { diff --git a/var/spack/repos/builtin/packages/nvhpc/package.py b/var/spack/repos/builtin/packages/nvhpc/package.py index 228bfcab8aa..fe530a289ae 100644 --- a/var/spack/repos/builtin/packages/nvhpc/package.py +++ b/var/spack/repos/builtin/packages/nvhpc/package.py @@ -7,7 +7,6 @@ import platform from spack.package import * -from spack.util.prefix import Prefix # FIXME Remove hack for polymorphic versions # This package uses a ugly hack to be able to dispatch, given the same diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 1525e613bac..ac3b21a0af7 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -46,7 +46,6 @@ rewrite_environ_files, write_environ, ) -from spack.util.environment import EnvironmentModifications class OpenfoamOrg(Package): diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 7cba440b2ed..90cb3c784ff 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -45,7 +45,6 @@ from spack.package import * from spack.pkg.builtin.boost import Boost -from spack.util.environment import EnvironmentModifications # Not the nice way of doing things, but is a start for refactoring __all__ = [ diff --git a/var/spack/repos/builtin/packages/openjdk/package.py b/var/spack/repos/builtin/packages/openjdk/package.py index 932ba1080b5..bc07e1e2341 100644 --- a/var/spack/repos/builtin/packages/openjdk/package.py +++ b/var/spack/repos/builtin/packages/openjdk/package.py @@ -7,7 +7,6 @@ import re from spack.package import * -from spack.util.prefix import Prefix # If you need to add a new version, please be aware that: # - versions in the following dict are automatically added to the package diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 49c7fb29b46..d88f1f88595 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -17,7 +17,6 @@ import spack.paths from spack.build_environment import dso_suffix, stat_suffix from spack.package import * -from spack.util.prefix import Prefix def make_pyvenv_cfg(python_spec: Spec, venv_prefix: str) -> str: diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 25bba5a8ecd..84ee0027665 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -6,7 +6,6 @@ import os import sys -import spack.util.environment from spack.operating_systems.mac_os import macos_version from spack.package import * from spack.util.environment import is_system_path @@ -848,9 +847,7 @@ def setup_run_environment(self, env): if "+rpath" not in self.spec: env.prepend_path(self.root_library_path, self.prefix.lib.root) - def setup_dependent_build_environment( - self, env: spack.util.environment.EnvironmentModifications, dependent_spec - ): + def setup_dependent_build_environment(self, env: EnvironmentModifications, dependent_spec): env.set("ROOTSYS", self.prefix) env.set("ROOT_VERSION", "v{0}".format(self.version.up_to(1))) env.prepend_path("PYTHONPATH", self.prefix.lib.root) @@ -863,9 +860,7 @@ def setup_dependent_build_environment( # Newer deployment targets cause fatal errors in rootcling env.unset("MACOSX_DEPLOYMENT_TARGET") - def setup_dependent_run_environment( - self, env: spack.util.environment.EnvironmentModifications, dependent_spec - ): + def setup_dependent_run_environment(self, env: EnvironmentModifications, dependent_spec): env.prepend_path("ROOT_INCLUDE_PATH", dependent_spec.prefix.include) # For dependents that build dictionaries, ROOT needs to know where the # dictionaries have been installed. This can be facilitated by