m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-10 12:33:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert PYENV_DEACTIVATE for backward compatibility

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-11-08 08:24:07 +00:00
parent d2edf5dddb
commit bdd52a79cd
6 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/pyenv-sh-activate
View File

@@ -15,6 +15,7 @@ set -e
[ -n "$PYENV_DEBUG" ] && set -x
unset DEACTIVATE
unset FORCE
unset QUIET
unset VERBOSE
@@ -28,6 +29,9 @@ while [ $# -gt 0 ]; do
"--deactivate" )
DEACTIVATE=1
;;
"--force" )
FORCE=1
;;
"--no-error" | "--quiet" )
QUIET=1
;;
@@ -95,6 +99,16 @@ if [[ "${VIRTUAL_ENV}" == "${prefix}" ]]; then
exit 0
fi
if [[ "${PYENV_DEACTIVATE}" == "${prefix}" ]]; then
if [ -z "${FORCE}" ]; then
if [ -z "${QUIET}" ]; then
echo "pyenv-virtualenv: \`${venv}' is marked deactivated. use \`pyenv activate --force ${venv}' to activate forcibly." 1>&2
fi
echo "false"
exit 1
fi
fi
# Display setup instruction, if pyenv-virtualenv has not been initialized.
# if 'pyenv virtualenv-init -' is not found in "$profile"
if [ -z "$PYENV_VIRTUALENV_INIT" ]; then
@@ -132,10 +146,16 @@ fi
# virtualenv/pyvenv
case "${shell}" in
fish )
echo "setenv VIRTUAL_ENV \"${prefix}\";"
cat <<EOS
set -e PYENV_DEACTIVATE;
setenv VIRTUAL_ENV "${prefix}";
EOS
;;
* )
echo "export VIRTUAL_ENV=\"${prefix}\";"
cat <<EOS
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${prefix}";
EOS
;;
esac

14
bin/pyenv-sh-deactivate
View File

@@ -9,11 +9,15 @@
set -e
[ -n "$PYENV_DEBUG" ] && set -x
unset FORCE
unset QUIET
unset VERBOSE
while [ $# -gt 0 ]; do
case "$1" in
"--force" )
FORCE=1
;;
"--no-error" | "--quiet")
QUIET=1
;;
@@ -68,10 +72,16 @@ fi
# virtualenv/pyvenv
case "${shell}" in
fish )
echo "set -e VIRTUAL_ENV;"
cat <<EOS
setenv PYENV_DEACTIVATE "${VIRTUAL_ENV}";
set -e VIRTUAL_ENV;
EOS
;;
* )
echo "unset VIRTUAL_ENV;"
cat <<EOS
export PYENV_DEACTIVATE="${VIRTUAL_ENV}";
unset VIRTUAL_ENV;
EOS
;;
esac

10
test/activate.bats
View File

@@ -23,6 +23,7 @@ setup() {
assert_success
assert_output <<EOS
pyenv-virtualenv: activate venv
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
EOS
}
@@ -43,6 +44,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: activate venv
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
EOS
}
@@ -70,6 +72,7 @@ eval "\$(pyenv virtualenv-init -)"
pyenv-virtualenv: activate venv
export PYENV_VERSION="venv";
export PYENV_ACTIVATE_SHELL=1;
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
EOS
}
@@ -90,6 +93,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: activate venv
set -e PYENV_DEACTIVATE;
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
EOS
}
@@ -117,6 +121,7 @@ status --is-interactive; and . (pyenv virtualenv-init -|psub)
pyenv-virtualenv: activate venv
setenv PYENV_VERSION "venv";
setenv PYENV_ACTIVATE_SHELL 1;
set -e PYENV_DEACTIVATE;
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
EOS
}
@@ -137,6 +142,7 @@ EOS
pyenv-virtualenv: activate venv27
export PYENV_VERSION="venv27";
export PYENV_ACTIVATE_SHELL=1;
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
EOS
}
@@ -162,6 +168,7 @@ eval "\$(pyenv virtualenv-init -)"
pyenv-virtualenv: activate venv27
export PYENV_VERSION="venv27";
export PYENV_ACTIVATE_SHELL=1;
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
EOS
}
@@ -182,6 +189,7 @@ EOS
pyenv-virtualenv: activate venv27
setenv PYENV_VERSION "venv27";
setenv PYENV_ACTIVATE_SHELL 1;
set -e PYENV_DEACTIVATE;
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
EOS
}
@@ -207,6 +215,7 @@ status --is-interactive; and . (pyenv virtualenv-init -|psub)
pyenv-virtualenv: activate venv27
setenv PYENV_VERSION "venv27";
setenv PYENV_ACTIVATE_SHELL 1;
set -e PYENV_DEACTIVATE;
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
EOS
}
@@ -309,6 +318,7 @@ EOS
pyenv-virtualenv: activate venv27
export PYENV_VERSION="venv27:2.7.10";
export PYENV_ACTIVATE_SHELL=1;
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
EOS
}

