v20150719

Manage Anaconda/Miniconda environment as a pyenv version

README.md

@@ -3,8 +3,8 @@
 [![Build Status](https://travis-ci.org/yyuu/pyenv-virtualenv.png)](https://travis-ci.org/yyuu/pyenv-virtualenv)
 
 pyenv-virtualenv is a [pyenv](https://github.com/yyuu/pyenv) plugin
-that provides a `pyenv virtualenv` command to create virtualenvs for Python
-on UNIX-like systems.
+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
@@ -28,17 +28,24 @@ From inside that directory you can:
 
 1. **Check out pyenv-virtualenv into plugin directory**
 
-        $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
+```
+$ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
+```
 
-2. **Add `pyenv virtualenv-init` to your shell** to enable activation of virtualenv. This is entirely optional but pretty useful.
+2. (OPTIONAL) **Add `pyenv virtualenv-init` to your shell** to enable auto-activation of virtualenv. This is entirely optional but pretty useful.
+
+```
+$ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
+```
 
-        $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
     **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**
 
-        $ exec "$SHELL"
+```
+$ exec "$SHELL"
+```
 
 
 ### Installing with Homebrew (for OS X users)
@@ -61,9 +68,8 @@ Or, if you would like to install the latest development release:
 $ brew install --HEAD pyenv-virtualenv
 ```
 
-After installation, you'll still need to add `eval "$(pyenv virtualenv-init
--)"` to your profile (as stated in the caveats). You'll only ever have to do
-this once.
+After installation, you'll still need to add `eval "$(pyenv virtualenv-init -)"` to your profile (as stated in the caveats).
+You'll only ever have to do this once.
 
 
 ## Usage
@@ -75,11 +81,11 @@ To create a virtualenv for the Python version used with pyenv, run
 of the virtualenv directory. For example,
 
 ```
-$ pyenv virtualenv 2.7.7 my-virtual-env-2.7.7
+$ pyenv virtualenv 2.7.10 my-virtual-env-2.7.10
 ```
 
-will create a virtualenv based on Python 2.7.7 under `~/.pyenv/versions` in a
-folder called `my-virtual-env-2.7.7`.
+will create a virtualenv based on Python 2.7.10 under `~/.pyenv/versions` in a
+folder called `my-virtual-env-2.7.10`.
 
 
 ### Create virtualenv from current version
@@ -89,42 +95,49 @@ be created with the given name based on the current pyenv Python version.
 
 ```
 $ pyenv version
-3.4.2 (set by /home/yyuu/.pyenv/version)
+3.4.3 (set by /home/yyuu/.pyenv/version)
 $ pyenv virtualenv venv34
 ```
 
 
 ### List existing virtualenvs
 
-`pyenv virtualenvs` shows you the list of existing virtualenvs:
+`pyenv virtualenvs` shows you the list of existing virtualenvs and `conda` environments.
 
 ```
 $ pyenv shell venv27
 $ pyenv virtualenvs
-* venv27 (created from /home/yyuu/.pyenv/versions/2.7.7)
-  venv34 (created from /home/yyuu/.pyenv/versions/3.4.1)
+  miniconda3-3.9.1 (created from /home/yyuu/.pyenv/versions/miniconda3-3.9.1)
+  miniconda3-3.9.1/envs/myenv (created from /home/yyuu/.pyenv/versions/miniconda3-3.9.1)
+* venv27 (created from /home/yyuu/.pyenv/versions/2.7.10)
+  venv34 (created from /home/yyuu/.pyenv/versions/3.4.3)
 ```
 
 
 ### Activate virtualenv
 
 Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might
-require you to `activate` the virtualenv.
+require you to `activate` the virtualenv and `conda` environments.
 
 `pyenv-virtualenv` will automatically activate/deactivate the virtualenv if
 the `eval "$(pyenv virtualenv-init -)"` is properly configured in your shell.
 
 You can also activate and deactivate a pyenv virtualenv manually:
 
-    pyenv activate <name>
-    pyenv deactivate
+```sh
+pyenv activate <name>
+pyenv deactivate
+```
 
 
 ### Delete existing virtualenv
 
 Removing the directory in `~/.pyenv/versions` will delete the virtualenv, or you can run:
 
-    pyenv uninstall my-virtual-env
+```sh
+pyenv uninstall my-virtual-env
+```
+
 
 ### virtualenv and pyvenv
 
@@ -137,6 +150,42 @@ and distributed by default.
 command is not available.
 
 
+### Anaconda and Miniconda
+
+Because Anaconda and Miniconda may install standard commands (e.g. `curl`, `openssl`, `sqlite3`, etc.) into their prefix,
+we'd recommend you to install [pyenv-which-ext](https://github.com/yyuu/pyenv-which-ext).
+
+You can manage `conda` environments by `conda env` as same manner as standard Anaconda/Miniconda installations.
+To use those environments, you can use `pyenv activate` and `pyenv deactivate`.
+
+```
+(root)$ pyenv version
+miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
+(root)$ conda env list
+# conda environments:
+#
+myenv                    /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv
+root                  *  /home/yyuu/.pyenv/versions/miniconda3-3.9.1
+(root)$ pyenv activate myenv
+discarding /home/yyuu/.pyenv/versions/miniconda3-3.9.1/bin from PATH
+prepending /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin to PATH
+(myenv)$ python --version
+Python 3.4.3 :: Continuum Analytics, Inc.
+(myenv)$ pyenv deactivate
+discarding /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin from PATH
+```
+
+You can use version like `miniconda3-3.9.1/envs/myenv` to specify `conda` environment as a version in pyenv.
+
+```
+(root)$ pyenv version
+miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
+(root)$ pyenv shell miniconda3-3.9.1/envs/myenv
+(myenv)$ which python
+/home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin/python
+```
+
+
 ### Special environment variables
 
 You can set certain environment variables to control pyenv-virtualenv.
@@ -146,16 +195,22 @@ You can set certain environment variables to control pyenv-virtualenv.
 * `VIRTUALENV_VERSION`, if set, forces pyenv-virtualenv to install the desired
   version of virtualenv. If `virtualenv` has not been installed,
   pyenv-virtualenv will try to install the given version of virtualenv.
-* `EZ_SETUP` and `GET_PIP`, if set and `pyvenv` is preferred over `virtualenv`,
-  use `ez_setup.py` and `get_pip.py` from the specified location.
-* `EZ_SETUP_URL` and `GET_PIP_URL`, if set and `pyvenv` is preferred over
-  `virtualenv`, download `ez_setup.py` and `get_pip.py` from the specified URL.
-* `SETUPTOOLS_VERSION` and `PIP_VERSION`, if set and `pyvenv` is preferred
-  over `virtualenv`, install the specified version of setuptools and pip.
+* `GET_PIP`, if set and `pyvenv` is preferred over `virtualenv`,
+  use `get_pip.py` from the specified location.
+* `GET_PIP_URL`, if set and `pyvenv` is preferred over
+  `virtualenv`, download `get_pip.py` from the specified URL.
+* `PIP_VERSION`, if set and `pyvenv` is preferred
+  over `virtualenv`, install the specified version of pip.
 
 
 ## Version History
 
+#### 20150719
+
+* Add support for `conda` environments created by Anaconda/Miniconda (#91)
+* Look up commands for original version as well if the environment is created with `--system-site-packages` (#62)
+* Add error message if the source version is not installed (#83)
+
 #### 20150526
 
 * Use `typeset -g` with `precmd_functions` (#75)

bin/pyenv-sh-activate

@@ -62,13 +62,43 @@ if [ "${#versions[@]}" -gt 1 ]; then
   exit 1
 fi
 
-if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
-  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
-  echo "false"
-  exit 1
+if pyenv-prefix "${versions}" 1>/dev/null 2>&1; then
+  if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
+    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
+    echo "false"
+    exit 1
+  fi
+else
+  version="$(pyenv-version-name)"
+  if [[ "${versions}" == "root" ]]; then
+    versions="${version%/envs/*}"
+  else
+    versions="${version%/envs/*}/envs/${versions}"
+  fi
+  if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
+    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not an environment of anaconda/miniconda" 1>&2
+    echo "false"
+    exit 1
+  fi
 fi
 
 shell="${PYENV_SHELL:-${SHELL##*/}}"
+prefix="$(pyenv-prefix "${versions}")"
+
+unset conda_env
+
+if [ -f "${prefix}/bin/conda" ]; then
+  if [[ "$shell" != "bash" ]] && [[ "$shell" != "zsh" ]]; then
+    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda" 1>&2
+    echo "false"
+    exit 1
+  fi
+  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
+    conda_env="${prefix##*/envs/}"
+  else
+    conda_env="root"
+  fi
+fi
 
 # Display setup instruction, if pyenv-virtualenv has not been initialized.
 # if 'pyenv virtualenv-init -' is not found in "$profile"
@@ -94,20 +124,29 @@ if [ -z "$no_shell" ]; then
   esac
 fi
 
-prefix="$(pyenv-prefix "${versions}")"
-case "$shell" in
-fish )
+if [ -n "${conda_env}" ]; then
+  # anaconda/miniconda
   cat <<EOS
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${prefix}";
+. "${prefix%/envs/*}/bin/activate" "${conda_env}";
+EOS
+else
+  # virtualenv/pyvenv
+  case "$shell" in
+  fish )
+    cat <<EOS
 set -e PYENV_DEACTIVATE;
 setenv PYENV_ACTIVATE "${prefix}";
 . "${prefix}/bin/activate.fish";
 EOS
- ;;
-*    )
-  cat <<EOS
+   ;;
+  *    )
+    cat <<EOS
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${prefix}";
 . "${prefix}/bin/activate";
 EOS
-  ;;
-esac
+    ;;
+  esac
+fi

bin/pyenv-sh-deactivate

@@ -28,17 +28,36 @@ while [ $# -gt 0 ]; do
 done
 
 shell="$(basename "${PYENV_SHELL:-$SHELL}")"
-case "$shell" in
-fish )
-  echo "if functions -q deactivate;"
-  ;;
-*    )
-  echo "if declare -f deactivate 1>/dev/null 2>&1; then"
-  ;;
-esac
-
 prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}"
 
+unset conda_env
+
+if [ -f "${prefix}/bin/conda" ]; then
+  if [[ "$shell" != "bash" ]] && [[ "$shell" != "zsh" ]]; then
+    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda" 1>&2
+    echo "false"
+    exit 1
+  fi
+  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
+    conda_env="${prefix##*/envs/}"
+  else
+    conda_env="root"
+  fi
+fi
+
+if [ -n "${conda_env}" ]; then
+  echo "if [ -f \"${prefix%/envs/*}/bin/deactivate\" ]; then"
+else
+  case "$shell" in
+  fish )
+    echo "if functions -q deactivate;"
+    ;;
+  *    )
+    echo "if declare -f deactivate 1>/dev/null 2>&1; then"
+    ;;
+  esac
+fi
+
 if [ -n "$VERBOSE" ]; then
   echo "  echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
 fi
@@ -57,24 +76,33 @@ if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then
   esac
 fi
 
-case "$shell" in
-fish )
+if [ -n "${conda_env}" ]; then
   cat <<EOS
+  export PYENV_DEACTIVATE="$prefix";
+  unset PYENV_ACTIVATE;
+  . "${prefix%/envs/*}/bin/deactivate";
+else
+EOS
+else
+  case "$shell" in
+  fish )
+    cat <<EOS
   setenv PYENV_DEACTIVATE "$prefix";
   set -e PYENV_ACTIVATE;
   deactivate;
 else;
 EOS
