v20151229

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Version History
 
+#### 20151229
+
+* Fix `deactivate` error on `fish` (#136)
+
 #### 20151222
 
 * Improved interoperability with Anaconda/Miniconda (#103, #106, #107, #108)

bin/pyenv-sh-deactivate

@@ -162,7 +162,7 @@ esac
 case "${shell}" in
 fish )
   cat <<EOS
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS

bin/pyenv-virtualenv

@@ -9,7 +9,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20151222"
+PYENV_VIRTUALENV_VERSION="20151229"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

test/conda-deactivate.bats

@@ -77,7 +77,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS

test/deactivate.bats

@@ -228,7 +228,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -255,7 +255,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -284,7 +284,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -313,7 +313,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -340,7 +340,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS