feat(python): autovenv keeps activated on subdirs (#12396)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
This commit is contained in:
Michael Gonzo 2024-05-07 21:30:23 +02:00 committed by GitHub
parent 668ca3a32d
commit 22bbc233e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions

View file

@ -32,8 +32,9 @@ virtual environments:
`venv`) in the current directory. `venv`) in the current directory.
- `auto_vrun`: Automatically activate the venv virtual environment when entering a directory containing - `auto_vrun`: Automatically activate the venv virtual environment when entering a directory containing
`<venv-name>/bin/activate`, and automatically deactivate it when navigating out of it (including `<venv-name>/bin/activate`, and automatically deactivate it when navigating out of it (keeps venv activated
subdirectories!). in subdirectories).
- To enable the feature, set `export PYTHON_AUTO_VRUN=true` before sourcing oh-my-zsh. - To enable the feature, set `export PYTHON_AUTO_VRUN=true` before sourcing oh-my-zsh.
- The default virtual environment name is `venv`. To use a different name, set - Plugin activates first virtual environment in lexicographic order whose name begins with `<venv-name>`.
The default virtual environment name is `venv`. To use a different name, set
`export PYTHON_VENV_NAME=<venv-name>`. For example: `export PYTHON_VENV_NAME=".venv"` `export PYTHON_VENV_NAME=<venv-name>`. For example: `export PYTHON_VENV_NAME=".venv"`

View file

@ -86,11 +86,20 @@ function mkv() {
if [[ "$PYTHON_AUTO_VRUN" == "true" ]]; then if [[ "$PYTHON_AUTO_VRUN" == "true" ]]; then
# Automatically activate venv when changing dir # Automatically activate venv when changing dir
auto_vrun() { function auto_vrun() {
if [[ -f "${PYTHON_VENV_NAME}/bin/activate" ]]; then # deactivate if we're on a different dir than VIRTUAL_ENV states
source "${PYTHON_VENV_NAME}/bin/activate" > /dev/null 2>&1 # we don't deactivate subdirectories!
else if (( $+functions[deactivate] )) && [[ $PWD != ${VIRTUAL_ENV:h}* ]]; then
deactivate > /dev/null 2>&1
fi
if [[ $PWD != ${VIRTUAL_ENV:h} ]]; then
for _file in "${PYTHON_VENV_NAME}"*/bin/activate(N.); do
# make sure we're not in a venv already
(( $+functions[deactivate] )) && deactivate > /dev/null 2>&1 (( $+functions[deactivate] )) && deactivate > /dev/null 2>&1
source $_file > /dev/null 2>&1
break
done
fi fi
} }
add-zsh-hook chpwd auto_vrun add-zsh-hook chpwd auto_vrun