b9d193166838ff79d4848e64c852921faae5fbbd

Author
Michael Aquilina <michaelaquilina@gmail.com>
Committer
GitHub <noreply@github.com>
Date

Message

Merge pull request #109 from MichaelAquilina/next

Release 1.14.0 

Diff

 1diff --git a/CHANGELOG.rst b/CHANGELOG.rst
 2index f0768dd9f7ba0e75896e61419495774c555ecc02..ab5b3e0a4180046321cbb856f26749ca7251c511 100644
 3--- a/CHANGELOG.rst
 4+++ b/CHANGELOG.rst
 5@@ -1,6 +1,10 @@
 6 Changelog
 7 =========
 8 
 9+1.14.0
10+------
11+* Prevent pipenv from showing its courtesy because we activated its virtualenv
12+
13 1.13.0
14 ------
15 * Clean up pipenv names when displaying them
16diff --git a/autoswitch_virtualenv.plugin.zsh b/autoswitch_virtualenv.plugin.zsh
17index 807f0796a52abb09d2763b4ad65e0ba9d45eb91c..6bdb8ea776e99fcedde524190051e20eca6b6ec7 100644
18--- a/autoswitch_virtualenv.plugin.zsh
19+++ b/autoswitch_virtualenv.plugin.zsh
20@@ -1,4 +1,4 @@
21-export AUTOSWITCH_VERSION='1.13.0'
22+export AUTOSWITCH_VERSION='1.14.0'
23 
24 RED="\e[31m"
25 GREEN="\e[32m"
26@@ -83,6 +83,12 @@ function _maybeworkon() {
27         message="${message//\%py_version/$py_version}"
28         _autoswitch_message "${message}\n"
29 
30+        # If we are using pipenv and activate its virtual environment - turn down its verbosity
31+        # to prevent users seeing " Pipenv found itself running within a virtual environment" warning
32+        if [[ "$venv_type" == "pipenv" && "$PIPENV_VERBOSITY" != -1 ]]; then
33+            export PIPENV_VERBOSITY=-1
34+        fi
35+
36         # Much faster to source the activate file directly rather than use the `workon` command
37         source "$venv_dir/bin/activate"
38     fi