5
test/conda-activate.bats
View File

@@ -24,6 +24,7 @@ setup() {
assert_success
assert_output <<EOS
pyenv-virtualenv: activate anaconda-2.3.0
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
export CONDA_DEFAULT_ENV="root";
EOS
@@ -46,6 +47,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: activate anaconda-2.3.0
set -e PYENV_DEACTIVATE;
setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
setenv CONDA_DEFAULT_ENV "root";
EOS
@@ -69,6 +71,7 @@ EOS
pyenv-virtualenv: activate miniconda-3.9.1
export PYENV_VERSION="miniconda-3.9.1";
export PYENV_ACTIVATE_SHELL=1;
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
export CONDA_DEFAULT_ENV="root";
EOS
@@ -91,6 +94,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: activate anaconda-2.3.0/envs/foo
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
export CONDA_DEFAULT_ENV="foo";
EOS
@@ -114,6 +118,7 @@ EOS
pyenv-virtualenv: activate miniconda-3.9.1/envs/bar
export PYENV_VERSION="miniconda-3.9.1/envs/bar";
export PYENV_ACTIVATE_SHELL=1;
unset PYENV_DEACTIVATE;
export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
export CONDA_DEFAULT_ENV="bar";
EOS

3
test/conda-deactivate.bats
View File

@@ -18,6 +18,7 @@ setup() {
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate anaconda-2.3.0
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0";
unset VIRTUAL_ENV;
unset CONDA_DEFAULT_ENV;
EOS
@@ -36,6 +37,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate anaconda-2.3.0
setenv PYENV_DEACTIVATE "${PYENV_ROOT}/versions/anaconda-2.3.0";
set -e VIRTUAL_ENV;
set -e CONDA_DEFAULT_ENV;
EOS
@@ -54,6 +56,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate anaconda-2.3.0/envs/foo
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
unset VIRTUAL_ENV;
unset CONDA_DEFAULT_ENV;
EOS

11
test/deactivate.bats
View File

@@ -15,6 +15,7 @@ setup() {
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate venv
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/venv";
unset VIRTUAL_ENV;
EOS
}
@@ -28,6 +29,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate venv
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/venv";
unset VIRTUAL_ENV;
EOS
}
@@ -41,6 +43,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate venv
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/venv";
unset VIRTUAL_ENV;
EOS
}
@@ -56,6 +59,7 @@ EOS
pyenv-virtualenv: deactivate venv
unset PYENV_VERSION;
unset PYENV_ACTIVATE_SHELL;
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/venv";
unset VIRTUAL_ENV;
EOS
}
@@ -71,6 +75,7 @@ EOS
pyenv-virtualenv: deactivate venv
unset PYENV_VERSION;
unset PYENV_ACTIVATE_SHELL;
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/venv";
unset VIRTUAL_ENV;
EOS
}
@@ -84,6 +89,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate venv
export PYENV_DEACTIVATE="${PYENV_ROOT}/versions/venv";
unset VIRTUAL_ENV;
EOS
}
@@ -97,6 +103,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate venv
setenv PYENV_DEACTIVATE "${PYENV_ROOT}/versions/venv";
set -e VIRTUAL_ENV;
EOS
}
@@ -110,6 +117,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate venv
setenv PYENV_DEACTIVATE "${PYENV_ROOT}/versions/venv";
set -e VIRTUAL_ENV;
EOS
}
@@ -125,6 +133,7 @@ EOS
pyenv-virtualenv: deactivate venv
set -e PYENV_VERSION;
set -e PYENV_ACTIVATE_SHELL;
setenv PYENV_DEACTIVATE "${PYENV_ROOT}/versions/venv";
set -e VIRTUAL_ENV;
EOS
}
@@ -140,6 +149,7 @@ EOS
pyenv-virtualenv: deactivate venv
set -e PYENV_VERSION;
set -e PYENV_ACTIVATE_SHELL;
setenv PYENV_DEACTIVATE "${PYENV_ROOT}/versions/venv";
set -e VIRTUAL_ENV;
EOS
}
@@ -153,6 +163,7 @@ EOS
assert_success
assert_output <<EOS
pyenv-virtualenv: deactivate venv
setenv PYENV_DEACTIVATE "${PYENV_ROOT}/versions/venv";
set -e VIRTUAL_ENV;
EOS
}