From 823be4ef5ff6753a9c5918218801709b98e5312f Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:53:33 +0200
Subject: feat(pyenv): silence bad config warning with `ZSH_PYENV_QUIET=true`
---
plugins/pyenv/README.md | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'plugins/pyenv/README.md')
diff --git a/plugins/pyenv/README.md b/plugins/pyenv/README.md
index d063b55b9..810c67998 100644
--- a/plugins/pyenv/README.md
+++ b/plugins/pyenv/README.md
@@ -1,4 +1,4 @@
-# pyenv
+# pyenv
This plugin looks for [pyenv](https://github.com/pyenv/pyenv), a Simple Python version
management system, and loads it if it's found. It also loads pyenv-virtualenv, a pyenv
@@ -10,6 +10,11 @@ To use it, add `pyenv` to the plugins array in your zshrc file:
plugins=(... pyenv)
```
+## Settings
+
+- `ZSH_PYENV_QUIET`: if set to `true`, the plugin will not print any messages if it
+ finds that `pyenv` is not properly configured.
+
## Functions
- `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python
--
cgit v1.2.3-70-g09d2
From 1b03896a0e01ad263439449a0742d0f3339732e2 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:56:00 +0200
Subject: feat(pyenv): don't load pyenv-virtualenv with
`ZSH_PYENV_VIRTUALENV=false`
Closes #9443
Co-authored-by: Pandu POLUAN <pepoluan@gmail.com>
---
plugins/pyenv/README.md | 3 +++
plugins/pyenv/pyenv.plugin.zsh | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'plugins/pyenv/README.md')
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
--
cgit v1.2.3-70-g09d2