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

fish: use "set -gx" instead of "setenv" (#218)

Browse Source 
Use `set -gx` instead of `setenv` for fish shell.

Fix test "activate if the first virtualenv is a virtualenv": it was asserting
the output was of bash form, but not specifying that in the test — it now does.

Fixes https://github.com/pyenv/pyenv-virtualenv/issues/216.
This commit is contained in:
Drummond Ogilvie
2017-06-08 20:52:57 +01:00
committed by Daniel Hahler
parent 252d6763f9
commit 862be21a32
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/pyenv-sh-activate
View File

@@ -146,8 +146,8 @@ if [ -z "$no_shell" ]; then
case "$shell" in case "$shell" in
fish ) fish )
cat <<EOS cat <<EOS
setenv PYENV_VERSION "${versions[*]}"; set -gx PYENV_VERSION "${versions[*]}";
setenv PYENV_ACTIVATE_SHELL 1; set -gx PYENV_ACTIVATE_SHELL 1;
EOS EOS
;; ;;
* ) * )
@@ -164,8 +164,8 @@ fi
case "${shell}" in case "${shell}" in
fish ) fish )
cat <<EOS cat <<EOS
setenv PYENV_VIRTUAL_ENV "${prefix}"; set -gx PYENV_VIRTUAL_ENV "${prefix}";
setenv VIRTUAL_ENV "${prefix}"; set -gx VIRTUAL_ENV "${prefix}";
EOS EOS
;; ;;
* ) * )
@@ -185,7 +185,7 @@ if [ -x "${prefix}/bin/conda" ]; then
fi fi
case "${shell}" in case "${shell}" in
fish ) fish )
echo "setenv CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";" echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
;; ;;
* ) * )
echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";" echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
@@ -197,7 +197,7 @@ if [ -n "${PYTHONHOME}" ]; then
case "${shell}" in case "${shell}" in
fish ) fish )
cat <<EOS cat <<EOS
setenv _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}"; set -gx _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
set -e PYTHONHOME; set -e PYTHONHOME;
EOS EOS
;; ;;

4
bin/pyenv-sh-deactivate
View File

@@ -125,7 +125,7 @@ case "${shell}" in
fish ) fish )
cat <<EOS cat <<EOS
if [ -n "\$_OLD_VIRTUAL_PATH" ]; if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH"; set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH; set -e _OLD_VIRTUAL_PATH;
end; end;
EOS EOS
@@ -144,7 +144,7 @@ case "${shell}" in
fish ) fish )
cat <<EOS cat <<EOS
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ]; if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
EOS EOS

4
bin/pyenv-virtualenv-init
View File

@@ -86,8 +86,8 @@ fi
case "$shell" in case "$shell" in
fish ) fish )
cat <<EOS cat <<EOS
setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH; set -gx PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
setenv PYENV_VIRTUALENV_INIT 1; set -gx PYENV_VIRTUALENV_INIT 1;
EOS EOS
;; ;;
* ) * )

30
test/activate.bats
View File

@@ -138,8 +138,8 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
deactivated deactivated
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
pyenv-virtualenv: prompt changing not working for fish. pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
@@ -162,10 +162,10 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
deactivated deactivated
setenv PYENV_VERSION "venv"; set -gx PYENV_VERSION "venv";
setenv PYENV_ACTIVATE_SHELL 1; set -gx PYENV_ACTIVATE_SHELL 1;
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
pyenv-virtualenv: prompt changing not working for fish. pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
@@ -239,10 +239,10 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
deactivated deactivated
setenv PYENV_VERSION "venv27"; set -gx PYENV_VERSION "venv27";
setenv PYENV_ACTIVATE_SHELL 1; set -gx PYENV_ACTIVATE_SHELL 1;
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
pyenv-virtualenv: prompt changing not working for fish. pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
@@ -263,10 +263,10 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
deactivated deactivated
setenv PYENV_VERSION "venv27"; set -gx PYENV_VERSION "venv27";
setenv PYENV_ACTIVATE_SHELL 1; set -gx PYENV_ACTIVATE_SHELL 1;
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
pyenv-virtualenv: prompt changing not working for fish. pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
@@ -381,7 +381,7 @@ EOS
stub pyenv-virtualenv-prefix "2.7.10 : false" stub pyenv-virtualenv-prefix "2.7.10 : false"
stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\"" stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
run pyenv-sh-activate "venv27" "2.7.10" PYENV_SHELL="bash" run pyenv-sh-activate "venv27" "2.7.10"
assert_success assert_success
assert_output <<EOS assert_output <<EOS

