diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-03-13 16:51:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-13 11:51:55 -0400 |
| commit | a6eed4a7c7cbf067c061f982b9ae6c2675c990bc (patch) | |
| tree | 0db53736cae0155146917748d0fa54e8de827f1a /lib | |
| parent | 406939f485b4f5c09b73f53c9d4ffc4019b8319a (diff) | |
| download | spack-a6eed4a7c7cbf067c061f982b9ae6c2675c990bc.tar.gz spack-a6eed4a7c7cbf067c061f982b9ae6c2675c990bc.tar.bz2 spack-a6eed4a7c7cbf067c061f982b9ae6c2675c990bc.tar.xz spack-a6eed4a7c7cbf067c061f982b9ae6c2675c990bc.zip | |
Remove "setup_environment" and "setup_dependent_environment" (#29463)
fixes #29446
The new setup_*_environment functions have been falling back
to calling the old functions and warn the user since #11115.
This commit removes the fallback behavior and any use of:
- setup_environment
- setup_dependent_environment
in the codebase
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/package.py | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 84c151bc99..dc989679d8 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -2040,17 +2040,6 @@ class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)): """ return (None, None, flags) - def _get_legacy_environment_method(self, method_name): - legacy_fn = getattr(self, method_name, None) - name_prefix = method_name.split('_environment')[0] - if legacy_fn: - msg = '[DEPRECATED METHOD]\n"{0}" ' \ - 'still defines the deprecated method "{1}" ' \ - '[should be split into "{2}_build_environment" and ' \ - '"{2}_run_environment"]' - tty.debug(msg.format(self.name, method_name, name_prefix)) - return legacy_fn - def setup_build_environment(self, env): """Sets up the build environment for a package. @@ -2062,10 +2051,7 @@ class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)): modifications to be applied when the package is built. Package authors can call methods on it to alter the build environment. """ - legacy_fn = self._get_legacy_environment_method('setup_environment') - if legacy_fn: - _ = spack.util.environment.EnvironmentModifications() - legacy_fn(env, _) + pass def setup_run_environment(self, env): """Sets up the run environment for a package. @@ -2075,10 +2061,7 @@ class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)): modifications to be applied when the package is run. Package authors can call methods on it to alter the run environment. """ - legacy_fn = self._get_legacy_environment_method('setup_environment') - if legacy_fn: - _ = spack.util.environment.EnvironmentModifications() - legacy_fn(_, env) + pass def setup_dependent_build_environment(self, env, dependent_spec): """Sets up the build environment of packages that depend on this one. @@ -2109,12 +2092,7 @@ class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)): the dependent's state. Note that *this* package's spec is available as ``self.spec`` """ - legacy_fn = self._get_legacy_environment_method( - 'setup_dependent_environment' - ) - if legacy_fn: - _ = spack.util.environment.EnvironmentModifications() - legacy_fn(env, _, dependent_spec) + pass def setup_dependent_run_environment(self, env, dependent_spec): """Sets up the run environment of packages that depend on this one. @@ -2136,12 +2114,7 @@ class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)): the dependent's state. Note that *this* package's spec is available as ``self.spec`` """ - legacy_fn = self._get_legacy_environment_method( - 'setup_dependent_environment' - ) - if legacy_fn: - _ = spack.util.environment.EnvironmentModifications() - legacy_fn(_, env, dependent_spec) + pass def setup_dependent_package(self, module, dependent_spec): """Set up Python module-scope variables for dependent packages. |