Use PYENV_DEACTIVATE to store which virtualenv has been deactivated (#32)

This commit is contained in:
Yamashita Yuu
2014-06-30 22:40:59 +09:00
parent 7079cbe979
commit 08b4c94f85
6 changed files with 169 additions and 72 deletions

View File

@@ -22,7 +22,8 @@ setup() {
assert_success
assert_output <<EOS
source "${PYENV_ROOT}/versions/venv/bin/activate"
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv/bin/activate";
EOS
}
@@ -42,7 +43,8 @@ EOS
assert_success
assert_output <<EOS
pyenv shell "venv";
source "${PYENV_ROOT}/versions/venv/bin/activate"
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv/bin/activate";
EOS
}
@@ -61,7 +63,8 @@ EOS
assert_success
assert_output <<EOS
. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
set -e PYENV_DEACTIVATE;
. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
EOS
}
@@ -81,7 +84,8 @@ EOS
assert_success
assert_output <<EOS
pyenv shell "venv";
. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
set -e PYENV_DEACTIVATE;
. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
EOS
}
@@ -99,7 +103,8 @@ EOS
assert_success
assert_output <<EOS
pyenv shell "venv27";
source "${PYENV_ROOT}/versions/venv27/bin/activate"
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv27/bin/activate";
EOS
}
@@ -117,7 +122,8 @@ EOS
assert_success
assert_output <<EOS
pyenv shell "venv27";
source "${PYENV_ROOT}/versions/venv27/bin/activate"
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv27/bin/activate";
EOS
}