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

Merge pull request #23 from fgimian/fish-activation-fix

Browse Source 
Repaired virtualenv activation and deactivation for the fish shell
This commit is contained in:
Yamashita, Yuu
2014-05-31 14:19:02 +09:00
parent 3f5171e2fc 21a8745bcf
commit b9e2fc6acb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pyenv-sh-activate
View File

@@ -41,7 +41,7 @@ fi
pyenv-virtualenv-prefix "${versions}" 1>/dev/null pyenv-virtualenv-prefix "${versions}" 1>/dev/null
echo "pyenv shell \"${versions}\"" echo "pyenv shell \"${versions}\";"
case "$shell" in case "$shell" in
fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;; fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;;
* ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;; * ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;;

2
bin/pyenv-sh-deactivate
View File

@@ -11,7 +11,7 @@ set -e
shell="$(basename "${PYENV_SHELL:-$SHELL}")" shell="$(basename "${PYENV_SHELL:-$SHELL}")"
case "$shell" in case "$shell" in
fish ) echo "functions -q deactivate; and deactivate";; fish ) echo "functions -q deactivate; and deactivate;";;
* ) echo "declare -f deactivate 1>/dev/null 2>&1 && deactivate";; * ) echo "declare -f deactivate 1>/dev/null 2>&1 && deactivate";;
esac esac
echo "pyenv shell --unset" echo "pyenv shell --unset"

6
test/activate.bats
View File

@@ -19,7 +19,7 @@ setup() {
assert_success assert_success
assert_output <<EOS assert_output <<EOS
pyenv shell "venv" pyenv shell "venv";
source "${PYENV_ROOT}/versions/venv/bin/activate" source "${PYENV_ROOT}/versions/venv/bin/activate"
EOS EOS
} }
@@ -37,7 +37,7 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
pyenv shell "venv" pyenv shell "venv";
. "${PYENV_ROOT}/versions/venv/bin/activate.fish" . "${PYENV_ROOT}/versions/venv/bin/activate.fish"
EOS EOS
} }
@@ -53,7 +53,7 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
pyenv shell "venv27" pyenv shell "venv27";
source "${PYENV_ROOT}/versions/venv27/bin/activate" source "${PYENV_ROOT}/versions/venv27/bin/activate"
EOS EOS
} }

2
test/deactivate.bats
View File

@@ -21,7 +21,7 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
functions -q deactivate; and deactivate functions -q deactivate; and deactivate;
pyenv shell --unset pyenv shell --unset
EOS EOS
} }