This website works better with JavaScript.
Home
Explore
Help
Sign In
isprogram
/
pyenv-virtualenv
mirror of
https://github.com/pyenv/pyenv-virtualenv.git
Watch
1
Star
0
Fork
0
Code
Issues
0
Projects
0
Releases
42
Wiki
Activity
Browse Source
Merge pull request
#23
from fgimian/fish-activation-fix
Repaired virtualenv activation and deactivation for the fish shell
pull/24/head
Yamashita, Yuu
10 years ago
parent
3f5171e2fc
21a8745bcf
commit
b9e2fc6acb
4 changed files
with
6 additions
and
6 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-1
bin/pyenv-sh-activate
+1
-1
bin/pyenv-sh-deactivate
+3
-3
test/activate.bats
+1
-1
test/deactivate.bats
+ 1
- 1
bin/pyenv-sh-activate
View File
@ -41,7 +41,7 @@ fi
pyenv-virtualenv-prefix "${versions}" 1>/dev/null
echo "pyenv shell \"${versions}\""
echo "pyenv shell \"${versions}\"
;
"
case "$shell" in
fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;;
* ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;;
+ 1
- 1
bin/pyenv-sh-deactivate
View File
@ -11,7 +11,7 @@ set -e
shell="$(basename "${PYENV_SHELL:-$SHELL}")"
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";;
esac
echo "pyenv shell --unset"
+ 3
- 3
test/activate.bats
View File
@ -19,7 +19,7 @@ setup() {
assert_success
assert_output <<EOS
pyenv shell "venv"
pyenv shell "venv"
;
source "${PYENV_ROOT}/versions/venv/bin/activate"
EOS
}
@ -37,7 +37,7 @@ EOS
assert_success
assert_output <<EOS
pyenv shell "venv"
pyenv shell "venv"
;
. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
EOS
}
@ -53,7 +53,7 @@ EOS
assert_success
assert_output <<EOS
pyenv shell "venv27"
pyenv shell "venv27"
;
source "${PYENV_ROOT}/versions/venv27/bin/activate"
EOS
}
+ 1
- 1
test/deactivate.bats
View File
@ -21,7 +21,7 @@ EOS
assert_success
assert_output <<EOS
functions -q deactivate; and deactivate
functions -q deactivate; and deactivate
;
pyenv shell --unset
EOS
}
Write
Preview
Loading…
Cancel
Save