feat(poetry-env): support changing between two venv dirs (#12346)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
master
Kate Sullivan 2 years ago committed by GitHub
parent 6e9d57d5ab
commit 31f2025e0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 38
      plugins/poetry-env/poetry-env.plugin.zsh

@ -1,27 +1,27 @@
# Automatic poetry environment activation/deactivation
_togglePoetryShell() { _togglePoetryShell() {
# deactivate environment if pyproject.toml doesn't exist and not in a subdir # Determine if currently in a Poetry-managed directory
if [[ ! -f "$PWD/pyproject.toml" ]] ; then local in_poetry_dir=0
if [[ "$poetry_active" == 1 ]]; then if [[ -f "$PWD/pyproject.toml" ]] && grep -q 'tool.poetry' "$PWD/pyproject.toml"; then
if [[ "$PWD" != "$poetry_dir"* ]]; then in_poetry_dir=1
export poetry_active=0 fi
deactivate
return # Deactivate the current environment if moving out of a Poetry directory or into a different Poetry directory
fi if [[ $poetry_active -eq 1 ]] && { [[ $in_poetry_dir -eq 0 ]] || [[ "$PWD" != "$poetry_dir"* ]]; }; then
fi export poetry_active=0
unset poetry_dir
deactivate
fi fi
# activate the environment if pyproject.toml exists # Activate the environment if in a Poetry directory and no environment is currently active
if [[ "$poetry_active" != 1 ]]; then if [[ $in_poetry_dir -eq 1 ]] && [[ $poetry_active -ne 1 ]]; then
if [[ -f "$PWD/pyproject.toml" ]]; then venv_dir=$(poetry env info --path 2>/dev/null)
if grep -q 'tool.poetry' "$PWD/pyproject.toml" && venv_dir=$(poetry env info --path); then if [[ -n "$venv_dir" ]]; then
export poetry_active=1 export poetry_active=1
export poetry_dir="$PWD" export poetry_dir="$PWD"
source "${venv_dir}/bin/activate" source "${venv_dir}/bin/activate"
fi
fi fi
fi fi
} }
autoload -U add-zsh-hook autoload -U add-zsh-hook
add-zsh-hook chpwd _togglePoetryShell add-zsh-hook chpwd _togglePoetryShell
_togglePoetryShell _togglePoetryShell # Initial call to check the current directory at shell startup

Loading…
Cancel
Save