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

Deactivate virtualenv even if it has been activated manually

Browse Source
This commit is contained in:
Yamashita Yuu
2014-07-11 20:24:58 +09:00
parent 7aa5d13633
commit a3c86f013b
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pyenv-sh-deactivate
View File

@@ -37,8 +37,10 @@ fish )
;; ;;
esac esac
prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}"
if [ -n "$VERBOSE" ]; then if [ -n "$VERBOSE" ]; then
echo " echo \"pyenv-virtualenv: deactivate ${PYENV_ACTIVATE##*/}\" 1>&2;" echo " echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
fi fi
if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
@@ -50,7 +52,7 @@ fi
case "$shell" in case "$shell" in
fish ) fish )
cat <<EOS cat <<EOS
setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE"; setenv PYENV_DEACTIVATE "$prefix";
set -e PYENV_ACTIVATE; set -e PYENV_ACTIVATE;
deactivate; deactivate;
else; else;
@@ -58,7 +60,7 @@ EOS
;; ;;
* ) * )
cat <<EOS cat <<EOS
export PYENV_DEACTIVATE="$PYENV_ACTIVATE"; export PYENV_DEACTIVATE="$prefix";
unset PYENV_ACTIVATE; unset PYENV_ACTIVATE;
deactivate; deactivate;
else else

39
test/deactivate.bats
View File

@@ -102,6 +102,25 @@ fi;
EOS EOS
} }
@test "deactivate virtualenv which has been activated manually" {
export PYENV_VIRTUALENV_INIT=1
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
PYENV_SHELL="bash" run pyenv-sh-deactivate
assert_success
assert_output <<EOS
if declare -f deactivate 1>/dev/null 2>&1; then
export PYENV_DEACTIVATE="$VIRTUAL_ENV";
unset PYENV_ACTIVATE;
deactivate;
else
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
fi;
EOS
}
@test "deactivate virtualenv (fish)" { @test "deactivate virtualenv (fish)" {
export PYENV_VIRTUALENV_INIT=1 export PYENV_VIRTUALENV_INIT=1
export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv" export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
@@ -177,6 +196,26 @@ else;
end; end;
EOS EOS
} }
@test "deactivate virtualenv which has been activated manually (fish)" {
export PYENV_VIRTUALENV_INIT=1
export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
PYENV_SHELL="fish" run pyenv-sh-deactivate
assert_success
assert_output <<EOS
if functions -q deactivate;
setenv PYENV_DEACTIVATE "$VIRTUAL_ENV";
set -e PYENV_ACTIVATE;
deactivate;
else;
echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
false;
end;
EOS
}
@test "should fail if deactivate is invoked as a command" { @test "should fail if deactivate is invoked as a command" {
run pyenv-deactivate run pyenv-deactivate