From f6276094199d84a5e98b56e0e6eadf523ab46504 Mon Sep 17 00:00:00 2001 From: puhitaku Date: Fri, 8 Apr 2016 15:45:26 +0900 Subject: [PATCH 1/7] Suppress activate/deactivate messages by default --- bin/pyenv-sh-activate | 4 +++- bin/pyenv-sh-deactivate | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/pyenv-sh-activate b/bin/pyenv-sh-activate index be76525..8beb631 100755 --- a/bin/pyenv-sh-activate +++ b/bin/pyenv-sh-activate @@ -138,7 +138,9 @@ fi pyenv-sh-deactivate --force --quiet ${VERBOSE+--verbose} || true -echo "pyenv-virtualenv: activate ${venv}" 1>&2 +if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then + echo "pyenv-virtualenv: activate ${venv}" 1>&2 +fi if [ -z "$no_shell" ]; then # shell version set in pyenv-sh-activate should be unset diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate index 7450d50..2e4d712 100755 --- a/bin/pyenv-sh-deactivate +++ b/bin/pyenv-sh-deactivate @@ -58,7 +58,9 @@ else venv="${prefix##*/}" fi -echo "pyenv-virtualenv: deactivate ${venv}" 1>&2 +if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then + echo "pyenv-virtualenv: deactivate ${venv}" 1>&2 +fi if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then # shell version set in pyenv-sh-activate should be unset From ab5b5b922198947cc9811fa4b4d6a8a2a160ca25 Mon Sep 17 00:00:00 2001 From: puhitaku Date: Fri, 8 Apr 2016 17:27:11 +0900 Subject: [PATCH 2/7] Fix tests --- test/activate.bats | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/test/activate.bats b/test/activate.bats index 5953265..05c4ecd 100644 --- a/test/activate.bats +++ b/test/activate.bats @@ -11,6 +11,7 @@ setup() { unset CONDA_DEFAULT_ENV unset PYTHONHOME unset _OLD_VIRTUAL_PYTHONHOME + unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE unset PYENV_VIRTUALENV_DISABLE_PROMPT unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT unset VIRTUAL_ENV_DISABLE_PROMPT @@ -29,8 +30,6 @@ setup() { assert_success assert_output < Date: Wed, 13 Apr 2016 11:27:00 +0900 Subject: [PATCH 3/7] Fix test: wrongly removed lines --- test/activate.bats | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/activate.bats b/test/activate.bats index 05c4ecd..d066ef2 100644 --- a/test/activate.bats +++ b/test/activate.bats @@ -30,6 +30,7 @@ setup() { assert_success assert_output < Date: Wed, 13 Apr 2016 11:40:01 +0900 Subject: [PATCH 4/7] Fix test: deactivate --- test/deactivate.bats | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/deactivate.bats b/test/deactivate.bats index fac034a..a8e83aa 100644 --- a/test/deactivate.bats +++ b/test/deactivate.bats @@ -27,7 +27,6 @@ setup() { assert_success assert_output < Date: Wed, 13 Apr 2016 11:40:47 +0900 Subject: [PATCH 5/7] Fix test: conda env --- test/conda-activate.bats | 5 ----- test/conda-deactivate.bats | 3 --- 2 files changed, 8 deletions(-) diff --git a/test/conda-activate.bats b/test/conda-activate.bats index 8185a37..93ac1ef 100644 --- a/test/conda-activate.bats +++ b/test/conda-activate.bats @@ -32,7 +32,6 @@ setup() { assert_success assert_output < Date: Wed, 13 Apr 2016 11:44:21 +0900 Subject: [PATCH 6/7] Fix test: unnecessary env --- test/activate.bats | 1 - 1 file changed, 1 deletion(-) diff --git a/test/activate.bats b/test/activate.bats index d066ef2..a5d9491 100644 --- a/test/activate.bats +++ b/test/activate.bats @@ -46,7 +46,6 @@ EOS @test "activate virtualenv from current version (verbose)" { export PYENV_VIRTUALENV_INIT=1 - export PYENV_VIRTUALENV_DISABLE_PROMPT=1 export PYENV_VIRTUALENV_VERBOSE_ACTIVATE=1 stub pyenv-version-name "echo venv" From 62e32f9cb35552c9675a50176c3b768d18951abf Mon Sep 17 00:00:00 2001 From: puhitaku Date: Fri, 15 Apr 2016 11:56:28 +0900 Subject: [PATCH 7/7] Fix test: add unsets --- test/conda-activate.bats | 1 + test/conda-deactivate.bats | 1 + test/deactivate.bats | 1 + 3 files changed, 3 insertions(+) diff --git a/test/conda-activate.bats b/test/conda-activate.bats index 93ac1ef..92a500e 100644 --- a/test/conda-activate.bats +++ b/test/conda-activate.bats @@ -12,6 +12,7 @@ setup() { unset CONDA_DEFAULT_ENV unset PYTHONHOME unset _OLD_VIRTUAL_PYTHONHOME + unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE unset PYENV_VIRTUALENV_DISABLE_PROMPT unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT unset VIRTUAL_ENV_DISABLE_PROMPT diff --git a/test/conda-deactivate.bats b/test/conda-deactivate.bats index 7afaddb..bf7442a 100644 --- a/test/conda-deactivate.bats +++ b/test/conda-deactivate.bats @@ -11,6 +11,7 @@ setup() { unset CONDA_DEFAULT_ENV unset PYTHONHOME unset _OLD_VIRTUAL_PYTHONHOME + unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE unset PYENV_VIRTUALENV_DISABLE_PROMPT unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT unset VIRTUAL_ENV_DISABLE_PROMPT diff --git a/test/deactivate.bats b/test/deactivate.bats index a8e83aa..8698076 100644 --- a/test/deactivate.bats +++ b/test/deactivate.bats @@ -11,6 +11,7 @@ setup() { unset CONDA_DEFAULT_ENV unset PYTHONHOME unset _OLD_VIRTUAL_PYTHONHOME + unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE unset PYENV_VIRTUALENV_DISABLE_PROMPT unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT unset VIRTUAL_ENV_DISABLE_PROMPT