Skip to content

Commit f64c8ed

Browse files
author
Christoph Paulik
committed
Set CONDA_PREFIX to make is useable in conda activate/deactivate scripts.
1 parent e4d2c36 commit f64c8ed

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

bin/pyenv-sh-activate

+2
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ if [ -x "${prefix}/bin/conda" ]; then
240240
: # conda doesn't support fish
241241
;;
242242
* )
243+
CONDA_PREFIX="$prefix"
244+
echo "export CONDA_PREFIX=\"${CONDA_PREFIX}\";"
243245
for script in "${prefix}/etc/conda/activate.d"/*.sh; do
244246
echo ". \"${script}\";"
245247
done

bin/pyenv-sh-deactivate

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ if [ -x "${prefix}/bin/conda" ]; then
6969
for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do
7070
echo ". \"${script}\";"
7171
done
72+
echo "unset CONDA_PREFIX"
7273
;;
7374
esac
7475
shopt -u nullglob

test/conda-activate.bats

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export CONDA_DEFAULT_ENV="root";
3939
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
4040
export _OLD_VIRTUAL_PS1="\${PS1}";
4141
export PS1="(anaconda-2.3.0) \${PS1}";
42+
export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0";
4243
EOS
4344

4445
unstub pyenv-version-name
@@ -97,6 +98,7 @@ export CONDA_DEFAULT_ENV="root";
9798
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
9899
export _OLD_VIRTUAL_PS1="\${PS1}";
99100
export PS1="(miniconda-3.9.1) \${PS1}";
101+
export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1";
100102
EOS
101103

102104
unstub pyenv-virtualenv-prefix
@@ -126,6 +128,7 @@ export CONDA_DEFAULT_ENV="foo";
126128
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
127129
export _OLD_VIRTUAL_PS1="\${PS1}";
128130
export PS1="(anaconda-2.3.0/envs/foo) \${PS1}";
131+
export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0/envs/foo";
129132
. "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/activate.d/activate.sh";
130133
EOS
131134

@@ -158,6 +161,7 @@ export CONDA_DEFAULT_ENV="bar";
158161
pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
159162
export _OLD_VIRTUAL_PS1="\${PS1}";
160163
export PS1="(miniconda-3.9.1/envs/bar) \${PS1}";
164+
export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1/envs/bar";
161165
. "${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar/etc/conda/activate.d/activate.sh";
162166
EOS
163167

test/conda-deactivate.bats

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ setup() {
3030

3131
assert_success
3232
assert_output <<EOS
33+
unset CONDA_PREFIX
3334
unset PYENV_VIRTUAL_ENV;
3435
unset VIRTUAL_ENV;
3536
unset CONDA_DEFAULT_ENV;
@@ -97,6 +98,7 @@ EOS
9798
assert_success
9899
assert_output <<EOS
99100
. "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/deactivate.d/deactivate.sh";
101+
unset CONDA_PREFIX
100102
unset PYENV_VIRTUAL_ENV;
101103
unset VIRTUAL_ENV;
102104
unset CONDA_DEFAULT_ENV;

0 commit comments

Comments
 (0)