From e7c9f05cd9c6a4032c40daeda1d62523305fd296 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 17 Jan 2022 05:53:41 -0600 Subject: miniconda: source conda.sh setup script (#28321) --- var/spack/repos/builtin/packages/anaconda2/package.py | 5 +++++ var/spack/repos/builtin/packages/anaconda3/package.py | 5 +++++ var/spack/repos/builtin/packages/conda4aarch64/package.py | 5 +++++ var/spack/repos/builtin/packages/miniconda2/package.py | 5 +++++ var/spack/repos/builtin/packages/miniconda3/package.py | 5 +++++ 5 files changed, 25 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/anaconda2/package.py b/var/spack/repos/builtin/packages/anaconda2/package.py index e9ec66ca64..ff89356ed6 100644 --- a/var/spack/repos/builtin/packages/anaconda2/package.py +++ b/var/spack/repos/builtin/packages/anaconda2/package.py @@ -6,6 +6,7 @@ from os.path import split from spack import * +from spack.util.environment import EnvironmentModifications class Anaconda2(Package): @@ -46,3 +47,7 @@ class Anaconda2(Package): dir, anaconda_script = split(self.stage.archive_file) bash = which('bash') bash(anaconda_script, '-b', '-f', '-p', self.prefix) + + def setup_run_environment(self, env): + filename = self.prefix.etc.join('profile.d').join('conda.sh') + env.extend(EnvironmentModifications.from_sourcing_file(filename)) diff --git a/var/spack/repos/builtin/packages/anaconda3/package.py b/var/spack/repos/builtin/packages/anaconda3/package.py index 90c49aea1c..b7a2aee641 100644 --- a/var/spack/repos/builtin/packages/anaconda3/package.py +++ b/var/spack/repos/builtin/packages/anaconda3/package.py @@ -6,6 +6,7 @@ from os.path import split from spack import * +from spack.util.environment import EnvironmentModifications class Anaconda3(Package): @@ -56,3 +57,7 @@ class Anaconda3(Package): dir, anaconda_script = split(self.stage.archive_file) bash = which('bash') bash(anaconda_script, '-b', '-f', '-p', self.prefix) + + def setup_run_environment(self, env): + filename = self.prefix.etc.join('profile.d').join('conda.sh') + env.extend(EnvironmentModifications.from_sourcing_file(filename)) diff --git a/var/spack/repos/builtin/packages/conda4aarch64/package.py b/var/spack/repos/builtin/packages/conda4aarch64/package.py index 473004d34a..f28c5a2632 100644 --- a/var/spack/repos/builtin/packages/conda4aarch64/package.py +++ b/var/spack/repos/builtin/packages/conda4aarch64/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * +from spack.util.environment import EnvironmentModifications class Conda4aarch64(Package): @@ -22,3 +23,7 @@ class Conda4aarch64(Package): conda_script = self.stage.archive_file bash = which('bash') bash(conda_script, '-b', '-f', '-p', self.prefix) + + def setup_run_environment(self, env): + filename = self.prefix.etc.join('profile.d').join('conda.sh') + env.extend(EnvironmentModifications.from_sourcing_file(filename)) diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index 5e9876b5a5..4488ff669a 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -6,6 +6,7 @@ from os.path import split from spack import * +from spack.util.environment import EnvironmentModifications class Miniconda2(Package): @@ -28,3 +29,7 @@ class Miniconda2(Package): dir, script = split(self.stage.archive_file) bash = which('bash') bash(script, '-b', '-f', '-p', self.prefix) + + def setup_run_environment(self, env): + filename = self.prefix.etc.join('profile.d').join('conda.sh') + env.extend(EnvironmentModifications.from_sourcing_file(filename)) diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index 4d27b4978a..63900b4ee9 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -7,6 +7,7 @@ import platform from os.path import split from spack import * +from spack.util.environment import EnvironmentModifications _versions = { '4.10.3': { @@ -50,3 +51,7 @@ class Miniconda3(Package): dir, script = split(self.stage.archive_file) bash = which('bash') bash(script, '-b', '-f', '-p', self.prefix) + + def setup_run_environment(self, env): + filename = self.prefix.etc.join('profile.d').join('conda.sh') + env.extend(EnvironmentModifications.from_sourcing_file(filename)) -- cgit v1.2.3-60-g2f50