-  ;;
-*    )
-  cat <<EOS
+    ;;
+  *    )
+    cat <<EOS
   export PYENV_DEACTIVATE="$prefix";
   unset PYENV_ACTIVATE;
   deactivate;
 else
 EOS
-  ;;
-esac
+    ;;
+  esac
+fi
 
 if [ -z "$NOERROR" ]; then
   echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"

bin/pyenv-virtualenv

@@ -9,7 +9,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20150526"
+PYENV_VIRTUALENV_VERSION="20150719"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -182,9 +182,7 @@ build_package_get_pip() {
 }
 
 build_package_ensurepip() {
-  pyenv-exec python -m ensurepip 2>/dev/null|| {
-    build_package_ez_setup "$@" && build_package_get_pip "$@"
-  } || return 1
+  pyenv-exec python -m ensurepip 2>/dev/null || build_package_get_pip "$@" || return 1
 }
 
 prepare_requirements() {
@@ -284,7 +282,10 @@ fi
 export PYENV_VERSION="${VERSION_NAME}"
 
 # Source version must exist before creating virtualenv.
-pyenv-prefix 1>/dev/null 2>&1 || usage 1
+if ! pyenv-prefix 1>/dev/null 2>&1; then
+  echo "pyenv-virtualenv: \`${PYENV_VERSION}' is not installed in pyenv." 1>&2
+  exit 1
+fi
 
 if [ -z "$TMPDIR" ]; then
   TMP="/tmp"

bin/pyenv-virtualenv-init

@@ -20,10 +20,11 @@ done
 
 shell="${1:-$PYENV_SHELL}"
 if [ -z "$shell" ]; then
-  shell="$(ps c -p "$PPID" -o 'ucomm=' 2>/dev/null || true)"
+  shell="$(ps -p "$PPID" -o 'args=' 2>/dev/null || true)"
   shell="${shell##-}"
   shell="${shell%% *}"
-  shell="$(basename "${shell:-$SHELL}")"
+  shell="${shell:-$SHELL}"
+  shell="${shell##*/}"
 fi
 
 if [ -z "$print" ]; then
@@ -114,21 +115,21 @@ if [[ "$shell" != "fish" ]]; then
   cat <<EOS
   if [ -n "\$PYENV_ACTIVATE" ]; then
     if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
-      pyenv deactivate --no-error --verbose
+      eval "\$(pyenv sh-deactivate --no-error --verbose)"
       unset PYENV_DEACTIVATE
       return 0
     fi
     if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if pyenv deactivate --no-error --verbose; then
+      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
         unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
+        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
       else
-        pyenv activate --no-error --verbose
+        eval "\$(pyenv sh-activate --no-error --verbose)"
       fi
     fi
   else
     if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      pyenv activate --no-error --verbose || true
+      eval "\$(pyenv sh-activate --no-error --verbose)" || true
     fi
   fi
 };

