Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pyenv/pyenv-virtualenv
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pyenv/pyenv-virtualenv
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: manual-activation
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 6 files changed
  • 1 contributor

Commits on Jul 4, 2014

  1. Fix issues with manual activation of virtual environments (#34)

    Yamashita Yuu committed Jul 4, 2014
    Copy the full SHA
    7e8223e View commit details
Showing with 38 additions and 24 deletions.
  1. +4 −2 bin/pyenv-sh-activate
  2. +4 −2 bin/pyenv-sh-deactivate
  3. +4 −4 bin/pyenv-virtualenv-init
  4. +12 −6 test/activate.bats
  5. +8 −4 test/deactivate.bats
  6. +6 −6 test/init.bats
6 changes: 4 additions & 2 deletions bin/pyenv-sh-activate
View file
Original file line number Diff line number Diff line change
@@ -78,13 +78,15 @@ case "$shell" in
fish )
cat <<EOS
set -e PYENV_DEACTIVATE;
. "$(pyenv-prefix "${versions}")/bin/activate.fish";
setenv PYENV_ACTIVATE "$(pyenv-prefix "${versions}")";
. "\${PYENV_ACTIVATE}/bin/activate.fish";
EOS
;;
* )
cat <<EOS
unset PYENV_DEACTIVATE;
source "$(pyenv-prefix "${versions}")/bin/activate";
export PYENV_ACTIVATE="$(pyenv-prefix "${versions}")";
source "\${PYENV_ACTIVATE}/bin/activate";
EOS
;;
esac
6 changes: 4 additions & 2 deletions bin/pyenv-sh-deactivate
View file
Original file line number Diff line number Diff line change
@@ -14,15 +14,17 @@ case "$shell" in
fish )
cat <<EOS
if functions -q deactivate
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
set -e PYENV_ACTIVATE;
deactivate;
end;
EOS
;;
* )
cat <<EOS
if declare -f deactivate 1>/dev/null 2>&1; then
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
unset PYENV_ACTIVATE;
deactivate;
fi;
EOS
8 changes: 4 additions & 4 deletions bin/pyenv-virtualenv-init
View file
Original file line number Diff line number Diff line change
@@ -75,12 +75,12 @@ case "$shell" in
fish )
cat <<EOS
function _pyenv_virtualenv_hook --on-event fish_prompt;
if [ -n "\$VIRTUAL_ENV" ]
if [ -n "\$PYENV_ACTIVATE" ]
if [ (pyenv version-name) = "system" ]
eval (pyenv sh-deactivate); or true
return 0
end
if [ "\$VIRTUAL_ENV" != (pyenv prefix) ]
if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
eval (pyenv sh-deactivate); or true
eval (pyenv sh-activate 2>/dev/null); or true
end
@@ -106,12 +106,12 @@ esac

if [[ "$shell" != "fish" ]]; then
cat <<EOS
if [ -n "\$VIRTUAL_ENV" ]; then
if [ -n "\$PYENV_ACTIVATE" ]; then
if [ "x\`pyenv version-name\`" = "xsystem" ]; then
pyenv deactivate || true
return 0
fi
if [ "x\$VIRTUAL_ENV" != "x\`pyenv prefix\`" ]; then
if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
pyenv deactivate || true
pyenv activate 2>/dev/null || true
fi
18 changes: 12 additions & 6 deletions test/activate.bats
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,8 @@ setup() {
assert_success
assert_output <<EOS
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv/bin/activate";
export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
source "\${PYENV_ACTIVATE}/bin/activate";
EOS
}

@@ -44,7 +45,8 @@ EOS
assert_output <<EOS
pyenv shell "venv";
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv/bin/activate";
export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
source "\${PYENV_ACTIVATE}/bin/activate";
EOS
}

@@ -64,7 +66,8 @@ EOS
assert_success
assert_output <<EOS
set -e PYENV_DEACTIVATE;
. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
. "\${PYENV_ACTIVATE}/bin/activate.fish";
EOS
}

@@ -85,7 +88,8 @@ EOS
assert_output <<EOS
pyenv shell "venv";
set -e PYENV_DEACTIVATE;
. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
. "\${PYENV_ACTIVATE}/bin/activate.fish";
EOS
}

@@ -104,7 +108,8 @@ EOS
assert_output <<EOS
pyenv shell "venv27";
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv27/bin/activate";
export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
source "\${PYENV_ACTIVATE}/bin/activate";
EOS
}

@@ -123,7 +128,8 @@ EOS
assert_output <<EOS
pyenv shell "venv27";
unset PYENV_DEACTIVATE;
source "${PYENV_ROOT}/versions/venv27/bin/activate";
export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
source "\${PYENV_ACTIVATE}/bin/activate";
EOS
}

12 changes: 8 additions & 4 deletions test/deactivate.bats
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,8 @@ setup() {
assert_success
assert_output <<EOS
if declare -f deactivate 1>/dev/null 2>&1; then
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
unset PYENV_ACTIVATE;
deactivate;
fi;
EOS
@@ -28,7 +29,8 @@ EOS
assert_success
assert_output <<EOS
if declare -f deactivate 1>/dev/null 2>&1; then
export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
unset PYENV_ACTIVATE;
deactivate;
fi;
pyenv shell --unset;
@@ -43,7 +45,8 @@ EOS
assert_success
assert_output <<EOS
if functions -q deactivate
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
set -e PYENV_ACTIVATE;
deactivate;
end;
EOS
@@ -57,7 +60,8 @@ EOS
assert_success
assert_output <<EOS
if functions -q deactivate
setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
set -e PYENV_ACTIVATE;
deactivate;
end;
pyenv shell --unset;
12 changes: 6 additions & 6 deletions test/init.bats
View file
Original file line number Diff line number Diff line change
@@ -31,12 +31,12 @@ load test_helper
assert_output <<EOS
export PYENV_VIRTUALENV_INIT=1;
_pyenv_virtualenv_hook() {
if [ -n "\$VIRTUAL_ENV" ]; then
if [ -n "\$PYENV_ACTIVATE" ]; then
if [ "x\`pyenv version-name\`" = "xsystem" ]; then
pyenv deactivate || true
return 0
fi
if [ "x\$VIRTUAL_ENV" != "x\`pyenv prefix\`" ]; then
if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
pyenv deactivate || true
pyenv activate 2>/dev/null || true
fi
@@ -58,12 +58,12 @@ EOS
assert_output <<EOS
setenv PYENV_VIRTUALENV_INIT 1;
function _pyenv_virtualenv_hook --on-event fish_prompt;
if [ -n "\$VIRTUAL_ENV" ]
if [ -n "\$PYENV_ACTIVATE" ]
if [ (pyenv version-name) = "system" ]
eval (pyenv sh-deactivate); or true
return 0
end
if [ "\$VIRTUAL_ENV" != (pyenv prefix) ]
if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
eval (pyenv sh-deactivate); or true
eval (pyenv sh-activate 2>/dev/null); or true
end
@@ -82,12 +82,12 @@ EOS
assert_output <<EOS
export PYENV_VIRTUALENV_INIT=1;
_pyenv_virtualenv_hook() {
if [ -n "\$VIRTUAL_ENV" ]; then
if [ -n "\$PYENV_ACTIVATE" ]; then
if [ "x\`pyenv version-name\`" = "xsystem" ]; then
pyenv deactivate || true
return 0
fi
if [ "x\$VIRTUAL_ENV" != "x\`pyenv prefix\`" ]; then
if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
pyenv deactivate || true
pyenv activate 2>/dev/null || true
fi