6
test/conda-activate.bats
View File

@@ -62,9 +62,9 @@ EOS
assert_success assert_success
assert_output <<EOS assert_output <<EOS
deactivated deactivated
setenv PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0"; set -gx PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0"; set -gx VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
setenv CONDA_DEFAULT_ENV "root"; set -gx CONDA_DEFAULT_ENV "root";
pyenv-virtualenv: prompt changing not working for fish. pyenv-virtualenv: prompt changing not working for fish.
EOS EOS

4
test/conda-deactivate.bats
View File

@@ -69,11 +69,11 @@ set -e PYENV_VIRTUAL_ENV;
set -e VIRTUAL_ENV; set -e VIRTUAL_ENV;
set -e CONDA_DEFAULT_ENV; set -e CONDA_DEFAULT_ENV;
if [ -n "\$_OLD_VIRTUAL_PATH" ]; if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH"; set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH; set -e _OLD_VIRTUAL_PATH;
end; end;
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ]; if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -q deactivate; if functions -q deactivate;

20
test/deactivate.bats
View File

@@ -247,11 +247,11 @@ EOS
set -e PYENV_VIRTUAL_ENV; set -e PYENV_VIRTUAL_ENV;
set -e VIRTUAL_ENV; set -e VIRTUAL_ENV;
if [ -n "\$_OLD_VIRTUAL_PATH" ]; if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH"; set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH; set -e _OLD_VIRTUAL_PATH;
end; end;
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ]; if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -q deactivate; if functions -q deactivate;
@@ -273,11 +273,11 @@ EOS
set -e PYENV_VIRTUAL_ENV; set -e PYENV_VIRTUAL_ENV;
set -e VIRTUAL_ENV; set -e VIRTUAL_ENV;
if [ -n "\$_OLD_VIRTUAL_PATH" ]; if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH"; set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH; set -e _OLD_VIRTUAL_PATH;
end; end;
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ]; if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -q deactivate; if functions -q deactivate;
@@ -301,11 +301,11 @@ set -e PYENV_ACTIVATE_SHELL;
set -e PYENV_VIRTUAL_ENV; set -e PYENV_VIRTUAL_ENV;
set -e VIRTUAL_ENV; set -e VIRTUAL_ENV;
if [ -n "\$_OLD_VIRTUAL_PATH" ]; if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH"; set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH; set -e _OLD_VIRTUAL_PATH;
end; end;
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ]; if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -q deactivate; if functions -q deactivate;
@@ -329,11 +329,11 @@ set -e PYENV_ACTIVATE_SHELL;
set -e PYENV_VIRTUAL_ENV; set -e PYENV_VIRTUAL_ENV;
set -e VIRTUAL_ENV; set -e VIRTUAL_ENV;
if [ -n "\$_OLD_VIRTUAL_PATH" ]; if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH"; set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH; set -e _OLD_VIRTUAL_PATH;
end; end;
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ]; if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -q deactivate; if functions -q deactivate;
@@ -355,11 +355,11 @@ EOS
set -e PYENV_VIRTUAL_ENV; set -e PYENV_VIRTUAL_ENV;
set -e VIRTUAL_ENV; set -e VIRTUAL_ENV;
if [ -n "\$_OLD_VIRTUAL_PATH" ]; if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH"; set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH; set -e _OLD_VIRTUAL_PATH;
end; end;
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ]; if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME"; set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME; set -e _OLD_VIRTUAL_PYTHONHOME;
end; end;
if functions -q deactivate; if functions -q deactivate;

4
test/init.bats
View File

@@ -72,8 +72,8 @@ EOS
run pyenv-virtualenv-init - fish run pyenv-virtualenv-init - fish
assert_success assert_success
assert_output <<EOS assert_output <<EOS
setenv PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH; set -gx PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
setenv PYENV_VIRTUALENV_INIT 1; set -gx PYENV_VIRTUALENV_INIT 1;
function _pyenv_virtualenv_hook --on-event fish_prompt; function _pyenv_virtualenv_hook --on-event fish_prompt;
set -l ret \$status set -l ret \$status
if [ -n "\$VIRTUAL_ENV" ] if [ -n "\$VIRTUAL_ENV" ]