bin/pyenv-virtualenv-prefix

@@ -31,7 +31,8 @@ base_prefix() { # pyvenv
 }
 
 VIRTUALENV_PREFIX_PATHS=()
-for version in "${versions[@]}"; do
+for version_string in "${versions[@]}"; do
+  version="${version_string%%/*}"
   if [ "$version" = "system" ]; then
     echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
     exit 1
@@ -40,8 +41,17 @@ for version in "${versions[@]}"; do
   if [ -f "${PREFIX}/bin/activate" ]; then
     # Anaconda has `activate` script nevertheless it is not a virtual environment (#65)
     if [ -f "${PREFIX}/bin/conda" ]; then
-      echo "pyenv-virtualenv: version \`${version}' is an anaconda/miniconda" 1>&2
-      exit 1
+      if [[ "${version_string}" != "${version_string%/envs/*}" ]]; then
+        conda_env="${version_string##*/envs/}"
+        if [ -f "${PREFIX}/envs/${conda_env}/bin/conda" ]; then
+          VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
+        else
+          echo "pyenv-virtualenv: version \`${version_string}' is not an environment of anaconda/miniconda" 1>&2
+          exit 1
+        fi
+      else
+        VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
+      fi
     else
       VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
       VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")

bin/pyenv-virtualenvs

@@ -51,6 +51,15 @@ for version in $(pyenv-versions --bare); do
     virtualenv_prefix="$(pyenv-virtualenv-prefix "${version}" 2>/dev/null || true)"
     if [ -d "${virtualenv_prefix}" ]; then
       print_version "${version}" " (created from ${virtualenv_prefix})"
+      prefix="$(pyenv-prefix "${version}")"
+      if [ -f "${prefix}/bin/conda" ]; then
+        # envs of anaconda/miniconda
+        shopt -s nullglob
+        for conda_env in "${prefix}/envs/"*; do
+          print_version "${version##*/}${conda_env#${prefix}}" " (created from ${prefix})"
+        done
+        shopt -u nullglob
+      fi
     fi
   fi
 done

etc/pyenv.d/which/system-site-packages.bash

@@ -0,0 +1,20 @@
+# if virtualenv is created with `--system-site-packages`,
+# looks up executables for source version as well if none is
+# installed in the virtualenv.
+# https://github.com/yyuu/pyenv-virtualenv/issues/62
+
+if [ ! -x "${PYENV_COMMAND_PATH}" ]; then
+  virtualenv_prefix="$(pyenv-virtualenv-prefix 2>/dev/null || true)"
+  if [ -d "${virtualenv_prefix}" ]; then
+    shopt -s nullglob
+    no_global_site_packages="$(echo "$(pyenv-prefix)/lib/"*"/no-global-site-packages.txt")"
+    shopt -u nullglob
+    if [ ! -f "${no_global_site_packages}" ]; then
+      # virtualenv is created with `--system-site-packages`
+      virtualenv_command_path="${virtualenv_prefix}/bin/${PYENV_COMMAND_PATH##*/}"
+      if [ -x "${virtualenv_command_path}" ]; then
+        PYENV_COMMAND_PATH="${virtualenv_command_path}"
+      fi
+    fi
+  fi
+fi

