From 1b03896a0e01ad263439449a0742d0f3339732e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Fri, 3 Sep 2021 12:56:00 +0200 Subject: [PATCH] feat(pyenv): don't load pyenv-virtualenv with `ZSH_PYENV_VIRTUALENV=false` Closes #9443 Co-authored-by: Pandu POLUAN --- plugins/pyenv/README.md | 3 +++ plugins/pyenv/pyenv.plugin.zsh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/pyenv/README.md b/plugins/pyenv/README.md index 810c67998..b9ee937b7 100644 --- a/plugins/pyenv/README.md +++ b/plugins/pyenv/README.md @@ -15,6 +15,9 @@ plugins=(... pyenv) - `ZSH_PYENV_QUIET`: if set to `true`, the plugin will not print any messages if it finds that `pyenv` is not properly configured. +- `ZSH_PYENV_VIRTUALENV`: if set to `false`, the plugin will not load pyenv-virtualenv + when it finds it. + ## Functions - `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh index 679fc5e52..922df8ead 100644 --- a/plugins/pyenv/pyenv.plugin.zsh +++ b/plugins/pyenv/pyenv.plugin.zsh @@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then eval "$(pyenv init - --no-rehash zsh)" # If pyenv-virtualenv exists, load it - if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then + if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then eval "$(pyenv virtualenv-init - zsh)" fi