v1.1.2

Use custom get-pip URL based on the target version (pyenv/pyenv#1127)

CHANGELOG.md

@@ -1,9 +1,28 @@
 ## Version History
 
+#### 1.1.2
+
+* Use custom get-pip URL based on the target version (#253, #254, #255)
+* Source conda 4.4.4 shell files (#251)
+* Evaluate force flag before testing if venv exists (#232)
+
+#### 1.1.1
+
+* Set `CONDA_PREFIX` to make is useable in conda activate/deactivate scripts (#224)
+* Generate `pydoc` executable after creating new virtualenv (#197, #230)
+
+#### 1.1.0
+
+* fish: use "set -gx" instead of "setenv" (#215, #216, #217, #218)
+
+#### 1.0.0
+
+* Use similar versioning scheme as pyenv; YYYYMMDD -> X.Y.Z
+
 #### 20160716
 
 * Suppress activate/deactivate messages by default (#169, #170, #171)
-+ Source conda package activate/deactivat scripts if exist (#173)
+* Source conda package activate/deactivat scripts if exist (#173)
 * Use `source` in favor of `.` for `fish` (#175)
 * Use `python -m venv` instead of `pyvenv` due to deprecation of `pyvenv` after 3.6 (#184, #185)
 
@@ -29,7 +48,7 @@
 * Improved interoperability with Anaconda/Miniconda (#103, #106, #107, #108)
 * Create `virtualenv` inside `envs` directory of source version, like Anaconda/Miniconda (#103, #107)
 * Rewrite `pyenv activate` and `pyenv deactivate` without using scripts provided by virtualenv and conda (#51, #69, #103, #104, #121)
-* Improve the `pyenv activate` behaviour on multipe versions (#105, #111)
+* Improve the `pyenv activate` behaviour on multiple versions (#105, #111)
 * Reject creating a virtualenv named `system` (yyuu/pyenv#475)
 * Add `--skip-aliases` to `pyenv virtualenvs` (#120)
 * Stop showing `version not installed` warning messages in precmd (#49)

README.md

@@ -2,14 +2,14 @@
 
 [![Join the chat at https://gitter.im/yyuu/pyenv-virtualenv](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/yyuu/pyenv-virtualenv?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[![Build Status](https://travis-ci.org/yyuu/pyenv-virtualenv.svg?branch=master)](https://travis-ci.org/yyuu/pyenv-virtualenv)
+[![Build Status](https://travis-ci.org/pyenv/pyenv-virtualenv.svg?branch=master)](https://travis-ci.org/pyenv/pyenv-virtualenv)
 
-pyenv-virtualenv is a [pyenv](https://github.com/yyuu/pyenv) plugin
+pyenv-virtualenv is a [pyenv](https://github.com/pyenv/pyenv) plugin
 that provides features to manage virtualenvs and conda environments
 for Python on UNIX-like systems.
 
 (NOTICE: If you are an existing user of [virtualenvwrapper](http://pypi.python.org/pypi/virtualenvwrapper)
-and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtualenvwrapper) may help you
+and you love it, [pyenv-virtualenvwrapper](https://github.com/pyenv/pyenv-virtualenvwrapper) may help you
 (additionally) to manage your virtualenvs.)
 
 ## Installation
@@ -17,7 +17,7 @@ and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtual
 ### Installing as a pyenv plugin
 
 This will install the latest development version of pyenv-virtualenv into
-the `~/.pyenv/plugins/pyenv-virtualenv` directory.
+the `$(pyenv root)/plugins/pyenv-virtualenv` directory.
 
 **Important note:**  If you installed pyenv into a non-standard directory, make
 sure that you clone this repo into the 'plugins' directory of wherever you
@@ -31,7 +31,7 @@ From inside that directory you can:
 1. **Check out pyenv-virtualenv into plugin directory**
 
     ```sh
-    $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
+    $ git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
     ```
 
 2. (OPTIONAL) **Add `pyenv virtualenv-init` to your shell** to enable auto-activation of virtualenvs. This is entirely optional but pretty useful. See "Activate virtualenv" below.
@@ -40,7 +40,14 @@ From inside that directory you can:
     $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
     ```
 
+    **Fish shell note**:  Add this to your `~/.config/fish/config.fish`
+
+    ```sh
+    status --is-interactive; and source (pyenv virtualenv-init -|psub)
+    ```
+
     **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
+    
     **Pyenv note**: You may also need to add `eval "$(pyenv init -)"` to your profile if you haven't done so already.
 
 3. **Restart your shell to enable pyenv-virtualenv**
@@ -90,7 +97,7 @@ of the virtualenv directory. For example,
 $ pyenv virtualenv 2.7.10 my-virtual-env-2.7.10
 ```
 
-will create a virtualenv based on Python 2.7.10 under `~/.pyenv/versions` in a
+will create a virtualenv based on Python 2.7.10 under `$(pyenv root)/versions` in a
 folder called `my-virtual-env-2.7.10`.
 
 
@@ -129,7 +136,7 @@ There are two entries for each virtualenv, and the shorter one is just a symlink
 Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might
 require you to `activate` the virtualenv and `conda` environments.
 
-If `eval "$(pyenv virtualenv-init -)"` is configured in your shell, `pyenv-virtualenv` will automatically activate/deactivate virtualenvs on entering/leaving directories which contain a `.python-version` file that lists a valid virtual environment. `.python-version` files denote local Python versions and can be created and deleted with the [`pyenv local`](https://github.com/yyuu/pyenv/blob/master/COMMANDS.md#pyenv-local) command.
+If `eval "$(pyenv virtualenv-init -)"` is configured in your shell, `pyenv-virtualenv` will automatically activate/deactivate virtualenvs on entering/leaving directories which contain a `.python-version` file that contains the name of a valid virtual environment as shown in the output of `pyenv virtualenvs` (e.g., `venv34` or `3.4.3/envs/venv34` in example above) . `.python-version` files are used by pyenv to denote local Python versions and can be created and deleted with the [`pyenv local`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-local) command.
 
 You can also activate and deactivate a pyenv virtualenv manually:
 
@@ -141,7 +148,7 @@ pyenv deactivate
 
 ### Delete existing virtualenv
 
-Removing the directories in `~/.pyenv/versions` and `~/.pyenv/versions/{version}/envs` will delete the virtualenv, or you can run:
+Removing the directories in `$(pyenv root)/versions` and `$(pyenv root)/versions/{version}/envs` will delete the virtualenv, or you can run:
 
 ```sh
 pyenv uninstall my-virtual-env

bin/pyenv-sh-activate

@@ -146,8 +146,8 @@ if [ -z "$no_shell" ]; then
   case "$shell" in
   fish )
     cat <<EOS
-setenv PYENV_VERSION "${versions[*]}";
-setenv PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VERSION "${versions[*]}";
+set -gx PYENV_ACTIVATE_SHELL 1;
 EOS
     ;;
   * )
@@ -164,8 +164,8 @@ fi
 case "${shell}" in
 fish )
   cat <<EOS
-setenv PYENV_VIRTUAL_ENV "${prefix}";
-setenv VIRTUAL_ENV "${prefix}";
+set -gx PYENV_VIRTUAL_ENV "${prefix}";
+set -gx VIRTUAL_ENV "${prefix}";
 EOS
   ;;
 * )
@@ -185,7 +185,7 @@ if [ -x "${prefix}/bin/conda" ]; then
   fi
   case "${shell}" in
   fish )
-    echo "setenv CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
+    echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
     ;;
   * )
     echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
@@ -197,7 +197,7 @@ if [ -n "${PYTHONHOME}" ]; then
   case "${shell}" in
   fish )
     cat <<EOS
-setenv _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
+set -gx _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
 set -e PYTHONHOME;
 EOS
     ;;
@@ -237,12 +237,21 @@ if [ -x "${prefix}/bin/conda" ]; then
   shopt -s nullglob
   case "${shell}" in
   fish )
-    : # conda doesn't support fish
+    # conda 4.4 and above
+    for script in "${prefix}/etc/fish/conf.d"/*.fish; do
+      echo "source \"${script}\";"
+    done
     ;;
   * )
+    CONDA_PREFIX="$prefix"
+    echo "export CONDA_PREFIX=\"${CONDA_PREFIX}\";"
     for script in "${prefix}/etc/conda/activate.d"/*.sh; do
       echo ". \"${script}\";"
     done
+    # conda 4.4 and above
+    for script in "${prefix}/etc/profile.d"/*.sh; do
+      echo ". \"${script}\";"
+    done
     ;;
   esac
   shopt -u nullglob

bin/pyenv-sh-deactivate

@@ -69,6 +69,7 @@ if [ -x "${prefix}/bin/conda" ]; then
     for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do
       echo ". \"${script}\";"
     done
+    echo "unset CONDA_PREFIX"
     ;;
   esac
   shopt -u nullglob
@@ -125,7 +126,7 @@ case "${shell}" in
 fish )
   cat <<EOS
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 EOS
@@ -144,7 +145,7 @@ case "${shell}" in
 fish )
   cat <<EOS
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 EOS

bin/pyenv-virtualenv

@@ -9,7 +9,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20160716"
+PYENV_VIRTUALENV_VERSION="1.1.2"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -162,7 +162,7 @@ build_package_ez_setup() {
       echo "Installing setuptools from ${EZ_SETUP}..." 1>&2
       cat "${EZ_SETUP}"
     else
-      [ -n "${EZ_SETUP_URL}" ] || EZ_SETUP_URL="https://bootstrap.pypa.io/ez_setup.py"
+      [ -n "${EZ_SETUP_URL}" ]
       echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
       http get "${EZ_SETUP_URL}"
     fi
@@ -180,7 +180,7 @@ build_package_get_pip() {
       echo "Installing pip from ${GET_PIP}..." 1>&2
       cat "${GET_PIP}"
     else
-      [ -n "${GET_PIP_URL}" ] || GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
+      [ -n "${GET_PIP_URL}" ]
       echo "Installing pip from ${GET_PIP_URL}..." 1>&2
       http get "${GET_PIP_URL}"
     fi
@@ -349,9 +349,11 @@ if [[ "${VIRTUALENV_PATH/*/envs/*}" != "${PYENV_ROOT}/versions" ]]; then
 fi
 
 if [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
-  if [ -e "${COMPAT_VIRTUALENV_PATH}" ] || [ -L "${COMPAT_VIRTUALENV_PATH}" ]; then
-    echo "pyenv-virtualenv: \`${COMPAT_VIRTUALENV_PATH}' already exists." 1>&2
-    exit 1
+  if [ -z ${FORCE} ]; then
+    if [ -e "${COMPAT_VIRTUALENV_PATH}" ] || [ -L "${COMPAT_VIRTUALENV_PATH}" ]; then
+      echo "pyenv-virtualenv: \`${COMPAT_VIRTUALENV_PATH}' already exists." 1>&2
+      exit 1
+    fi
   fi
 fi
 
@@ -375,7 +377,7 @@ if [ -n "$UPGRADE" ]; then
   fi
 fi
 
-if [ -z "${VIRTUALEN_VERSION}" ]; then
+if [ -z "${VIRTUALENV_VERSION}" ]; then
   case "${PYENV_VERSION}" in
   "3.0"* )
     NO_ENSUREPIP=1
@@ -447,11 +449,39 @@ unset VIRTUALENV_VERSION
 
 
 # Download specified version of ez_setup.py/get-pip.py.
-if [ -n "${SETUPTOOLS_VERSION}" ]; then
-  EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
+if [ -z "${EZ_SETUP_URL}" ]; then
+  if [ -n "${SETUPTOOLS_VERSION}" ]; then
+    EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
+    unset SETUPTOOLS_VERSION
+  else
+    EZ_SETUP_URL="https://bootstrap.pypa.io/ez_setup.py"
+  fi
 fi
-if [ -n "${PIP_VERSION}" ]; then
-  GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+if [ -z "${GET_PIP_URL}" ]; then
+  if [ -n "${PIP_VERSION}" ]; then
+    { colorize 1 "WARNING"
+      echo ": Setting PIP_VERSION=${PIP_VERSION} is no longer supported and may cause failures during the install process."
+    } 1>&2
+    GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+    # Unset `PIP_VERSION` from environment before invoking `get-pip.py` to deal with "ValueError: invalid truth value" (pypa/pip#4528)
+    unset PIP_VERSION
+  else
+    # Use custom get-pip URL based on the target version (#1127)
+    case "${PYENV_VERSION}" in
+    2.6 | 2.6.* )
+      GET_PIP_URL="https://bootstrap.pypa.io/2.6/get-pip.py"
+      ;;
+    3.2 | 3.2.* )
+      GET_PIP_URL="https://bootstrap.pypa.io/3.2/get-pip.py"
+      ;;
+    3.3 | 3.3.* )
+      GET_PIP_URL="https://bootstrap.pypa.io/3.3/get-pip.py"
+      ;;
+    * )
+      GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
+      ;;
+    esac
+  fi
 fi
 
 
@@ -533,6 +563,17 @@ if [ -d "${VIRTUALENV_PATH}" ] && [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
   ln -fs "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
 fi
 
+if [ ! -e "${VIRTUALENV_PATH}/bin/pydoc" ]; then
+  mkdir -p "${VIRTUALENV_PATH}/bin"
+  cat <<EOS > "${VIRTUALENV_PATH}/bin/pydoc"
+#!${VIRTUALENV_PATH}/bin/python
+import pydoc
+if __name__ == '__main__':
+      pydoc.cli()
+EOS
+  chmod +x "${VIRTUALENV_PATH}/bin/pydoc"
+fi
+
 if [ -z "${NO_ENSUREPIP}" ]; then
   ## Install setuptools and pip.
   PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip

bin/pyenv-virtualenv-init

@@ -86,8 +86,8 @@ fi
 case "$shell" in
 fish )
   cat <<EOS
-setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
-setenv PYENV_VIRTUALENV_INIT 1;
+set -gx PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
+set -gx PYENV_VIRTUALENV_INIT 1;
 EOS
   ;;
 * )

etc/pyenv.d/which/python-config.bash

@@ -12,7 +12,7 @@ if [ ! -x "${PYENV_COMMAND_PATH}" ] && [[ "${PYENV_COMMAND_PATH##*/}" == "python
     if [ -f "${PYENV_ROOT}/versions/${version}/bin/conda" ]; then
       : # do nothing for conda's environments
     else
-      if [ -f "${PYENV_ROOT}/versions/${version}/bin/pyvenv.cfg" ]; then
+      if [ -f "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" ]; then
         # venv
         virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
         virtualenv_prefix="${virtualenv_binpath%/bin}"

test/activate.bats

@@ -138,8 +138,8 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS
 
@@ -162,10 +162,10 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx PYENV_VERSION "venv";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS
 
@@ -239,10 +239,10 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx PYENV_VERSION "venv27";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS
 
@@ -263,10 +263,10 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx PYENV_VERSION "venv27";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS
 
@@ -381,7 +381,7 @@ EOS
   stub pyenv-virtualenv-prefix "2.7.10 : false"
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
-  run pyenv-sh-activate "venv27" "2.7.10"
+  PYENV_SHELL="bash" run pyenv-sh-activate "venv27" "2.7.10"
 
   assert_success
   assert_output <<EOS

test/conda-activate.bats

@@ -39,6 +39,7 @@ export CONDA_DEFAULT_ENV="root";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(anaconda-2.3.0) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0";
 EOS
 
   unstub pyenv-version-name
@@ -62,9 +63,9 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
-setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
-setenv CONDA_DEFAULT_ENV "root";
+set -gx PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
+set -gx VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
+set -gx CONDA_DEFAULT_ENV "root";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS
 
@@ -97,6 +98,7 @@ export CONDA_DEFAULT_ENV="root";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(miniconda-3.9.1) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1";
 EOS
 
   unstub pyenv-virtualenv-prefix
@@ -126,6 +128,7 @@ export CONDA_DEFAULT_ENV="foo";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(anaconda-2.3.0/envs/foo) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0/envs/foo";
 . "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/activate.d/activate.sh";
 EOS
 
@@ -158,6 +161,7 @@ export CONDA_DEFAULT_ENV="bar";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(miniconda-3.9.1/envs/bar) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1/envs/bar";
 . "${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar/etc/conda/activate.d/activate.sh";
 EOS
 

test/conda-deactivate.bats

@@ -30,6 +30,7 @@ setup() {
 
   assert_success
   assert_output <<EOS
+unset CONDA_PREFIX
 unset PYENV_VIRTUAL_ENV;
 unset VIRTUAL_ENV;
 unset CONDA_DEFAULT_ENV;
@@ -69,11 +70,11 @@ set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 set -e CONDA_DEFAULT_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -97,6 +98,7 @@ EOS
   assert_success
   assert_output <<EOS
 . "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/deactivate.d/deactivate.sh";
+unset CONDA_PREFIX
 unset PYENV_VIRTUAL_ENV;
 unset VIRTUAL_ENV;
 unset CONDA_DEFAULT_ENV;

test/deactivate.bats

@@ -247,11 +247,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -273,11 +273,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -301,11 +301,11 @@ set -e PYENV_ACTIVATE_SHELL;
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -329,11 +329,11 @@ set -e PYENV_ACTIVATE_SHELL;
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -355,11 +355,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;

test/init.bats

@@ -72,8 +72,8 @@ EOS
   run pyenv-virtualenv-init - fish
   assert_success
   assert_output <<EOS
-setenv PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
-setenv PYENV_VIRTUALENV_INIT 1;
+set -gx PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
+set -gx PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   set -l ret \$status
   if [ -n "\$VIRTUAL_ENV" ]

test/pip.bats

@@ -63,7 +63,7 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.3.6 python -m venv ${PYENV_ROOT}/versions/3.3.6/envs/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/3.3/get-pip.py...
 PYENV_VERSION=3.3.6/envs/venv python -s ${TMP}/pyenv/cache/get-pip.py
 rehashed
 OUT

test/pyvenv.bats

@@ -32,11 +32,12 @@ unstub_pyenv() {
 
   run pyenv-virtualenv venv
 
-  assert_success
   assert_output <<OUT
 PYENV_VERSION=3.5.1 python -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
+  assert_success
 
   unstub_pyenv
   unstub pyenv-virtualenv-prefix
@@ -57,11 +58,12 @@ OUT
 
   run pyenv-virtualenv venv
 
-  assert_success
   assert_output <<OUT
 PYENV_VERSION=3.5.1 virtualenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
+  assert_success
 
   unstub_pyenv
   unstub pyenv-virtualenv-prefix
@@ -69,7 +71,7 @@ OUT
   teardown_m_venv "3.5.1"
 }
 
-@test "install virtualenv if venv is not avaialble" {
+@test "install virtualenv if venv is not available" {
   export PYENV_VERSION="3.2.1"
   setup_version "3.2.1"
   stub_pyenv "${PYENV_VERSION}"
@@ -81,12 +83,13 @@ OUT
 
   run pyenv-virtualenv venv
 
-  assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 pip install virtualenv==13.1.2
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.2.1/envs/venv/bin/pydoc" ]
+  assert_success
 
   unstub_pyenv
   unstub pyenv-virtualenv-prefix
@@ -112,6 +115,7 @@ PYENV_VERSION=3.5.1 pip install virtualenv
 PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
   assert_success
 
   unstub_pyenv
@@ -138,6 +142,7 @@ PYENV_VERSION=3.5.1 pip install virtualenv
 PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
   assert_success
 
   unstub_pyenv
@@ -158,12 +163,13 @@ OUT
 
   PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv
 
-  assert_success
   assert_output <<OUT
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv==13.1.2
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.2.1/envs/venv/bin/pydoc" ]
+  assert_success
 
   unstub_pyenv
   unstub pyenv-virtualenv-prefix

test/version.bats

@@ -15,7 +15,7 @@ setup() {
   run pyenv-virtualenv --version
 
   assert_success
-  [[ "$output" == "pyenv-virtualenv 20"*" (virtualenv 1.11)" ]]
+  [[ "$output" == "pyenv-virtualenv "?.?.?" (virtualenv 1.11)" ]]
 
   unstub pyenv-prefix
   unstub pyenv-exec
@@ -30,7 +30,7 @@ setup() {
   run pyenv-virtualenv --version
 
   assert_success
-  [[ "$output" == "pyenv-virtualenv 20"*" (python -m venv)" ]]
+  [[ "$output" == "pyenv-virtualenv "?.?.?" (python -m venv)" ]]
 
   unstub pyenv-prefix
   teardown_m_venv "3.4.1"

test/virtualenv.bats

@@ -34,12 +34,13 @@ unstub_pyenv() {
 
   run pyenv-virtualenv "2.7.11" "venv"
 
-  assert_success
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
+  assert_success
 
   unstub_pyenv
   unstub pyenv-virtualenv-prefix
@@ -60,12 +61,13 @@ OUT
 
   run pyenv-virtualenv venv
 
-  assert_success
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
+  assert_success
 
   unstub_pyenv
   unstub pyenv-version-name
@@ -92,6 +94,7 @@ PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/v
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
   assert_success
 
   unstub_pyenv
@@ -119,6 +122,7 @@ PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/v
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
   assert_success
 
   unstub_pyenv
@@ -176,12 +180,13 @@ OUT
 
   run pyenv-virtualenv "2.7.11" "2.7.11/envs/foo"
 
-  assert_success
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/foo
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/foo/bin/pydoc" ]
+  assert_success
 
   unstub_pyenv
   unstub pyenv-virtualenv-prefix