test/activate.bats

@@ -13,6 +13,7 @@ setup() {
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -34,6 +35,7 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose
 
@@ -56,6 +58,7 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -84,6 +87,7 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -105,6 +109,7 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -132,6 +137,7 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -153,6 +159,7 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -179,6 +186,7 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -200,6 +208,7 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
@@ -232,10 +241,12 @@ EOS
 
 @test "should fail if the version is not a virtualenv" {
   stub pyenv-virtualenv-prefix "3.3.3 : false"
+  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-sh-activate "3.3.3"
 
   unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
 
   assert_failure
   assert_output <<EOS
@@ -246,10 +257,12 @@ EOS
 
 @test "should fail if the version is not a virtualenv (no-error)" {
   stub pyenv-virtualenv-prefix "3.3.3 : false"
+  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-sh-activate --no-error "3.3.3"
 
   unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
 
   assert_failure
   assert_output <<EOS

test/conda-activate.bats

@@ -0,0 +1,149 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export HOME="${TMP}"
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "activate conda root from current version" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  create_conda "anaconda-2.3.0"
+  stub pyenv-version-name "echo anaconda-2.3.0"
+  stub pyenv-virtualenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0";
+. "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/activate" "root";
+EOS
+}
+
+@test "activate conda root from current version (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  create_conda "anaconda-2.3.0"
+  stub pyenv-version-name "echo anaconda-2.3.0"
+  stub pyenv-virtualenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+
+  PYENV_SHELL="fish" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_failure
+  assert_output <<EOS
+pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda
+false
+EOS
+}
+
+@test "activate conda root from command-line argument" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  create_conda "anaconda-2.3.0"
+  create_conda "miniconda-3.9.1"
+  stub pyenv-virtualenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
+  stub pyenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
+  stub pyenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate "miniconda-3.9.1"
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "miniconda-3.9.1";
+export PYENV_ACTIVATE_SHELL=1;
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1";
+. "${PYENV_ROOT}/versions/miniconda-3.9.1/bin/activate" "root";
+EOS
+}
+
+@test "activate conda env from current version" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  create_conda "anaconda-2.3.0" "foo"
+  stub pyenv-version-name "echo anaconda-2.3.0/envs/foo"
+  stub pyenv-virtualenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
+  stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
+  stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
+. "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/activate" "foo";
+EOS
+}
+
+@test "activate conda env from command-line argument" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  create_conda "anaconda-2.3.0" "foo"
+  create_conda "miniconda-3.9.1" "bar"
+  stub pyenv-virtualenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
+  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
+  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate "miniconda-3.9.1/envs/bar"
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "miniconda-3.9.1/envs/bar";
+export PYENV_ACTIVATE_SHELL=1;
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
+. "${PYENV_ROOT}/versions/miniconda-3.9.1/bin/activate" "bar";
+EOS
+}
+
+@test "activate conda env from command-line argument in short-form" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  create_conda "miniconda-3.9.1" "bar"
+  stub pyenv-prefix "bar : false"
+  stub pyenv-version-name " : echo miniconda-3.9.1"
+  stub pyenv-virtualenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
+  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="miniconda-3.9.1" run pyenv-sh-activate "bar"
+
+  unstub pyenv-prefix
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "miniconda-3.9.1/envs/bar";
+export PYENV_ACTIVATE_SHELL=1;
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
+. "${PYENV_ROOT}/versions/miniconda-3.9.1/bin/activate" "bar";
+EOS
+}

test/conda-deactivate.bats

@@ -0,0 +1,64 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "deactivate conda root" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export PYENV_ACTIVATE_SHELL=
+
+  create_conda "anaconda-2.3.0"
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+if [ -f "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate" ]; then
+  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  . "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate";
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+fi;
+EOS
+}
+
+@test "deactivate conda root (fish)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export PYENV_ACTIVATE_SHELL=
+
+  create_conda "anaconda-2.3.0"
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_failure
+  assert_output <<EOS
+pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda
+false
+EOS
+}
+
+@test "deactivate conda env" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
+  export PYENV_ACTIVATE_SHELL=
+
+  create_conda "anaconda-2.3.0" "foo"
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+if [ -f "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate" ]; then
+  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  . "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate";
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+fi;
+EOS
+}

test/conda-virtualenv-prefix.bats

@@ -0,0 +1,41 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "display conda root" {
+  create_conda "anaconda-2.3.0"
+
+  stub pyenv-version-name "echo anaconda-2.3.0"
+  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+
+  PYENV_VERSION="anaconda-2.3.0" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/anaconda-2.3.0
+OUT
+}
+
+@test "display conda env" {
+  create_conda "anaconda-2.3.0" "foo"
+
+  stub pyenv-version-name "echo anaconda-2.3.0/envs/foo"
+  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+
+  PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/anaconda-2.3.0
+OUT
+}

test/deactivate.bats

@@ -106,6 +106,7 @@ EOS
 
 @test "deactivate virtualenv which has been activated manually" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE=
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
@@ -203,6 +204,7 @@ EOS
 
 @test "deactivate virtualenv which has been activated manually (fish)" {
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE=
   export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate

test/init.bats

@@ -4,12 +4,31 @@ load test_helper
 
 @test "detect parent shell" {
   unset PYENV_SHELL
-  root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
   SHELL=/bin/false run pyenv-virtualenv-init -
   assert_success
   assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
 }
 
+@test "detect parent shell from script (sh)" {
+  unset PYENV_SHELL
+  printf '#!/bin/sh\necho "$(pyenv-virtualenv-init -)"' > "${TMP}/script.sh"
+  chmod +x ${TMP}/script.sh
+  run ${TMP}/script.sh
+  assert_success
+  assert_output_contains_not '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
+  rm -f "${TMP}/script.sh"
+}
+
+@test "detect parent shell from script (bash)" {
+  unset PYENV_SHELL
+  printf '#!/bin/bash\necho "$(pyenv-virtualenv-init -)"' > "${TMP}/script.sh"
+  chmod +x ${TMP}/script.sh
+  run ${TMP}/script.sh
+  assert_success
+  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
+  rm -f "${TMP}/script.sh"
+}
+
 @test "sh-compatible instructions" {
   run pyenv-virtualenv-init bash
   assert [ "$status" -eq 1 ]
@@ -34,21 +53,21 @@ export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
     if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
-      pyenv deactivate --no-error --verbose
+      eval "\$(pyenv sh-deactivate --no-error --verbose)"
       unset PYENV_DEACTIVATE
       return 0
     fi
     if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if pyenv deactivate --no-error --verbose; then
+      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
         unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
+        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
       else
-        pyenv activate --no-error --verbose
+        eval "\$(pyenv sh-activate --no-error --verbose)"
       fi
     fi
   else
     if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      pyenv activate --no-error --verbose || true
+      eval "\$(pyenv sh-activate --no-error --verbose)" || true
     fi
   fi
 };
@@ -96,21 +115,21 @@ export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
     if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
-      pyenv deactivate --no-error --verbose
+      eval "\$(pyenv sh-deactivate --no-error --verbose)"
       unset PYENV_DEACTIVATE
       return 0
     fi
     if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if pyenv deactivate --no-error --verbose; then
+      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
         unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
+        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
       else
-        pyenv activate --no-error --verbose
+        eval "\$(pyenv sh-activate --no-error --verbose)"
       fi
     fi
   else
     if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      pyenv activate --no-error --verbose || true
+      eval "\$(pyenv sh-activate --no-error --verbose)" || true
     fi
   fi
 };

test/pip.bats

@@ -52,10 +52,8 @@ OUT
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */ez_setup.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/easy_install"
   stub pyenv-exec "python */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
   stub curl true
-  stub curl true
 
   remove_executable "3.3.5" "virtualenv"
   create_executable "3.3.5" "pyvenv"
@@ -65,8 +63,6 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
-Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
-PYENV_VERSION=venv python ${TMP}/pyenv/cache/ez_setup.py
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 PYENV_VERSION=venv python ${TMP}/pyenv/cache/get-pip.py
 rehashed

test/pyvenv.bats

@@ -74,10 +74,8 @@ OUT
   stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
   stub curl true
-  stub curl true
 
   remove_executable "3.2.1" "virtualenv"
   remove_executable "3.2.1" "pyvenv"
@@ -88,7 +86,6 @@ OUT
   assert_output <<OUT
 PYENV_VERSION=3.2.1 pip install virtualenv
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
-Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -156,10 +153,8 @@ OUT
   stub pyenv-exec "pip install virtualenv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
   stub curl true
-  stub curl true
 
   remove_executable "3.2.1" "virtualenv"
   remove_executable "3.2.1" "pyvenv"
@@ -170,7 +165,6 @@ OUT
   assert_output <<OUT
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
-Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT

test/test_helper.bash

@@ -97,6 +97,16 @@ assert_output_contains() {
   }
 }
 
+assert_output_contains_not() {
+  local expected="$1"
+  echo "$output" | grep -F "$expected" >/dev/null && {
+    { echo "expected output to not contain $expected"
+      echo "actual: $output"
+    } | flunk; return
+  }
+  return 0
+}
+
 create_executable() {
   mkdir -p "${PYENV_ROOT}/versions/$1/bin"
   touch "${PYENV_ROOT}/versions/$1/bin/$2"
@@ -106,3 +116,19 @@ create_executable() {
 remove_executable() {
   rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
 }
+
+create_conda() {
+  local version="$1"
+  shift 1
+  mkdir -p "${PYENV_ROOT}/versions/$version/bin"
+  touch "${PYENV_ROOT}/versions/$version/bin/activate"
+  touch "${PYENV_ROOT}/versions/$version/bin/conda"
+  chmod +x "${PYENV_ROOT}/versions/$version/bin/conda"
+  local conda_env
+  for conda_env; do
+    mkdir -p "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin"
+    touch "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/activate"
+    touch "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/conda"
+    chmod +x "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/conda"
+  done
+}

test/version.bats

@@ -4,7 +4,7 @@ load test_helper
 
 setup() {
   export PYENV_ROOT="${TMP}/pyenv"
-  export PYENV_VIRTUALENV_VERSION="20150526"
+  export PYENV_VIRTUALENV_VERSION="20150719"
 }
 
 @test "display virtualenv version" {

test/virtualenv.bats

@@ -28,17 +28,14 @@ unstub_pyenv() {
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
   stub curl true
-  stub curl true
 
   run pyenv-virtualenv "3.2.1" "venv"
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
-Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -54,17 +51,14 @@ OUT
   stub pyenv-version-name "echo \${PYENV_VERSION}"
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
   stub curl true
-  stub curl true
 
   run pyenv-virtualenv venv
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
-Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -81,17 +75,14 @@ OUT
   stub pyenv-version-name "echo \${PYENV_VERSION}"
   stub pyenv-exec "virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
   stub curl true
-  stub curl true
 
   run pyenv-virtualenv -v -p python venv
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv
-Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -108,17 +99,14 @@ OUT
   stub pyenv-version-name "echo \${PYENV_VERSION}"
   stub pyenv-exec "virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
   stub curl true
-  stub curl true
 
   run pyenv-virtualenv --verbose --python=python venv
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv
-Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT

test/virtualenvs.bats

@@ -17,12 +17,15 @@ setup() {
   stub pyenv-virtualenv-prefix "3.3.3 : false"
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
   stub pyenv-virtualenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
+  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-virtualenvs
 
   unstub pyenv-version-name
   unstub pyenv-versions
   unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
 
   assert_success
   assert_output <<OUT
@@ -36,12 +39,15 @@ OUT
   stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
   stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
   stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
+  stub pyenv-prefix "venv27 : echo \"/usr\""
+  stub pyenv-prefix "venv33 : echo \"/usr\""
 
   run pyenv-virtualenvs
 
   unstub pyenv-version-name
   unstub pyenv-versions
   unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
 
   assert_success
   assert_output <<OUT
@@ -54,11 +60,14 @@ OUT
   stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
   stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
   stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
+  stub pyenv-prefix "venv27 : echo \"/usr\""
+  stub pyenv-prefix "venv33 : echo \"/usr\""
 
   run pyenv-virtualenvs --bare
 
   unstub pyenv-versions
   unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
 
   assert_success
   assert_output <<OUT