v20160202

Install virtualenv 13.1.2 for CPython 3.2 (yyuu/pyenv#531 )
v20160112
2025-11-08 11:33:55 -05:00 · 2016-02-02 08:47:11 +00:00 · 2016-01-30 04:34:23 +00:00 · 2016-01-12 01:53:27 +00:00 · 2016-01-12 00:33:34 +00:00 · 2016-01-03 07:44:19 +09:00
37 changed files with 2847 additions and 981 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 install: git clone https://github.com/sstephenson/bats.git
 script: bats/bin/bats --tap test
 language: c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,159 @@
+## Version History
+
+#### 20160202
+
+* Install virtualenv 13.1.2 for CPython/Stackless 3.2.x (yyuu/pyenv#531)
+
+#### 20160112
+
+* Fix problem with `virtualenv` to look up executables from source version with `--system-site-packages` (#62)
+
+#### 20151229
+
+* Fix `deactivate` error on `fish` (#136)
+
+#### 20151222
+
+* 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)
+* 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)
+
+#### 20151103
+
+* Passing return value from executed command. (#100)
+* Add workaround for commands installed in a virtual environment created by `pyvenv` (#62)
+* init: zsh: prepend hook to `precmd_functions` (#101)
+
+#### 20151006
+
+* Ignore user's site-packages on ensurepip/get-pip (#89)
+* Find `python-config` from source version if current version is a virtualenv
+* Fix pyenv-virtualenv-init script for fish where command was in string and not being evaluated (#98)
+* Add foolproof for `-p` argument. (yyuu/pyenv#98)
+
+#### 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)
+* activate: display setup instructions only with `PYENV_VIRTUALENV_INIT=0` (#78)
+* Ignore failure of pyenv activate (#68)
+
+#### 20150119
+
+ * Ignore errors from `pyenv-version-name` since it might fail if there is configuration error (yyuu/pyenv#291)
+ * The _shell_ version set in `activate` should be unset in `deactivate` (#61)
+ * Anaconda has `activate` script nevertheless it is not a virtual environment (#65)
+
+#### 20141106
+
+ * Stop creating after `ensurepip` since it has done by `ensurepip` itself
+ * Suppress some useless warnings from `pyenv virtualenv-init`
+
+#### 20141012
+
+ * Fix warnings from `shellcheck` to improve support for POSIX sh (#40)
+ * Do not allow whitespace in `VIRTUALENV_NAME` (#44)
+ * Should not persist `PYENV_DEACTIVATE` after automatic deactivation (#47, #48)
+
+#### 20140705
+
+ * Display information on auto-(de)?activation
+ * Support manual (de)?activation with auto-activation enabled (#32, #34)
+ * Exit as error when (de)?activation failed
+ * Use https://bootstrap.pypa.io/ to install setuptools and pip
+ * Create backup of original virtualenv within `$(pyenv root)/versions` when `--upgrade`
+
+#### 20140615
+
+ * Fix incompatibility issue of `pyenv activate` and `pyenv deactivate` (#26)
+ * Workaround for the issue with pyenv-which-ext (#26)
+
+#### 20140614
+
+ * Add `pyenv virtualenv-init` to enable auto-activation feature (#24)
+ * Create symlinks for executables with version suffix (yyuu/pyenv#182)
+
+#### 20140602
+
+ * Use new style GH raw url to avoid redirects (raw.github.com -> raw.githubusercontent.com)
+ * Repaired virtualenv activation and deactivation for the fish shell (#23)
+
+#### 20140421
+
+ * Display error if `pyenv activate` was invoked as a command
+ * Fix completion of `pyenv activate` (#15)
+ * Use `virtualenv` instead of `pyvenv` if `-p` has given (yyuu/pyenv#158)
+
+#### 20140123
+
+ * Add `activate` and `deactivate` to make `pyenv-virtualenv` work with [jedi](https://github.com/davidhalter/jedi) (#9)
+ * Use `ensurepip` to install `pip` if it is available
+ * Unset `PIP_REQUIRE_VENV` to avoid problem on the installation of `virtualenv` (#10)
+ * Add tests
+
+#### 20140110.1
+
+ * Fix install script
+
+#### 20140110
+
+ * Support environment variables of `EZ_SETUP` and `GET_PIP`.
+ * Support a short option `-p` of `virtualenv`.
+
+#### 20131216
+
+ * Use latest release of setuptools and pip if the version not given via environment variables.
+
+#### 20130622
+
+ * Removed bundled `virtualenv.py` script. Now pyenv-virtualenv installs `virtualenv` package into source version and then use it.
+ * On Python 3.3+, use `pyvenv` as virtualenv command if `virtualenv` is not available.
+ * Install setuptools and pip into environments created by `pyvenv`.
+
+#### 20130614
+
+ * Add `pyenv virtualenvs` to list all virtualenv versions.
+ * *EXPERIMENTAL*: Add `--upgrade` option to re-create virtualenv with migrating packages
+
+#### 20130527
+
+ * Remove `python-virtualenv` which was no longer used.
+ * Change the installation path of the `virtualenv.py` script. (`./libexec` -> `./libexec/pyenv-virtualenv/${VIRTUALENV_VERSION}`)
+ * Download `virtualenv.py` if desired version has not been installed.
+
+#### 20130507
+
+ * Display virtualenv information in `--help` and `--version`
+ * Update virtualenv version; 1.8.4 -> 1.9.1
+
+#### 20130307
+
+ * Rename the project; `s/python-virtualenv/pyenv-virtualenv/g`
+ * The `pyenv-virtualenv` script is not depending on `python-virtualenv` now.
+   `python-virtualenv` will left for compatibility and will not continue for future releases.
+ * Update virtualenv version; 1.8.2 -> 1.8.4
+
+#### 20130218
+
+ * Add pyenv 0.2.x (rbenv 0.4.x) style help messages.
+
+#### 20121023
+
+ * Create virtualenv with exact name of python executables.
+ * Changed command-line options of python-virtualenv.
+   First argument should be a path to the python executable.
+ * Add install script.
+
+#### 20120927
+
+ * Initial public release.
+
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013 Yamashita, Yuu
+Copyright (c) 2015 Yamashita, Yuu

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
 # pyenv-virtualenv

-[![Build Status](https://travis-ci.org/yyuu/pyenv-virtualenv.png)](https://travis-ci.org/yyuu/pyenv-virtualenv)
+[![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)

 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 +30,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
+    ```sh
+    $ 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 virtualenvs. This is entirely optional but pretty useful. See "Activate virtualenv" below.
+
+    ```sh
+    $ 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.
+    **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"
+    ```sh
+    $ exec "$SHELL"
+    ```


 ### Installing with Homebrew (for OS X users)
@@ -51,19 +60,22 @@ installed, you will also be able to use the `pyenv virtualenv` command.
 *This is the recommended method of installation if you installed pyenv
 with Homebrew.*

-```
+```sh
 $ brew install pyenv-virtualenv
 ```

 Or, if you would like to install the latest development release:

-```
+```sh
 $ 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 
+```sh
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+```
+to your profile (as stated in the caveats). You'll only ever have to do this once.


 ## Usage
@@ -74,12 +86,12 @@ To create a virtualenv for the Python version used with pyenv, run
 `pyenv virtualenv`, specifying the Python version you want and the name
 of the virtualenv directory. For example,

-```
-$ pyenv virtualenv 2.7.7 my-virtual-env-2.7.7
+```sh
+$ 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
@@ -87,44 +99,50 @@ folder called `my-virtual-env-2.7.7`.
 If there is only one argument given to `pyenv virtualenv`, the virtualenv will
 be created with the given name based on the current pyenv Python version.

-```
+```sh
 $ 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.

-```
+```sh
 $ 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.
+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.

 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:
+Removing the directories in `~/.pyenv/versions` and `~/.pyenv/versions/{version}/envs` will delete the virtualenv, or you can run:
+
+```sh
+pyenv uninstall my-virtual-env
+```

-    pyenv uninstall my-virtual-env

 ### virtualenv and pyvenv

@@ -137,6 +155,53 @@ and distributed by default.
 command is not available.


+### Anaconda and Miniconda
+
+You can manage `conda` environments by `conda create` as same manner as standard Anaconda/Miniconda installations.
+To use those environments, you can use `pyenv activate` and `pyenv deactivate`.
+
+```sh
+$ pyenv version
+miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
+$ 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
+$ pyenv activate miniconda3-3.9.1/envs/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
+$ python --version
+Python 3.4.3 :: Continuum Analytics, Inc.
+$ pyenv deactivate
+discarding /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin from PATH
+```
+
+If `conda` is available, `pyenv virtualenv` will use it to create environment by `conda create`.
+
+```sh
+$ pyenv version
+miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
+$ pyenv virtualenv myenv2
+$ conda env list
+# conda environments:
+#
+myenv                    /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv
+myenv                    /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv2
+root                  *  /home/yyuu/.pyenv/versions/miniconda3-3.9.1
+```
+
+You can use version like `miniconda3-3.9.1/envs/myenv` to specify `conda` environment as a version in pyenv.
+
+```sh
+$ pyenv version
+miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
+$ pyenv shell miniconda3-3.9.1/envs/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,137 +211,24 @@ 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

-#### 20150526
+See [CHANGELOG.md](CHANGELOG.md).

-* Use `typeset -g` with `precmd_functions` (#75)
-* activate: display setup instructions only with `PYENV_VIRTUALENV_INIT=0` (#78)
-* Ignore failure of pyenv activate (#68)
-
-#### 20150119
-
- * Ignore errors from `pyenv-version-name` since it might fail if there is configuration error (yyuu/pyenv#291)
- * The _shell_ version set in `activate` should be unset in `deactivate` (#61)
- * Anaconda has `activate` script nevertheless it is not a virtual environment (#65)
-
-#### 20141106
-
- * Stop creating after `ensurepip` since it has done by `ensurepip` itself
- * Suppress some useless warnings from `pyenv virtualenv-init`
-
-#### 20141012
-
- * Fix warnings from `shellcheck` to improve support for POSIX sh (#40)
- * Do not allow whitespace in `VIRTUALENV_NAME` (#44)
- * Should not persist `PYENV_DEACTIVATE` after automatic deactivation (#47, #48)
-
-#### 20140705
-
- * Display information on auto-(de)?activation
- * Support manual (de)?activation with auto-activation enabled (#32, #34)
- * Exit as error when (de)?activation failed
- * Use https://bootstrap.pypa.io/ to install setuptools and pip
- * Create backup of original virtualenv within `$(pyenv root)/versions` when `--upgrade`
-
-#### 20140615
-
- * Fix incompatibility issue of `pyenv activate` and `pyenv deactivate` (#26)
- * Workaround for the issue with pyenv-which-ext (#26)
-
-#### 20140614
-
- * Add `pyenv virtualenv-init` to enable auto-activation feature (#24)
- * Create symlinks for executables with version suffix (yyuu/pyenv#182)
-
-#### 20140602
-
- * Use new style GH raw url to avoid redirects (raw.github.com -> raw.githubusercontent.com)
- * Repaired virtualenv activation and deactivation for the fish shell (#23)
-
-#### 20140421
-
- * Display error if `pyenv activate` was invoked as a command
- * Fix completion of `pyenv activate` (#15)
- * Use `virtualenv` instead of `pyvenv` if `-p` has given (yyuu/pyenv#158)
-
-#### 20140123
-
- * Add `activate` and `deactivate` to make `pyenv-virtualenv` work with [jedi](https://github.com/davidhalter/jedi) (#9)
- * Use `ensurepip` to install `pip` if it is available
- * Unset `PIP_REQUIRE_VENV` to avoid problem on the installation of `virtualenv` (#10)
- * Add tests
-
-#### 20140110.1
-
- * Fix install script
-
-#### 20140110
-
- * Support environment variables of `EZ_SETUP` and `GET_PIP`.
- * Support a short option `-p` of `virtualenv`.
-
-#### 20131216
-
- * Use latest release of setuptools and pip if the version not given via environment variables.
-
-#### 20130622
-
- * Removed bundled `virtualenv.py` script. Now pyenv-virtualenv installs `virtualenv` package into source version and then use it.
- * On Python 3.3+, use `pyvenv` as virtualenv command if `virtualenv` is not available.
- * Install setuptools and pip into environments created by `pyvenv`.
-
-#### 20130614
-
- * Add `pyenv virtualenvs` to list all virtualenv versions.
- * *EXPERIMENTAL*: Add `--upgrade` option to re-create virtualenv with migrating packages
-
-#### 20130527
-
- * Remove `python-virtualenv` which was no longer used.
- * Change the installation path of the `virtualenv.py` script. (`./libexec` -> `./libexec/pyenv-virtualenv/${VIRTUALENV_VERSION}`)
- * Download `virtualenv.py` if desired version has not been installed.
-
-#### 20130507
-
- * Display virtualenv information in `--help` and `--version`
- * Update virtualenv version; 1.8.4 -> 1.9.1
-
-#### 20130307
-
- * Rename the project; `s/python-virtualenv/pyenv-virtualenv/g`
- * The `pyenv-virtualenv` script is not depending on `python-virtualenv` now.
-   `python-virtualenv` will left for compatibility and will not continue for future releases.
- * Update virtualenv version; 1.8.2 -> 1.8.4
-
-#### 20130218
-
- * Add pyenv 0.2.x (rbenv 0.4.x) style help messages.
-
-#### 20121023
-
- * Create virtualenv with exact name of python executables.
- * Changed command-line options of python-virtualenv.
-   First argument should be a path to the python executable.
- * Add install script.
-
-#### 20120927
-
- * Initial public release.

 ### License

 (The MIT License)

-* Copyright (c) 2013 Yamashita, Yuu
+* Copyright (c) 2015 Yamashita, Yuu

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -14,7 +14,16 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-unset NOERROR
+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+unset FORCE
+unset QUIET
 unset VERBOSE

 while [ $# -gt 0 ]; do
@@ -24,14 +33,20 @@ while [ $# -gt 0 ]; do
    echo --unset
    exec pyenv-virtualenvs --bare
    ;;
+  "-f" | "--force" )
+    FORCE=1
+    ;;
  "--no-error" )
-    NOERROR=1
+    # for backward compatibility with v20151103 and earlier
+    QUIET=1
+    ;;
+  "-q" | "--quiet" )
+    QUIET=1
    ;;
  "--unset" )
-    echo "pyenv deactivate"
-    exit
+    exec pyenv-sh-deactivate
    ;;
-  "--verbose" )
+  "-v" | "--verbose" )
    VERBOSE=1
    ;;
  * )
@@ -46,7 +61,7 @@ versions=("$@")
 if [ -z "${versions}" ]; then
  no_shell=1
  OLDIFS="$IFS"
-  IFS=: versions=($(pyenv-version-name))
+  IFS=: versions=($(pyenv-version-name 2>/dev/null))
  IFS="$OLDIFS"
 fi

@@ -56,58 +71,161 @@ if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
  no_shell=
 fi

-if [ "${#versions[@]}" -gt 1 ]; then
-  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
-  echo "false"
-  exit 1
+venv="${versions}"
+
+if [ -n "${VIRTUAL_ENV}" ]; then
+  # exit as success if some virtualenv is already activated outside from pyenv-virtualenv
+  if [ -z "${PYENV_VIRTUAL_ENV}" ]; then
+    if [ -z "${FORCE}" ]; then
+      if [ -z "${QUIET}" ]; then
+        echo "pyenv-virtualenv: virtualenv \`${VIRTUAL_ENV}' is already activated" 1>&2
+      fi
+      echo "true"
+      exit 0
+    fi
+  fi
 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-virtualenv-prefix "${venv}" 1>/dev/null 2>&1; then
+  # fallback to virtualenv of current version
+  OLDIFS="$IFS"
+  IFS=: current_versions=($(pyenv-version-name))
+  IFS="$OLDIFS"
+  new_venv="${current_versions%/envs/*}/envs/${venv}"
+  if pyenv-virtualenv-prefix "${new_venv}" 1>/dev/null 2>&1; then
+    venv="${new_venv}"
+    versions[0]="${new_venv}"
+  else
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: version \`${venv}' is not a virtualenv" 1>&2
+    fi
+    echo "false"
+    exit 1
+  fi
 fi

+# exit as error if there are multiple virtualenvs
+# https://github.com/yyuu/pyenv-virtualenv/issues/105
+for version in "${versions[@]}"; do
+  if [[ "${version}" != "${venv}" ]]; then
+    if pyenv-virtualenv-prefix "${version}" 1>/dev/null 2>&1; then
+      if [ -z "${QUIET}" ]; then
+        echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
+      fi
+      echo "false"
+      exit 1
+    fi
+  fi
+done
+
 shell="${PYENV_SHELL:-${SHELL##*/}}"
+prefix="$(pyenv-prefix "${venv}")"

-# Display setup instruction, if pyenv-virtualenv has not been initialized.
-# if 'pyenv virtualenv-init -' is not found in "$profile"
-if [ -z "$PYENV_VIRTUALENV_INIT" ]; then
-  pyenv-virtualenv-init >&2 || true
+if [ -L "${prefix}" ]; then
+  prefix="$(resolve_link "${prefix}" 2>/dev/null)"
 fi

-if [ -n "$VERBOSE" ]; then
-  echo "pyenv-virtualenv: activate ${versions}" 1>&2
+# exit as success if the virtualenv is already activated
+if [[ "${VIRTUAL_ENV}" == "${prefix}" ]]; then
+  if [ -z "${FORCE}" ]; then
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: version \`${venv}' is already activated" 1>&2
+    fi
+    echo "true"
+    exit 0
+  fi
 fi

+pyenv-sh-deactivate --force --quiet ${VERBOSE+--verbose} || true
+
+echo "pyenv-virtualenv: activate ${venv}" 1>&2
+
 if [ -z "$no_shell" ]; then
-  echo "pyenv shell \"${versions}\";"
  # shell version set in pyenv-sh-activate should be unset
  # https://github.com/yyuu/pyenv-virtualenv/issues/61
+  OLDIFS="$IFS"
+  IFS=:
  case "$shell" in
  fish )
-    echo "setenv PYENV_ACTIVATE_SHELL 1;"
+    cat <<EOS
+setenv PYENV_VERSION "${versions[*]}";
+setenv PYENV_ACTIVATE_SHELL 1;
+EOS
    ;;
  * )
-    echo "export PYENV_ACTIVATE_SHELL=1;"
+    cat <<EOS
+export PYENV_VERSION="${versions[*]}";
+export PYENV_ACTIVATE_SHELL=1;
+EOS
+    ;;
+  esac
+  IFS="$OLDIFS"
+fi
+
+# virtualenv/pyvenv
+case "${shell}" in
+fish )
+  cat <<EOS
+setenv PYENV_VIRTUAL_ENV "${prefix}";
+setenv VIRTUAL_ENV "${prefix}";
+EOS
+  ;;
+* )
+  cat <<EOS
+export PYENV_VIRTUAL_ENV="${prefix}";
+export VIRTUAL_ENV="${prefix}";
+EOS
+  ;;
+esac
+
+# anaconda/miniconda
+if [ -x "${prefix}/bin/conda" ]; then
+  if [[ "${venv}" != "${venv%/envs/*}" ]]; then
+    CONDA_DEFAULT_ENV="${venv##*/envs/}"
+  else
+    CONDA_DEFAULT_ENV="root"
+  fi
+  case "${shell}" in
+  fish )
+    echo "setenv CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
+    ;;
+  * )
+    echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
    ;;
  esac
 fi

-prefix="$(pyenv-prefix "${versions}")"
-case "$shell" in
-fish )
-  cat <<EOS
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${prefix}";
-. "${prefix}/bin/activate.fish";
+if [ -n "${PYTHONHOME}" ]; then
+  case "${shell}" in
+  fish )
+    cat <<EOS
+setenv _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
+set -e PYTHONHOME;
 EOS
- ;;
-*    )
-  cat <<EOS
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${prefix}";
-. "${prefix}/bin/activate";
+    ;;
+  * )
+    cat <<EOS
+export _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME}";
+unset PYTHONHOME;
 EOS
-  ;;
-esac
+    ;;
+  esac
+fi
+
+PYENV_VIRTUALENV_DISABLE_PROMPT="${PYENV_VIRTUALENV_DISABLE_PROMPT:-${PYENV_VIRTUAL_ENV_DISABLE_PROMPT}}"
+PYENV_VIRTUALENV_DISABLE_PROMPT="${PYENV_VIRTUALENV_DISABLE_PROMPT:-${VIRTUAL_ENV_DISABLE_PROMPT}}"
+
+if [ -z "${PYENV_VIRTUALENV_DISABLE_PROMPT}" ]; then
+  case "${shell}" in
+  fish )
+    echo "pyenv-virtualenv: prompt changing not work for fish." 1>&2
+    ;;
+  * )
+    echo "pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior." 1>&2
+    cat <<EOS
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(${venv}) \${PS1}";
+EOS
+    ;;
+  esac
+fi
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -9,15 +9,27 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-unset NOERROR
+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
+unset FORCE
+unset QUIET
 unset VERBOSE

 while [ $# -gt 0 ]; do
  case "$1" in
-  "--no-error" )
-    NOERROR=1
+  "-f" | "--force" )
+    FORCE=1
    ;;
-  "--verbose" )
+  "--no-error" )
+    # for backward compatibility with v20151103 and earlier
+    QUIET=1
+    ;;
+  "-q" | "--quiet")
+    QUIET=1
+    ;;
+  "-v" | "--verbose" )
    VERBOSE=1
    ;;
  * )
@@ -27,66 +39,139 @@ while [ $# -gt 0 ]; do
  shift 1
 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}}"
-
-if [ -n "$VERBOSE" ]; then
-  echo "  echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
+if [ -z "${VIRTUAL_ENV}" ]; then
+  if [ -z "${FORCE}" ]; then
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2
+    fi
+    echo "false"
+    exit 1
+  fi
 fi

+shell="$(basename "${PYENV_SHELL:-$SHELL}")"
+prefix="${VIRTUAL_ENV}"
+
+if [[ "${prefix%/*/envs/*}" == "${PYENV_ROOT}/versions" ]]; then
+  venv="${prefix#${PYENV_ROOT}/versions/}"
+else
+  venv="${prefix##*/}"
+fi
+
+echo "pyenv-virtualenv: deactivate ${venv}" 1>&2
+
 if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then
  # shell version set in pyenv-sh-activate should be unset
  # https://github.com/yyuu/pyenv-virtualenv/issues/61
-  echo "  pyenv shell --unset;"
  case "$shell" in
  fish )
-    echo "  set -e PYENV_ACTIVATE_SHELL;"
+    cat <<EOS
+set -e PYENV_VERSION;
+set -e PYENV_ACTIVATE_SHELL;
+EOS
    ;;
  * )
-    echo "  unset PYENV_ACTIVATE_SHELL;"
+    cat <<EOS
+unset PYENV_VERSION;
+unset PYENV_ACTIVATE_SHELL;
+EOS
    ;;
  esac
 fi

-case "$shell" in
+# virtualenv/pyvenv
+case "${shell}" in
 fish )
  cat <<EOS
-  setenv PYENV_DEACTIVATE "$prefix";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
 EOS
  ;;
-*    )
+* )
  cat <<EOS
-  export PYENV_DEACTIVATE="$prefix";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
 EOS
  ;;
 esac

-if [ -z "$NOERROR" ]; then
-  echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"
+# anaconda/miniconda
+if [ -n "${CONDA_DEFAULT_ENV}" ]; then
+  case "${shell}" in
+  fish )
+    echo "set -e CONDA_DEFAULT_ENV;"
+    ;;
+  * )
+    echo "unset CONDA_DEFAULT_ENV;"
+    ;;
+  esac
 fi

-echo "  false;"
-
-case "$shell" in
+case "${shell}" in
 fish )
-  echo "end;"
+  cat <<EOS
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+EOS
  ;;
-*    )
-  echo "fi;"
+* )
+  cat <<EOS
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+EOS
+  ;;
+esac
+
+case "${shell}" in
+fish )
+  cat <<EOS
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+EOS
+  ;;
+* )
+  cat <<EOS
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+EOS
+  ;;
+esac
+
+case "${shell}" in
+fish )
+  :
+  ;;
+* )
+  cat <<EOS
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
+EOS
+  ;;
+esac
+
+case "${shell}" in
+fish )
+  cat <<EOS
+if functions -q deactivate;
+  functions -e deactivate;
+end;
+EOS
+  ;;
+* )
+  cat <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  unset -f deactivate;
+fi;
+EOS
  ;;
 esac
--- a/bin/pyenv-virtualenv
+++ b/bin/pyenv-virtualenv
@@ -9,20 +9,20 @@
 #   -f/--force       Install even if the version appears to be installed already
 #

-PYENV_VIRTUALENV_VERSION="20150526"
+PYENV_VIRTUALENV_VERSION="20160202"

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
  exec pyenv-versions --bare
 fi

-if [ -z "$PYENV_ROOT" ]; then
-  PYENV_ROOT="${HOME}/.pyenv"
-fi
-
 unset PIP_REQUIRE_VENV
 unset PIP_REQUIRE_VIRTUALENV

@@ -103,45 +103,58 @@ http_get_wget() {
 version() {
  detect_venv
  local version
-  if [ -n "$USE_PYVENV" ]; then
-    version="$(pyenv-which pyvenv 2>/dev/null || true)"
-    version="${version#$(pyenv-root)/versions/}"
-    version="${version%/bin/pyvenv}"
-    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv ${version:-unknown})"
+  if [ -n "${USE_CONDA}" ]; then
+    version="$(pyenv-exec conda --version 2>/dev/null || true)"
+    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (conda ${version:-unknown})"
  else
-    version="$(venv --version 2>/dev/null || true)"
-    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${version:-unknown})"
+    if [ -n "$USE_PYVENV" ]; then
+      version="$(pyenv-which pyvenv 2>/dev/null || true)"
+      version="${version#${PYENV_ROOT}/versions/}"
+      version="${version%/bin/pyvenv}"
+      echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv ${version:-unknown})"
+    else
+      version="$(pyenv-exec virtualenv --version 2>/dev/null || true)"
+      echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${version:-unknown})"
+    fi
  fi
 }

 usage() {
  # We can remove the sed fallback once pyenv 0.2.0 is widely available.
  pyenv-help virtualenv 2>/dev/null || sed -ne '/^#/!q;s/.//;s/.//;1,4d;p' < "$0"
-  venv --help 2>/dev/null || true
+  if [ -n "${USE_CONDA}" ]; then
+    pyenv-exec conda create --help 2>/dev/null || true
+  else
+    if [ -n "${USE_PYVENV}" ]; then
+      pyenv-exec pyvenv --help 2>/dev/null || true
+    else
+      pyenv-exec virtualenv --help 2>/dev/null || true
+    fi
+  fi
  [ -z "$1" ] || exit "$1"
 }

 detect_venv() {
  # Check the existence of executables as a workaround for the issue with pyenv-which-ext
  # https://github.com/yyuu/pyenv-virtualenv/issues/26
-  if [ -x "$(pyenv-prefix)/bin/virtualenv" ]; then
-    HAS_VIRTUALENV=1
-  fi
-  if [ -x "$(pyenv-prefix)/bin/pyvenv" ]; then
-    HAS_PYVENV=1
+  local prefix="$(pyenv-prefix)"
+  if [ -x "${prefix}/bin/conda" ]; then
+    HAS_CONDA=1
+  else
+    if [ -x "${prefix}/bin/virtualenv" ]; then
+      HAS_VIRTUALENV=1
+    fi
+    if [ -x "${prefix}/bin/pyvenv" ]; then
+      HAS_PYVENV=1
+    fi
  fi
  # Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given
-  if [ -n "${HAS_PYVENV}" ] && [ -z "${HAS_VIRTUALENV}" ] && [ -z "${VIRTUALENV_PYTHON}" ]; then
-    USE_PYVENV=1
-  fi
-}
-
-venv() {
-  local args=("$@")
-  if [ -n "${USE_PYVENV}" ]; then
-    pyenv-exec pyvenv "${args[@]}"
+  if [ -n "${HAS_CONDA}" ]; then
+    USE_CONDA=1
  else
-    pyenv-exec virtualenv "${args[@]}"
+    if [ -n "${HAS_PYVENV}" ] && [ -z "${HAS_VIRTUALENV}" ] && [ -z "${VIRTUALENV_PYTHON}" ]; then
+      USE_PYVENV=1
+    fi
  fi
 }

@@ -157,7 +170,7 @@ build_package_ez_setup() {
      http get "${EZ_SETUP_URL}"
    fi
  } 1> "${ez_setup}"
-  pyenv-exec python "${ez_setup}" ${EZ_SETUP_OPTS} 1>&2 || {
+  pyenv-exec python -s "${ez_setup}" ${EZ_SETUP_OPTS} 1>&2 || {
    echo "error: failed to install setuptools via ez_setup.py" >&2
    return 1
  }
@@ -175,16 +188,14 @@ build_package_get_pip() {
      http get "${GET_PIP_URL}"
    fi
  } 1> "${get_pip}"
-  pyenv-exec python "${get_pip}" ${GET_PIP_OPTS} 1>&2 || {
+  pyenv-exec python -s "${get_pip}" ${GET_PIP_OPTS} 1>&2 || {
    echo "error: failed to install pip via get-pip.py" >&2
    return 1
  }
 }

 build_package_ensurepip() {
-  pyenv-exec python -m ensurepip 2>/dev/null|| {
-    build_package_ez_setup "$@" && build_package_get_pip "$@"
-  } || return 1
+  pyenv-exec python -s -m ensurepip 2>/dev/null || build_package_get_pip "$@" || return 1
 }

 prepare_requirements() {
@@ -217,10 +228,11 @@ fi
 VIRTUALENV_OPTIONS=()

 unset FORCE
-unset VIRTUALENV_PYTHON
+unset NO_ENSUREPIP
 unset QUIET
 unset UPGRADE
 unset VERBOSE
+unset VIRTUALENV_PYTHON

 parse_options "$@"
 for option in "${OPTIONS[@]}"; do
@@ -231,6 +243,14 @@ for option in "${OPTIONS[@]}"; do
  "h" | "help" )
    usage 0
    ;;
+  "no-pip" )
+    NO_ENSUREPIP=1
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+    ;;
+  "no-setuptools" )
+    NO_ENSUREPIP=1
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+    ;;
  "p" | "python" )
    VIRTUALENV_PYTHON="${ARGUMENTS[0]}"
    ARGUMENTS=("${ARGUMENTS[@]:1}") # shift 1
@@ -248,6 +268,10 @@ for option in "${OPTIONS[@]}"; do
    version
    exit 0
    ;;
+  "without-pip" )
+    NO_ENSUREPIP=1
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+    ;;
  * ) # virtualenv long options
    if [[ "$option" == "python="* ]]; then
      VIRTUALENV_PYTHON="${option#python=}"
@@ -263,28 +287,46 @@ if [[ "${#ARGUMENTS[@]}" == 0 ]]; then
  exit 1
 elif [[ "${#ARGUMENTS[@]}" == 1 ]]; then
  # If only one argument given, use current version as source version
-  VERSION_NAME="$(pyenv-version-name)"
+  OLDIFS="${IFS}"
+  IFS=:
+  VERSION_NAMES=($(pyenv-version-name))
+  IFS="${OLDIFS}"
+  VERSION_NAME="${VERSION_NAMES}"
  VIRTUALENV_NAME="${ARGUMENTS[0]}"
 else
  # Otherwise, use former as source version, and latter as virtualenv version
  VERSION_NAME="${ARGUMENTS[0]}"
-  VIRTUALENV_NAME="${ARGUMENTS[1]##*/}"
+  VIRTUALENV_NAME="${ARGUMENTS[1]}"
 fi

 if [ -z "${VERSION_NAME}" ] || [ -z "${VIRTUALENV_NAME}" ]; then
  usage 1
 fi

+if [[ "${VIRTUALENV_NAME##*/}" == "system" ]]; then
+  echo "pyenv-virtualenv: \`system' is not allowed as virtualenv name." 1>&2
+  exit 1
+fi
+
 if [ "$VIRTUALENV_NAME" != "${VIRTUALENV_NAME%[[:space:]]*}" ]; then
  echo "pyenv-virtualenv: no whitespace allowed in virtualenv name." 1>&2
  exit 1
 fi

+if [ "${VIRTUALENV_NAME}" != "${VIRTUALENV_NAME%/*}" ] && [[ "${VIRTUALENV_NAME}" != "${VERSION_NAME%%/*}/envs/${VIRTUALENV_NAME##*/}" ]] ; then
+  echo "pyenv-virtualenv: no slash allowed in virtualenv name." 1>&2
+  exit 1
+fi
+
 # Set VERSION_NAME as default version in this script
 export PYENV_VERSION="${VERSION_NAME}"

 # Source version must exist before creating virtualenv.
-pyenv-prefix 1>/dev/null 2>&1 || usage 1
+PREFIX="$(pyenv-prefix 2>/dev/null || true)"
+if [ ! -d "${PREFIX}" ]; then
+  echo "pyenv-virtualenv: \`${PYENV_VERSION}' is not installed in pyenv." 1>&2
+  exit 1
+fi

 if [ -z "$TMPDIR" ]; then
  TMP="/tmp"
@@ -292,10 +334,33 @@ else
  TMP="${TMPDIR%/}"
 fi

+# Not create `system/envs` directory even if source version is `system`
+if [[ "${VERSION_NAME%/envs/*}" == "system" ]]; then
+  VIRTUALENV_NAME="${VIRTUALENV_NAME##*/}"
+else
+  VIRTUALENV_PREFIX="$(pyenv-virtualenv-prefix 2>/dev/null || true)"
+  if [[ "${VIRTUALENV_PREFIX%/*}" == "${PYENV_ROOT}/versions" ]]; then
+    VIRTUALENV_NAME="${VIRTUALENV_PREFIX#${PYENV_ROOT}/versions/}/envs/${VIRTUALENV_NAME##*/}"
+  else
+    VIRTUALENV_NAME="${VERSION_NAME}/envs/${VIRTUALENV_NAME##*/}"
+  fi
+fi
+
 VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
+if [[ "${VIRTUALENV_PATH/*/envs/*}" != "${PYENV_ROOT}/versions" ]]; then
+  COMPAT_VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME##*/}"
+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
+  fi
+fi

 unset HAS_VIRTUALENV
 unset HAS_PYVENV
+unset USE_CONDA
 unset USE_PYVENV
 detect_venv

@@ -313,18 +378,69 @@ if [ -n "$UPGRADE" ]; then
  fi
 fi

-if [ -n "${USE_PYVENV}" ]; then
-  # Unset some arguments not supported by pyvenv
-  unset QUIET
-  unset VERBOSE
-else
+if [ -z "${VIRTUALEN_VERSION}" ]; then
+  case "${PYENV_VERSION}" in
+  "3.0"* )
+    NO_ENSUREPIP=1
+    ;;
+  "3.1"* )
+    NO_ENSUREPIP=1
+    ;;
+  "3.2"* | "stackless-3.2"* )
+    # pip 8.x (bundled with virtualenv 14+) doesn't support 3.2 anymore
+    # https://github.com/yyuu/pyenv/issues/531
+    VIRTUALENV_VERSION="13.1.2"
+    NO_ENSUREPIP=1
+    ;;
+  esac
+fi
+
+if [ -n "${USE_CONDA}" ]; then
+  # e.g. `conda create -n py35 python=3.5 anaconda`
  if [ -n "${VIRTUALENV_PYTHON}" ]; then
-    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${VIRTUALENV_PYTHON}"
+    VIRTUALENV_PYTHON="${VIRTUALENV_PYTHON##*/}"
+    VIRTUALENV_PYTHON="${VIRTUALENV_PYTHON#python}"
+    if [ -n "${VIRTUALENV_PYTHON}" ]; then
+      VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="python=${VIRTUALENV_PYTHON}"
+    fi
  fi
-  if [ -z "${HAS_VIRTUALENV}" ]; then
-    VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
-    pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
-    HAS_VIRTUALENV=1
+else
+  if [ -n "${USE_PYVENV}" ]; then
+    # Unset some arguments not supported by pyvenv
+    unset QUIET
+    unset VERBOSE
+    if [ -n "${VIRTUALENV_PYTHON}" ]; then
+      echo "pyenv-virtualenv: \`--python=${VIRTUALENV_PYTHON}' is not supported by pyvenv." 1>&2
+      exit 1
+    fi
+  else
+    if [ -n "${VIRTUALENV_PYTHON}" ]; then
+      if [[ "${VIRTUALENV_PYTHON}" == "${VIRTUALENV_PYTHON##*/}" ]] || [[ "${VIRTUALENV_PYTHON}" == "${PYENV_ROOT}/shims/"* ]]; then
+        python="$(pyenv-which "${VIRTUALENV_PYTHON##*/}" 2>/dev/null || true)"
+        if [ -x "${python}" ]; then
+          VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${python}"
+        else
+          python="$(PYENV_VERSION="$(pyenv-whence "${VIRTUALENV_PYTHON##*/}" 2>/dev/null | tail -n 1 || true)" pyenv-which "${VIRTUALENV_PYTHON##*/}" 2>/dev/null || true)"
+          if [ -x "${python}" ]; then
+            VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${python}"
+          else
+            echo "pyenv-virtualenv: \`${VIRTUALENV_PYTHON##*/}' is not installed in pyenv." 1>&2
+            exit 1
+          fi
+        fi
+      else
+        VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${VIRTUALENV_PYTHON}"
+      fi
+    fi
+    if [ -z "${HAS_VIRTUALENV}" ]; then
+      if [ -n "${VIRTUALENV_VERSION}" ]; then
+        virtualenv_spec="virtualenv==${VIRTUALENV_VERSION}"
+      else
+        virtualenv_spec="virtualenv"
+      fi
+      pyenv-exec pip install $QUIET $VERBOSE "${virtualenv_spec}"
+      HAS_VIRTUALENV=1
+    fi
  fi
 fi

@@ -380,7 +496,12 @@ if [ -d "${VIRTUALENV_PATH}/bin" ]; then
  fi

  if [ -n "$UPGRADE" ]; then
-    PYENV_VERSION="${VIRTUALENV_NAME}" prepare_requirements
+    if [ -n "${NO_ENSUREPIP}" ]; then
+      echo "pyenv-virtualenv: upgrading will not work with --no-setuptools or --no-pip" 1>&2
+      exit 1
+    else
+      PYENV_VERSION="${VIRTUALENV_NAME}" prepare_requirements
+    fi
  fi
 fi

@@ -400,13 +521,28 @@ STATUS=0
 # Change to cache directory to reuse them between invocations.
 mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
-venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
+if [ -n "${USE_CONDA}" ]; then
+  pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" python || STATUS="$?"
+else
+  if [ -n "${USE_PYVENV}" ]; then
+    pyenv-exec pyvenv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
+  else
+    pyenv-exec virtualenv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
+  fi
+fi

-## Install setuptools and pip.
-PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
+## Create symlink in the `versions` directory for backward compatibility
+if [ -d "${VIRTUALENV_PATH}" ] && [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
+  ln -fs "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
+fi

-## Migrate previously installed packages from requirements.txt.
-PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
+if [ -z "${NO_ENSUREPIP}" ]; then
+  ## Install setuptools and pip.
+  PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
+
+  ## Migrate previously installed packages from requirements.txt.
+  PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
+fi

 # Execute `after_virtualenv` hooks.
 for hook in "${after_hooks[@]}"; do eval "$hook"; done
--- a/bin/pyenv-virtualenv-delete
+++ b/bin/pyenv-virtualenv-delete
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+#
+# Summary: Uninstall a specific Python virtualenv
+#
+# Usage: pyenv virtualenv-delete [-f|--force] <virtualenv>
+#
+#    -f  Attempt to remove the specified virtualenv without prompting
+#        for confirmation. If the virtualenv does not exist, do not
+#        display an error message.
+#
+# See `pyenv virtualenvs` for a complete list of installed versions.
+#
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
+# Provide pyenv completions
+if [ "$1" = "--complete" ]; then
+  exec pyenv virtualenvs --bare
+fi
+
+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+usage() {
+  pyenv-help virtualenv-delete 2>/dev/null
+  [ -z "$1" ] || exit "$1"
+}
+
+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+  usage 0
+fi
+
+unset FORCE
+if [ "$1" = "-f" ] || [ "$1" = "--force" ]; then
+  FORCE=true
+  shift
+fi
+
+[ "$#" -eq 1 ] || usage 1 >&2
+
+DEFINITION="$1"
+case "$DEFINITION" in
+"" | -* )
+  usage 1 >&2
+  ;;
+esac
+
+VERSION_NAME="${DEFINITION##*/}"
+COMPAT_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
+
+if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then
+  PREFIX="${PYENV_ROOT}/versions/${DEFINITION}"
+  if [ -L "${COMPAT_PREFIX}" ]; then
+    if [[ "${PREFIX}" != "$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)" ]]; then
+      unset COMPAT_PREFIX
+    fi
+  fi
+else
+  if [ -L "${COMPAT_PREFIX}" ]; then
+    PREFIX="$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)"
+    if [[ "${PREFIX%/*/envs/*}" != "${PYENV_ROOT}/versions" ]]; then
+      echo "pyenv-virtualenv: \`${COMPAT_PREFIX}' is a symlink for unknown location." 1>&2
+      exit 1
+    fi
+  else
+    if pyenv-virtualenv-prefix "${VERSION_NAME}" 1>/dev/null 2>&1; then
+      PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
+      unset COMPAT_PREFIX
+    else
+      echo "pyenv-virtualenv: \`${DEFINITION}' is not a virtualenv." 1>&2
+      exit 1
+    fi
+  fi
+fi
+
+if [ -z "$FORCE" ]; then
+  if [ ! -d "$PREFIX" ]; then
+    echo "pyenv-virtualenv: virtualenv \`$VERSION_NAME' not installed" >&2
+    exit 1
+  fi
+
+  read -p "pyenv-virtualenv: remove $PREFIX? "
+  case "$REPLY" in
+  y* | Y* ) ;;
+  * ) exit 1 ;;
+  esac
+fi
+
+if [ -d "$PREFIX" ]; then
+  rm -rf "$PREFIX"
+  if [ -L "$COMPAT_PREFIX" ]; then
+    rm -rf "$COMPAT_PREFIX"
+  fi
+  pyenv-rehash
+fi
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -9,6 +9,26 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+abs_dirname() {
+  local cwd="$(pwd)"
+  local path="$1"
+
+  while [ -n "$path" ]; do
+    cd "${path%/*}"
+    local name="${path##*/}"
+    path="$(resolve_link "$name" || true)"
+  done
+
+  pwd
+  cd "$cwd"
+}
+
+PYENV_VIRTUALENV_INSTALL_PREFIX="$(dirname "$(abs_dirname "$0")")"
+
 print=""
 for args in "$@"
 do
@@ -20,10 +40,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
@@ -64,10 +85,16 @@ fi

 case "$shell" in
 fish )
-  echo "setenv PYENV_VIRTUALENV_INIT 1;"
+  cat <<EOS
+setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
+setenv PYENV_VIRTUALENV_INIT 1;
+EOS
  ;;
 * )
-  echo "export PYENV_VIRTUALENV_INIT=1;"
+  cat <<EOS
+export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:${PATH}";
+export PYENV_VIRTUALENV_INIT=1;
+EOS
  ;;
 esac

@@ -75,26 +102,13 @@ case "$shell" in
 fish )
  cat <<EOS
 function _pyenv_virtualenv_hook --on-event fish_prompt;
-  set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
-  if [ -n "\$PYENV_ACTIVATE" ]
-    if [ "(pyenv version-name 2>/dev/null; or true)" = "system" ]
-      pyenv deactivate --no-error --verbose
-      set -e PYENV_DEACTIVATE
-      return 0
-    end
-    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
-      if pyenv deactivate --no-error --verbose
-        set -e PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
-    end
+  set -l ret \$status
+  if [ -n "\$VIRTUAL_ENV" ]
+    pyenv activate --quiet; or pyenv deactivate --quiet; or true
  else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
-      pyenv activate --no-error --verbose; or true
-    end
+    pyenv activate --quiet; or true
  end
+  return \$ret
 end
 EOS
 ;;
@@ -112,25 +126,13 @@ esac

 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
-      unset PYENV_DEACTIVATE
-      return 0
-    fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if pyenv deactivate --no-error --verbose; then
-        unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      fi
-    fi
+  local ret=\$?
+  if [ -n "\$VIRTUAL_ENV" ]; then
+    eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
  else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      pyenv activate --no-error --verbose || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
  fi
+  return \$ret
 };
 EOS

@@ -146,7 +148,7 @@ EOS
    cat <<EOS
 typeset -g -a precmd_functions
 if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
-  precmd_functions+=_pyenv_virtualenv_hook;
+  precmd_functions=(_pyenv_virtualenv_hook \$precmd_functions);
 fi
 EOS
    ;;
--- a/bin/pyenv-virtualenv-prefix
+++ b/bin/pyenv-virtualenv-prefix
@@ -19,35 +19,54 @@ else
  IFS=: versions=($(pyenv-version-name))
 fi

-real_prefix() { # virtualenv
-  local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.real_prefix)' 2>/dev/null
-}
-
-base_prefix() { # pyvenv
-  # FIXME: non-pyvenv versions also have sys.base_prefix
-  local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.base_prefix)' 2>/dev/null
-}
-
 VIRTUALENV_PREFIX_PATHS=()
 for version in "${versions[@]}"; do
  if [ "$version" = "system" ]; then
    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
    exit 1
  fi
-  PREFIX="$(pyenv-prefix "${version}")"
-  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
+  PYENV_PREFIX_PATH="$(pyenv-prefix "${version}")"
+  if [ -x "${PYENV_PREFIX_PATH}/bin/python" ]; then
+    if [ -f "${PYENV_PREFIX_PATH}/bin/activate" ]; then
+      if [ -f "${PYENV_PREFIX_PATH}/bin/conda" ]; then
+        # conda
+        VIRTUALENV_PREFIX_PATH="${PYENV_PREFIX_PATH}"
+      else
+        if [ -f "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" ]; then
+          # pyvenv
+          virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
+          VIRTUALENV_PREFIX_PATH="${virtualenv_binpath%/bin}"
+        else
+          # virtualenv
+          if [ -d "${PYENV_ROOT}/versions/${version}/Lib" ]; then
+            # jython
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/Lib"
+          else
+            if [ -d "${PYENV_ROOT}/versions/${version}/lib-python" ]; then
+              # pypy
+              virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib-python"
+            else
+              virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib"
+            fi
+          fi
+          virtualenv_orig_prefix="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "orig-prefix.txt" 2>/dev/null | head -1)"
+          if [ -f "${virtualenv_orig_prefix}" ]; then
+            VIRTUALENV_PREFIX_PATH="$(cat "${virtualenv_orig_prefix}" 2>/dev/null || true)"
+          fi
+        fi
+      fi
+      if [ -d "${VIRTUALENV_PREFIX_PATH}" ]; then
+        VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${VIRTUALENV_PREFIX_PATH:-${PYENV_PREFIX_PATH}}")
+      else
+        echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+        exit 1
+      fi
    else
-      VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
-      VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
+      echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+      exit 1
    fi
  else
-    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+    echo "pyenv-virtualenv: \`python' not found in version \`${version}'" 1>&2
    exit 1
  fi
 done
--- a/bin/pyenv-virtualenvs
+++ b/bin/pyenv-virtualenvs
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 #
 # Summary: List all Python virtualenvs found in `$PYENV_ROOT/versions/*'.
+# Usage: pyenv virtualenvs [--bare] [--skip-aliases]
 #
-# Usage: pyenv virtualenvs [--bare]
-#
+# List all virtualenvs found in `$PYENV_ROOT/versions/*' and its `$PYENV_ROOT/versions/envs/*'.

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -12,45 +12,124 @@ if [ -z "$PYENV_ROOT" ]; then
  PYENV_ROOT="${HOME}/.pyenv"
 fi

-if [ "$1" = "--bare" ]; then
+unset bare
+unset skip_aliases
+# Provide pyenv completions
+for arg; do
+  case "$arg" in
+  --complete )
+    echo --bare
+    echo --skip-aliases
+    exit ;;
+  --bare ) bare=1 ;;
+  --skip-aliases ) skip_aliases=1 ;;
+  * )
+    pyenv-help --usage virtualenvs >&2
+    exit 1
+    ;;
+  esac
+done
+
+versions_dir="${PYENV_ROOT}/versions"
+
+if ! enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev/null; then
+  if [ -n "$PYENV_NATIVE_EXT" ]; then
+    echo "pyenv: failed to load \`realpath' builtin" >&2
+    exit 1
+  fi
+
+  READLINK=$(type -p greadlink readlink | head -1)
+  if [ -z "$READLINK" ]; then
+    echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
+    exit 1
+  fi
+
+  resolve_link() {
+    $READLINK "$1"
+  }
+
+  realpath() {
+    local cwd="$PWD"
+    local path="$1"
+    local name
+
+    while [ -n "$path" ]; do
+      name="${path##*/}"
+      [ "$name" = "$path" ] || cd "${path%/*}"
+      path="$(resolve_link "$name" || true)"
+    done
+
+    echo "${PWD}/$name"
+    cd "$cwd"
+  }
+fi
+
+if [ -d "$versions_dir" ]; then
+  versions_dir="$(realpath "$versions_dir")"
+fi
+
+if [ -n "$bare" ]; then
  hit_prefix=""
  miss_prefix=""
  current_versions=()
-  print_origin=""
+  unset print_origin
+  include_system=""
 else
  hit_prefix="* "
  miss_prefix="  "
-  current_versions=($(IFS=:; for version in $(pyenv-version-name); do echo "$version"; done))
+  OLDIFS="$IFS"
+  IFS=: current_versions=($(pyenv-version-name || true))
+  IFS="$OLDIFS"
  print_origin="1"
+  include_system=""
 fi

-array_exists() {
-  local x car="$1"
+num_versions=0
+
+exists() {
+  local car="$1"
+  local cdar
  shift
-  for x in "$@"; do
-    [ "${x}" = "${car}" ] && return 0
+  for cdar in "$@"; do
+    if [ "${car}" == "${cdar}" ]; then
+      return 0
+    fi
  done
  return 1
 }

 print_version() {
-  if [ -n "${print_origin}" ]; then
-    local version_origin="$2"
+  if exists "$1" "${current_versions[@]}"; then
+    echo "${hit_prefix}${1}${print_origin+$2}"
  else
-    local version_origin=""
-  fi
-  if array_exists "$1" "${current_versions[@]}"; then
-    echo "${hit_prefix}${1}${version_origin}"
-  else
-    echo "${miss_prefix}${1}${version_origin}"
+    echo "${miss_prefix}${1}${print_origin+$2}"
  fi
+  num_versions=$((num_versions + 1))
 }

-for version in $(pyenv-versions --bare); do
-  if [[ "${version}" != "system" ]]; then
-    virtualenv_prefix="$(pyenv-virtualenv-prefix "${version}" 2>/dev/null || true)"
-    if [ -d "${virtualenv_prefix}" ]; then
-      print_version "${version}" " (created from ${virtualenv_prefix})"
+shopt -s nullglob
+for path in "$versions_dir"/*; do
+  if [ -d "$path" ]; then
+    if [ -n "$skip_aliases" ] && [ -L "$path" ]; then
+      target="$(realpath "$path")"
+      [ "${target%/*/envs/*}" != "$versions_dir" ] || continue
    fi
+    virtualenv_prefix="$(pyenv-virtualenv-prefix "${path##*/}" 2>/dev/null || true)"
+    if [ -d "${virtualenv_prefix}" ]; then
+      print_version "${path##*/}" " (created from ${virtualenv_prefix})"
+    fi
+    for venv_path in "${path}/envs/"*; do
+      venv="${path##*/}/envs/${venv_path##*/}"
+      virtualenv_prefix="$(pyenv-virtualenv-prefix "${venv}" 2>/dev/null || true)"
+      if [ -d "${virtualenv_prefix}" ]; then
+        print_version "${venv}" " (created from ${virtualenv_prefix})"
+      fi
+    done
  fi
 done
+shopt -u nullglob
+
+if [ "$num_versions" -eq 0 ] && [ -n "$include_system" ]; then
+  echo "Warning: no Python virtualenv detected on the system" >&2
+  exit 1
+fi
--- a/etc/pyenv.d/rehash/envs.bash
+++ b/etc/pyenv.d/rehash/envs.bash
@@ -0,0 +1,11 @@
+virtualenv_list_executable_names() {
+  local file
+  shopt -s nullglob
+  for file in "$PYENV_ROOT"/versions/*/envs/*/bin/*; do
+    echo "${file##*/}"
+  done
+  shopt -u nullglob
+}
+if declare -f make_shims 1>/dev/null 2>&1; then
+  make_shims $(virtualenv_list_executable_names | sort -u)
+fi
--- a/etc/pyenv.d/uninstall/envs.bash
+++ b/etc/pyenv.d/uninstall/envs.bash
@@ -0,0 +1,30 @@
+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+if [ -n "${DEFINITION}" ]; then
+  if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then
+    # Uninstall virtualenv by long name
+    exec pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}"
+    exit 128
+  else
+    VERSION_NAME="${VERSION_NAME:-${DEFINITION##*/}}"
+    PREFIX="${PREFIX:-${PYENV_ROOT}/versions/${VERSION_NAME}}"
+    if [ -L "${PREFIX}" ]; then
+      REAL_PREFIX="$(resolve_link "${PREFIX}" 2>/dev/null || true)"
+      REAL_DEFINITION="${REAL_PREFIX#${PYENV_ROOT}/versions/}"
+      if [[ "${REAL_DEFINITION}" != "${REAL_DEFINITION%/envs/*}" ]]; then
+        # Uninstall virtualenv by short name
+        exec pyenv-virtualenv-delete ${FORCE+-f} "${REAL_DEFINITION}"
+        exit 128
+      fi
+    else
+      # Uninstall all virtualenvs inside `envs` directory too
+      shopt -s nullglob
+      for virtualenv in "${PREFIX}/envs/"*; do
+        pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}/envs/${virtualenv##*/}"
+      done
+      shopt -u nullglob
+    fi
+  fi
+fi
--- a/etc/pyenv.d/which/python-config.bash
+++ b/etc/pyenv.d/which/python-config.bash
@@ -0,0 +1,43 @@
+# some of libraries require `python-config` in PATH to build native extensions.
+# as a workaround, this hook will try to find the executable from the source
+# version of the virtualenv.
+# https://github.com/yyuu/pyenv/issues/397
+
+if [ ! -x "${PYENV_COMMAND_PATH}" ] && [[ "${PYENV_COMMAND_PATH##*/}" == "python"*"-config" ]]; then
+  OLDIFS="${IFS}"
+  IFS=:
+  version="$(pyenv-version-name)"
+  IFS="${OLDIFS}"
+  if [ -f "${PYENV_ROOT}/versions/${version}/bin/activate" ]; then
+    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
+        # pyvenv
+        virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
+        virtualenv_prefix="${virtualenv_binpath%/bin}"
+      else
+        # virtualenv
+        if [ -d "${PYENV_ROOT}/versions/${version}/Lib" ]; then
+          # jython
+          virtualenv_libpath="${PYENV_ROOT}/versions/${version}/Lib"
+        else
+          if [ -d "${PYENV_ROOT}/versions/${version}/lib-python" ]; then
+            # pypy
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib-python"
+          else
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib"
+          fi
+        fi
+        virtualenv_orig_prefix="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "orig-prefix.txt" 2>/dev/null | head -1)"
+        if [ -f "${virtualenv_orig_prefix}" ]; then
+          virtualenv_prefix="$(cat "${virtualenv_orig_prefix}" 2>/dev/null || true)"
+        fi
+      fi
+      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
--- a/etc/pyenv.d/which/system-site-packages.bash
+++ b/etc/pyenv.d/which/system-site-packages.bash
@@ -0,0 +1,54 @@
+# 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
+  OLDIFS="${IFS}"
+  IFS=:
+  version="$(pyenv-version-name)"
+  IFS="${OLDIFS}"
+  if [ -f "${PYENV_ROOT}/versions/${version}/bin/activate" ]; then
+    unset include_system_site_packages
+    if [ -f "${PYENV_ROOT}/versions/${version}/bin/conda" ]; then
+      : # do nothing for conda's environments
+    else
+      if [ -f "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" ]; then
+        # pyvenv
+        virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
+        virtualenv_prefix="${virtualenv_binpath%/bin}"
+        if grep -q -i "include-system-site-packages *= *true" "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" 1>/dev/null 2>&1; then
+          include_system_site_packages=1
+        fi
+      else
+        # virtualenv
+        if [ -d "${PYENV_ROOT}/versions/${version}/Lib" ]; then
+          # jython
+          virtualenv_libpath="${PYENV_ROOT}/versions/${version}/Lib"
+        else
+          if [ -d "${PYENV_ROOT}/versions/${version}/lib-python" ]; then
+            # pypy
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib-python"
+          else
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib"
+          fi
+        fi
+        no_global_site_packages="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "no-global-site-packages.txt" 2>/dev/null | head -1)"
+        if [ ! -f "${no_global_site_packages}" ]; then
+          include_system_site_packages=1
+        fi
+        virtualenv_orig_prefix="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "orig-prefix.txt" 2>/dev/null | head -1)"
+        if [ -f "${virtualenv_orig_prefix}" ]; then
+          virtualenv_prefix="$(cat "${virtualenv_orig_prefix}" 2>/dev/null || true)"
+        fi
+      fi
+      if [ -n "${include_system_site_packages}" ] && [ -n "${virtualenv_prefix}" ]; 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
+fi
--- a/install.sh
+++ b/install.sh
@@ -12,7 +12,19 @@ if [ -z "${PREFIX}" ]; then
 fi

 BIN_PATH="${PREFIX}/bin"
+SHIMS_PATH="${PREFIX}/shims"
+HOOKS_PATH="${PREFIX}/etc/pyenv.d"

 mkdir -p "$BIN_PATH"
+mkdir -p "$SHIMS_PATH"
+mkdir -p "$HOOKS_PATH"

 install -p bin/* "$BIN_PATH"
+install -p shims/* "$SHIMS_PATH"
+for hook in etc/pyenv.d/*; do
+  if [ -d "$hook" ]; then
+    cp -RPp "$hook" "$HOOKS_PATH"
+  else
+    install -p -m 0644 "$hook" "$HOOKS_PATH"
+  fi
+done
--- a/shims/activate
+++ b/shims/activate
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+if [[ "$0" != "${BASH_SOURCE}" ]]; then
+  eval "$(pyenv sh-activate --verbose "$@" || true)"
+else
+  echo "pyenv-virtualenv: activate must be sourced. Run 'source activate envname' instead of 'activate envname'" 1>&2
+  false
+fi
--- a/shims/deactivate
+++ b/shims/deactivate
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+if [[ "$0" != "${BASH_SOURCE}" ]]; then
+  eval "$(pyenv sh-deactivate --verbose "$@" || true)"
+else
+  echo "pyenv-virtualenv: deactivate must be sourced. Run 'source deactivate' instead of 'deactivate'" 1>&2
+  false
+fi
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -5,6 +5,16 @@ load test_helper
 setup() {
  export HOME="${TMP}"
  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
 }

@test "activate virtualenv from current version" {
@@ -13,19 +23,25 @@ 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-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate venv
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+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="(venv) \${PS1}";
+EOS
+
  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/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from current version (verbose)" {
@@ -34,20 +50,25 @@ 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-sh-deactivate "--force --quiet --verbose : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose

+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate venv
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+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="(venv) \${PS1}";
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-pyenv-virtualenv: activate venv
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from current version (without pyenv-virtualenv-init)" {
@@ -56,26 +77,27 @@ 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-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate venv
+export PYENV_VERSION="venv";
+export PYENV_ACTIVATE_SHELL=1;
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+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="(venv) \${PS1}";
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.bash_profile:
-
-eval "\$(pyenv virtualenv-init -)"
-
-pyenv shell "venv";
-export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from current version (fish)" {
@@ -84,19 +106,23 @@ 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-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate venv
+setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+pyenv-virtualenv: prompt changing not work for fish.
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from current version (fish) (without pyenv-virtualenv-init)" {
@@ -105,26 +131,25 @@ 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-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate venv
+setenv PYENV_VERSION "venv";
+setenv PYENV_ACTIVATE_SHELL 1;
+setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+pyenv-virtualenv: prompt changing not work for fish.
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.config/fish/config.fish:
-
-status --is-interactive; and . (pyenv virtualenv-init -|psub)
-
-pyenv shell "venv";
-setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument" {
@@ -132,20 +157,26 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-pyenv shell "venv27";
+deactivated
+pyenv-virtualenv: activate venv27
+export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+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="(venv27) \${PS1}";
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument (without pyenv-virtualenv-init)" {
@@ -153,25 +184,26 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.bash_profile:
-
-eval "\$(pyenv virtualenv-init -)"
-
-pyenv shell "venv27";
+deactivated
+pyenv-virtualenv: activate venv27
+export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+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="(venv27) \${PS1}";
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument (fish)" {
@@ -179,20 +211,24 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-pyenv shell "venv27";
+deactivated
+pyenv-virtualenv: activate venv27
+setenv PYENV_VERSION "venv27";
 setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
+setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+pyenv-virtualenv: prompt changing not work for fish.
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument (fish) (without pyenv-virtualenv-init)" {
@@ -200,64 +236,80 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.config/fish/config.fish:
-
-status --is-interactive; and . (pyenv virtualenv-init -|psub)
-
-pyenv shell "venv27";
+deactivated
+pyenv-virtualenv: activate venv27
+setenv PYENV_VERSION "venv27";
 setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
+setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+pyenv-virtualenv: prompt changing not work for fish.
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "unset invokes deactivate" {
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  stub pyenv-sh-deactivate " : echo deactivated"
+
  run pyenv-sh-activate --unset

  assert_success
  assert_output <<EOS
-pyenv deactivate
+deactivated
 EOS
+
+  unstub pyenv-sh-deactivate
 }

@test "should fail if the version is not a virtualenv" {
  stub pyenv-virtualenv-prefix "3.3.3 : false"
+  stub pyenv-version-name " : echo 3.3.3"
+  stub pyenv-virtualenv-prefix "3.3.3/envs/3.3.3 : false"

  run pyenv-sh-activate "3.3.3"

-  unstub pyenv-virtualenv-prefix
-
  assert_failure
  assert_output <<EOS
 pyenv-virtualenv: version \`3.3.3' is not a virtualenv
 false
 EOS
-}
-
-@test "should fail if the version is not a virtualenv (no-error)" {
-  stub pyenv-virtualenv-prefix "3.3.3 : false"
-
-  run pyenv-sh-activate --no-error "3.3.3"

  unstub pyenv-virtualenv-prefix
+  unstub pyenv-version-name
+}
+
+@test "should fail if the version is not a virtualenv (quiet)" {
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
+  stub pyenv-version-name " : echo 3.3.3"
+  stub pyenv-virtualenv-prefix "3.3.3/envs/3.3.3 : false"
+
+  run pyenv-sh-activate --quiet "3.3.3"

  assert_failure
  assert_output <<EOS
 false
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-version-name
 }

@test "should fail if there are multiple versions" {
+  stub pyenv-virtualenv-prefix "venv : true"
+  stub pyenv-virtualenv-prefix "venv27 : true"
+
  run pyenv-sh-activate "venv" "venv27"

  assert_failure
@@ -265,15 +317,69 @@ EOS
 pyenv-virtualenv: cannot activate multiple versions at once: venv venv27
 false
 EOS
+
+  unstub pyenv-virtualenv-prefix
 }

-@test "should fail if there are multiple versions (no-error)" {
-  run pyenv-sh-activate --no-error "venv" "venv27"
+@test "should fail if there are multiple virtualenvs (quiet)" {
+  stub pyenv-virtualenv-prefix "venv : true"
+  stub pyenv-virtualenv-prefix "venv27 : true"
+
+  run pyenv-sh-activate --quiet "venv" "venv27"

  assert_failure
  assert_output <<EOS
 false
 EOS
+
+  unstub pyenv-virtualenv-prefix
+}
+
+@test "should fail if the first version is not a virtualenv" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-virtualenv-prefix "2.7.10 : false"
+  stub pyenv-version-name " : echo 2.7.10"
+  stub pyenv-virtualenv-prefix "2.7.10/envs/2.7.10 : false"
+
+  run pyenv-sh-activate "2.7.10" "venv27"
+
+  assert_failure
+  assert_output <<EOS
+pyenv-virtualenv: version \`2.7.10' is not a virtualenv
+false
+EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-version-name
+}
+
+@test "activate if the first virtualenv is a virtualenv" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  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"
+
+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate venv27
+export PYENV_VERSION="venv27:2.7.10";
+export PYENV_ACTIVATE_SHELL=1;
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+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="(venv27) \${PS1}";
+EOS
+
+  unstub pyenv-sh-deactivate
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
 }

@test "should fail if activate is invoked as a command" {
--- a/test/conda-activate.bats
+++ b/test/conda-activate.bats
@@ -0,0 +1,171 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export HOME="${TMP}"
+  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset PYENV_VIRTUAL_ENV
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
+}
+
+@test "activate conda root from current version" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  setup_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-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate
+
+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate anaconda-2.3.0
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
+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}";
+EOS
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0"
+}
+
+@test "activate conda root from current version (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  setup_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-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="fish" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate
+
+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate anaconda-2.3.0
+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";
+pyenv-virtualenv: prompt changing not work for fish.
+EOS
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0"
+}
+
+@test "activate conda root from command-line argument" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  setup_conda "anaconda-2.3.0"
+  setup_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-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate "miniconda-3.9.1"
+
+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate miniconda-3.9.1
+export PYENV_VERSION="miniconda-3.9.1";
+export PYENV_ACTIVATE_SHELL=1;
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
+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}";
+EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0"
+  teardown_conda "miniconda-3.9.1"
+}
+
+@test "activate conda env from current version" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  setup_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-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate
+
+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate anaconda-2.3.0/envs/foo
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
+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}";
+EOS
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0" "foo"
+}
+
+@test "activate conda env from command-line argument" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  setup_conda "anaconda-2.3.0" "foo"
+  setup_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-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate "miniconda-3.9.1/envs/bar"
+
+  assert_success
+  assert_output <<EOS
+deactivated
+pyenv-virtualenv: activate miniconda-3.9.1/envs/bar
+export PYENV_VERSION="miniconda-3.9.1/envs/bar";
+export PYENV_ACTIVATE_SHELL=1;
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
+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}";
+EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0" "foo"
+  teardown_conda "miniconda-3.9.1" "bar"
+}
--- a/test/conda-deactivate.bats
+++ b/test/conda-deactivate.bats
@@ -0,0 +1,122 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset PYENV_VIRTUAL_ENV
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
+}
+
+@test "deactivate conda root" {
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export PYENV_ACTIVATE_SHELL=
+  export CONDA_DEFAULT_ENV="root"
+
+  setup_conda "anaconda-2.3.0"
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: deactivate anaconda-2.3.0
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+unset CONDA_DEFAULT_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
+if declare -f deactivate 1>/dev/null 2>&1; then
+  unset -f deactivate;
+fi;
+EOS
+
+  teardown_conda "anaconda-2.3.0"
+}
+
+@test "deactivate conda root (fish)" {
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export PYENV_ACTIVATE_SHELL=
+  export CONDA_DEFAULT_ENV="root"
+
+  setup_conda "anaconda-2.3.0"
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: deactivate anaconda-2.3.0
+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 -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+if functions -q deactivate;
+  functions -e deactivate;
+end;
+EOS
+
+  teardown_conda "anaconda-2.3.0"
+}
+
+@test "deactivate conda env" {
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
+  export PYENV_ACTIVATE_SHELL=
+  export CONDA_DEFAULT_ENV="foo"
+
+  setup_conda "anaconda-2.3.0" "foo"
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: deactivate anaconda-2.3.0/envs/foo
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+unset CONDA_DEFAULT_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
+if declare -f deactivate 1>/dev/null 2>&1; then
+  unset -f deactivate;
+fi;
+EOS
+
+  teardown_conda "anaconda-2.3.0" "foo"
+}
--- a/test/conda-prefix.bats
+++ b/test/conda-prefix.bats
@@ -0,0 +1,41 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "display conda root" {
+  setup_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
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/anaconda-2.3.0
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  teardown_conda "anaconda-2.3.0"
+}
+
+@test "display conda env" {
+  setup_conda "anaconda-2.3.0" "foo"
+  stub pyenv-version-name "echo 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_VERSION="anaconda-2.3.0/envs/foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  teardown_conda "anaconda-2.3.0" "foo"
+}
--- a/test/conda.bats
+++ b/test/conda.bats
@@ -0,0 +1,90 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+stub_pyenv() {
+  stub pyenv-version-name "echo \${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-hooks "virtualenv : echo"
+  stub pyenv-rehash " : echo rehashed"
+}
+
+unstub_pyenv() {
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-rehash
+}
+
+@test "create virtualenv by conda create" {
+  export PYENV_VERSION="miniconda3-3.16.0"
+  setup_conda "${PYENV_VERSION}"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+
+  run pyenv-virtualenv venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python
+rehashed
+OUT
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_pyvenv "miniconda3-3.16.0"
+}
+
+@test "create virtualenv by conda create with -p" {
+  export PYENV_VERSION="miniconda3-3.16.0"
+  setup_conda "${PYENV_VERSION}"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+
+  run pyenv-virtualenv -p python3.5 venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+rehashed
+OUT
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_pyvenv "miniconda3-3.16.0"
+}
+
+@test "create virtualenv by conda create with --python" {
+  export PYENV_VERSION="miniconda3-3.16.0"
+  setup_conda "${PYENV_VERSION}"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+
+  run pyenv-virtualenv --python=python3.5 venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+rehashed
+OUT
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_pyvenv "miniconda3-3.16.0"
+}
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -4,107 +4,181 @@ load test_helper

 setup() {
  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset PYENV_VIRTUAL_ENV
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
 }

@test "deactivate virtualenv" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

  PYENV_SHELL="bash" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv (verbose)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

  PYENV_SHELL="bash" run pyenv-sh-deactivate --verbose

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  echo "pyenv-virtualenv: deactivate venv" 1>&2;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

-@test "deactivate virtualenv (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+@test "deactivate virtualenv (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv (with shell activation)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=1

  PYENV_SHELL="bash" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+unset PYENV_VERSION;
+unset PYENV_ACTIVATE_SHELL;
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  pyenv shell --unset;
-  unset PYENV_ACTIVATE_SHELL;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

-@test "deactivate virtualenv (with shell activation) (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+@test "deactivate virtualenv (with shell activation) (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=1

-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+unset PYENV_VERSION;
+unset PYENV_ACTIVATE_SHELL;
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  pyenv shell --unset;
-  unset PYENV_ACTIVATE_SHELL;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv which has been activated manually" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

@@ -112,96 +186,30 @@ EOS

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$VIRTUAL_ENV";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv (fish)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate
-
-  assert_success
-  assert_output <<EOS
-if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
-end;
-EOS
-}
-
-@test "deactivate virtualenv (fish) (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  false;
-end;
-EOS
-}
-
-@test "deactivate virtualenv (fish) (with shell activation)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=1
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate
-
-  assert_success
-  assert_output <<EOS
-if functions -q deactivate;
-  pyenv shell --unset;
-  set -e PYENV_ACTIVATE_SHELL;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
-end;
-EOS
-}
-
-@test "deactivate virtualenv (fish) (with shell activation) (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=1
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-if functions -q deactivate;
-  pyenv shell --unset;
-  set -e PYENV_ACTIVATE_SHELL;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  false;
-end;
-EOS
-}
-
-@test "deactivate virtualenv which has been activated manually (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

@@ -209,13 +217,131 @@ EOS

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
 if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$VIRTUAL_ENV";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  functions -e deactivate;
+end;
+EOS
+}
+
+@test "deactivate virtualenv (fish) (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+if functions -q deactivate;
+  functions -e deactivate;
+end;
+EOS
+}
+
+@test "deactivate virtualenv (fish) (with shell activation)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=1
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+set -e PYENV_VERSION;
+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 -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+if functions -q deactivate;
+  functions -e deactivate;
+end;
+EOS
+}
+
+@test "deactivate virtualenv (fish) (with shell activation) (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=1
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+set -e PYENV_VERSION;
+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 -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+if functions -q deactivate;
+  functions -e deactivate;
+end;
+EOS
+}
+
+@test "deactivate virtualenv which has been activated manually (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+if functions -q deactivate;
+  functions -e deactivate;
 end;
 EOS
 }
--- a/test/delete.bats
+++ b/test/delete.bats
@@ -0,0 +1,88 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "delete virtualenv" {
+  mkdir -p "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-virtualenv-prefix "venv27 : true"
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "venv27"
+
+  assert_success
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "delete virtualenv by symlink" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  ln -fs "${PYENV_ROOT}/versions/2.7.11/envs/venv27" "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ ! -L "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "delete virtualenv with symlink" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  ln -fs "${PYENV_ROOT}/versions/2.7.11/envs/venv27" "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ ! -L "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "not delete virtualenv with different symlink" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.8/envs/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  ln -fs "${PYENV_ROOT}/versions/2.7.8/envs/venv27" "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ -L "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "not delete virtualenv with same name" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ -d "${PYENV_ROOT}/versions/venv27" ]
+}
--- a/test/envs.bats
+++ b/test/envs.bats
@@ -0,0 +1,46 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/envs/pyenv"
+}
+
+stub_pyenv() {
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-hooks "virtualenv : echo"
+  stub pyenv-rehash " : echo rehashed"
+}
+
+unstub_pyenv() {
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-rehash
+}
+
+@test "path should be handled properly even if there is 'envs' in PYENV_ROOT" {
+  export PYENV_VERSION="3.5.1"
+  setup_pyvenv "3.5.1"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-version-name "echo '${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
+  stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip"
+
+  run pyenv-virtualenv venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=3.5.1 pyvenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
+rehashed
+OUT
+  assert [ -e "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip" ]
+
+  unstub_pyenv
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_pyvenv "3.5.1"
+}
--- a/test/hooks.bats
+++ b/test/hooks.bats
@@ -13,23 +13,29 @@ setup() {
 before_virtualenv 'echo before: \$VIRTUALENV_PATH'
 after_virtualenv 'echo after: \$STATUS'
 OUT
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
+  setup_version "3.5.1"
+  create_executable "3.5.1" "virtualenv"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.5.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.5.1'"
  stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
-  stub pyenv-exec "echo PYENV_VERSION=3.2.1 \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=3.5.1 \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=3.5.1 \"\$@\""
  stub pyenv-rehash "echo rehashed"

-  create_executable "3.2.1" "virtualenv"
-  remove_executable "3.2.1" "pyvenv"
-
-  run pyenv-virtualenv "3.2.1" venv
+  run pyenv-virtualenv "3.5.1" venv

  assert_success
  assert_output <<-OUT
-before: ${PYENV_ROOT}/versions/venv
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+before: ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1 virtualenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1 python -s -m ensurepip
 after: 0
 rehashed
 OUT
+
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-exec
+  unstub pyenv-rehash
+  teardown_version "3.5.1"
 }
--- a/test/init.bats
+++ b/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 ]
@@ -27,30 +46,20 @@ load test_helper
 }

@test "outputs bash-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
  run pyenv-virtualenv-init - bash
  assert_success
  assert_output <<EOS
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:${PATH}";
 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
-      unset PYENV_DEACTIVATE
-      return 0
-    fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if pyenv deactivate --no-error --verbose; then
-        unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      fi
-    fi
+  local ret=\$?
+  if [ -n "\$VIRTUAL_ENV" ]; then
+    eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
  else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      pyenv activate --no-error --verbose || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
  fi
+  return \$ret
 };
 if ! [[ "\$PROMPT_COMMAND" =~ _pyenv_virtualenv_hook ]]; then
  PROMPT_COMMAND="_pyenv_virtualenv_hook;\$PROMPT_COMMAND";
@@ -59,64 +68,43 @@ EOS
 }

@test "outputs fish-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
  run pyenv-virtualenv-init - fish
  assert_success
  assert_output <<EOS
+setenv PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
 setenv PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
-  set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
-  if [ -n "\$PYENV_ACTIVATE" ]
-    if [ "(pyenv version-name 2>/dev/null; or true)" = "system" ]
-      pyenv deactivate --no-error --verbose
-      set -e PYENV_DEACTIVATE
-      return 0
-    end
-    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
-      if pyenv deactivate --no-error --verbose
-        set -e PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
-    end
+  set -l ret \$status
+  if [ -n "\$VIRTUAL_ENV" ]
+    pyenv activate --quiet; or pyenv deactivate --quiet; or true
  else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
-      pyenv activate --no-error --verbose; or true
-    end
+    pyenv activate --quiet; or true
  end
+  return \$ret
 end
 EOS
 }

@test "outputs zsh-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
  run pyenv-virtualenv-init - zsh
  assert_success
  assert_output <<EOS
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:${PATH}";
 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
-      unset PYENV_DEACTIVATE
-      return 0
-    fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if pyenv deactivate --no-error --verbose; then
-        unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      fi
-    fi
+  local ret=\$?
+  if [ -n "\$VIRTUAL_ENV" ]; then
+    eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
  else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      pyenv activate --no-error --verbose || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
  fi
+  return \$ret
 };
 typeset -g -a precmd_functions
 if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
-  precmd_functions+=_pyenv_virtualenv_hook;
+  precmd_functions=(_pyenv_virtualenv_hook \$precmd_functions);
 fi
 EOS
 }
--- a/test/pip.bats
+++ b/test/pip.bats
@@ -21,58 +21,54 @@ unstub_pyenv() {
 }

@test "install pip with ensurepip" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_pyvenv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  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 : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
-
-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
+  stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip"

  run pyenv-virtualenv venv

  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
-PYENV_VERSION=venv python -m ensurepip
+PYENV_VERSION=3.5.1 pyvenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
 rehashed
 OUT
-  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
+  assert [ -e "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip" ]

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_pyvenv "3.5.1"
 }

@test "install pip without using ensurepip" {
-  export PYENV_VERSION="3.3.5"
+  export PYENV_VERSION="3.3.6"
+  setup_pyvenv "3.3.6"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  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 pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.3.6/envs/venv/bin"
+  stub pyenv-exec "python -s -m ensurepip : false"
+  stub pyenv-exec "python -s */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.3.6/envs/venv/bin/pip"
  stub curl true
-  stub curl true
-
-  remove_executable "3.3.5" "virtualenv"
-  create_executable "3.3.5" "pyvenv"

  run pyenv-virtualenv venv

  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
+PYENV_VERSION=3.3.6 pyvenv ${PYENV_ROOT}/versions/3.3.6/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
-PYENV_VERSION=venv python ${TMP}/pyenv/cache/get-pip.py
+PYENV_VERSION=3.3.6/envs/venv python -s ${TMP}/pyenv/cache/get-pip.py
 rehashed
 OUT
-  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
+  assert [ -e "${PYENV_ROOT}/versions/3.3.6/envs/venv/bin/pip" ]

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_pyvenv "3.3.6"
 }
--- a/test/prefix.bats
+++ b/test/prefix.bats
@@ -0,0 +1,246 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+create_version() {
+  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
+  touch "${PYENV_ROOT}/versions/$1/bin/python"
+  chmod +x "${PYENV_ROOT}/versions/$1/bin/python"
+}
+
+remove_version() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+create_virtualenv() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  mkdir -p "${PYENV_ROOT}/versions/$1/lib/python${2:-$1}"
+  echo "${PYENV_ROOT}/versions/${2:-$1}" > "${PYENV_ROOT}/versions/$1/lib/python${2:-$1}/orig-prefix.txt"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+create_virtualenv_jython() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  mkdir -p "${PYENV_ROOT}/versions/$1/Lib/"
+  echo "${PYENV_ROOT}/versions/${2:-$1}" > "${PYENV_ROOT}/versions/$1/Lib/orig-prefix.txt"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+create_virtualenv_pypy() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  mkdir -p "${PYENV_ROOT}/versions/$1/lib-python/${2:-$1}"
+  echo "${PYENV_ROOT}/versions/${2:-$1}" > "${PYENV_ROOT}/versions/$1/lib-python/${2:-$1}/orig-prefix.txt"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+remove_virtualenv() {
+  remove_version "$1"
+  remove_version "${2:-$1}"
+}
+
+create_pyvenv() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  echo "home = ${PYENV_ROOT}/versions/${2:-$1}/bin" > "${PYENV_ROOT}/versions/$1/pyvenv.cfg"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+remove_pyvenv() {
+  remove_version "${2:-$1}"
+}
+
+create_conda() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  touch "${PYENV_ROOT}/versions/$1/bin/conda"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+  mkdir -p "${PYENV_ROOT}/versions/${2:-$1}/bin"
+  touch "${PYENV_ROOT}/versions/${2:-$1}/bin/conda"
+  touch "${PYENV_ROOT}/versions/${2:-$1}/bin/activate"
+}
+
+remove_conda() {
+  remove_version "${2:-$1}"
+}
+
+@test "display prefix of virtualenv created by virtualenv" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_virtualenv "foo" "2.7.11"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/2.7.11
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "2.7.11"
+}
+
+@test "display prefix of virtualenv created by virtualenv (pypy)" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_virtualenv_pypy "foo" "pypy-4.0.1"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/pypy-4.0.1
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "pypy-4.0.1"
+}
+
+@test "display prefix of virtualenv created by virtualenv (jython)" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_virtualenv_jython "foo" "jython-2.7.0"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/jython-2.7.0
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "jython-2.7.0"
+}
+
+@test "display prefixes of virtualenv created by virtualenv" {
+  stub pyenv-version-name "echo foo:bar"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" \
+                    "bar : echo \"${PYENV_ROOT}/versions/bar\""
+  create_virtualenv "foo" "2.7.11"
+  create_virtualenv "bar" "3.5.1"
+
+  PYENV_VERSION="foo:bar" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/2.7.11:${PYENV_ROOT}/versions/3.5.1
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "2.7.11"
+  remove_virtualenv "bar" "3.5.1"
+}
+
+@test "display prefix of virtualenv created by pyvenv" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_pyvenv "foo" "3.3.6"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/3.3.6
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_pyvenv "foo" "3.3.6"
+}
+
+@test "display prefixes of virtualenv created by pyvenv" {
+  stub pyenv-version-name "echo foo:bar"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" \
+                    "bar : echo \"${PYENV_ROOT}/versions/bar\""
+  create_pyvenv "foo" "3.3.6"
+  create_pyvenv "bar" "3.4.4"
+
+  PYENV_VERSION="foo:bar" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/3.3.6:${PYENV_ROOT}/versions/3.4.4
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_pyvenv "foo" "3.3.6"
+  remove_pyvenv "bar" "3.4.4"
+}
+
+@test "display prefix of virtualenv created by conda" {
+  stub pyenv-version-name "echo miniconda3-3.16.0/envs/foo"
+  stub pyenv-prefix "miniconda3-3.16.0/envs/foo : echo \"${PYENV_ROOT}/versions/miniconda3-3.16.0/envs/foo\""
+  create_conda "miniconda3-3.16.0/envs/foo" "miniconda3-3.16.0"
+
+  PYENV_VERSION="miniconda3-3.16.0/envs/foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/miniconda3-3.16.0/envs/foo
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_conda "miniconda3-3.16.0/envs/foo" "miniconda3-3.16.0"
+}
+
+@test "should fail if the version is the system" {
+  stub pyenv-version-name "echo system"
+
+  PYENV_VERSION="system" run pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`system' is not a virtualenv
+OUT
+
+  unstub pyenv-version-name
+}
+
+@test "should fail if the version is not a virtualenv" {
+  stub pyenv-version-name "echo 3.4.4"
+  stub pyenv-prefix "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\""
+  create_version "3.4.4"
+
+  PYENV_VERSION="3.4.4" run pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`3.4.4' is not a virtualenv
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_version "3.4.4"
+}
+
+@test "should fail if one of the versions is not a virtualenv" {
+  stub pyenv-version-name "echo venv33:3.4.4"
+  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
+                    "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\""
+  create_virtualenv "venv33" "3.3.6"
+  create_version "3.4.4"
+
+  PYENV_VERSION="venv33:3.4.4" run pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`3.4.4' is not a virtualenv
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "venv33" "3.3.6"
+  remove_version "3.4.4"
+}
--- a/test/python.bats
+++ b/test/python.bats
@@ -0,0 +1,102 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+  export PYENV_VERSION="2.7.8"
+  setup_version "2.7.8"
+  create_executable "2.7.8" "virtualenv"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-hooks "virtualenv : echo"
+  stub pyenv-rehash " : true"
+  stub pyenv-version-name "echo \${PYENV_VERSION}"
+  stub curl true
+}
+
+teardown() {
+  unstub curl
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-rehash
+  teardown_version "2.7.8"
+  rm -fr "$TMP"/*
+}
+
+@test "resolve python executable from enabled version" {
+  remove_executable "2.7.7" "python2.7"
+  create_executable "2.7.8" "python2.7"
+  remove_executable "2.7.9" "python2.7"
+
+  stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+  stub pyenv-which "python2.7 : echo ${PYENV_ROOT}/versions/2.7.8/bin/python2.7"
+
+  run pyenv-virtualenv --verbose --python=python2.7 venv
+
+  assert_output <<OUT
+PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.8/bin/python2.7 ${PYENV_ROOT}/versions/2.7.8/envs/venv
+OUT
+  assert_success
+
+  unstub pyenv-which
+  unstub pyenv-exec
+
+  remove_executable "2.7.7" "python2.7"
+  remove_executable "2.7.8" "python2.7"
+  remove_executable "2.7.9" "python2.7"
+}
+
+@test "resolve python executable from other versions" {
+  remove_executable "2.7.7" "python2.7"
+  remove_executable "2.7.8" "python2.7"
+  create_executable "2.7.9" "python2.7"
+
+  stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+  stub pyenv-which "python2.7 : false"
+  stub pyenv-whence "python2.7 : echo 2.7.7; echo 2.7.8; echo 2.7.9"
+  stub pyenv-which "python2.7 : echo ${PYENV_ROOT}/versions/2.7.9/bin/python2.7"
+
+  run pyenv-virtualenv --verbose --python=python2.7 venv
+
+  assert_output <<OUT
+PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.9/bin/python2.7 ${PYENV_ROOT}/versions/2.7.8/envs/venv
+OUT
+  assert_success
+
+  unstub pyenv-which
+  unstub pyenv-whence
+  unstub pyenv-exec
+
+  remove_executable "2.7.7" "python2.7"
+  remove_executable "2.7.8" "python2.7"
+  remove_executable "2.7.9" "python2.7"
+}
+
+@test "cannot resolve python executable" {
+  remove_executable "2.7.7" "python2.7"
+  remove_executable "2.7.8" "python2.7"
+  remove_executable "2.7.9" "python2.7"
+
+  stub pyenv-which "python2.7 : false"
+  stub pyenv-whence "python2.7 : false"
+  stub pyenv-which "python2.7 : false"
+
+  run pyenv-virtualenv --verbose --python=python2.7 venv
+
+  assert_output <<OUT
+pyenv-virtualenv: \`python2.7' is not installed in pyenv.
+OUT
+  assert_failure
+
+  unstub pyenv-which
+  unstub pyenv-whence
+
+  remove_executable "2.7.7" "python2.7"
+  remove_executable "2.7.8" "python2.7"
+  remove_executable "2.7.9" "python2.7"
+}
--- a/test/pyvenv.bats
+++ b/test/pyvenv.bats
@@ -21,161 +21,146 @@ unstub_pyenv() {
 }

@test "use pyvenv if virtualenv is not available" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_pyvenv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "python -m ensurepip : true"
-
-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"

  run pyenv-virtualenv venv

  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.5.1 pyvenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_pyvenv "3.5.1"
 }

@test "not use pyvenv if virtualenv is available" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_pyvenv "3.5.1"
+  create_executable "3.5.1" "virtualenv"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "python -m ensurepip : true"
-
-  create_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"

  run pyenv-virtualenv venv

  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.5.1 virtualenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_pyvenv "3.5.1"
 }

@test "install virtualenv if pyvenv is not avaialble" {
  export PYENV_VERSION="3.2.1"
+  setup_version "3.2.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  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"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "pip install virtualenv* : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""

  run pyenv-virtualenv venv

  assert_success
  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...
+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

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
-  unstub curl
+  teardown_version "3.2.1"
 }

@test "install virtualenv if -p has given" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_pyvenv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : false"
  stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "virtualenv --python=python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "python -m ensurepip : true"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"

-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
+  run pyenv-virtualenv -p ${TMP}/python3 venv

-  run pyenv-virtualenv -p python3 venv
-
-  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+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_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_pyvenv "3.5.1"
 }

@test "install virtualenv if --python has given" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_pyvenv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : false"
  stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "virtualenv --python=python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "python -m ensurepip : true"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"

-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
+  run pyenv-virtualenv --python=${TMP}/python3 venv

-  run pyenv-virtualenv --python=python3 venv
-
-  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+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_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_pyvenv "3.5.1"
 }

@test "install virtualenv with unsetting troublesome pip options" {
  export PYENV_VERSION="3.2.1"
+  setup_version "3.2.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  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"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "pip install virtualenv* : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv * : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""

  PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv

  assert_success
  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...
+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

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
-  unstub curl
+  teardown_version "3.2.1"
 }
--- a/test/test_helper.bash
+++ b/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,57 @@ create_executable() {
 remove_executable() {
  rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
 }
+
+setup_version() {
+  create_executable "$1" "python"
+  remove_executable "$1" "activate"
+  remove_executable "$1" "pyvenv"
+  remove_executable "$1" "conda"
+}
+
+teardown_version() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+setup_virtualenv() {
+  create_executable "$1" "python"
+  create_executable "$1" "activate"
+  remove_executable "$1" "pyvenv"
+  remove_executable "$1" "conda"
+}
+
+teardown_virtualenv() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+setup_pyvenv() {
+  create_executable "$1" "python"
+  create_executable "$1" "activate"
+  create_executable "$1" "pyvenv"
+  remove_executable "$1" "conda"
+}
+
+teardown_pyvenv() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+setup_conda() {
+  create_executable "$1" "python"
+  create_executable "$1" "activate"
+  remove_executable "$1" "pyvenv"
+  create_executable "$1" "conda"
+  local conda="$1"
+  shift 1
+  local env
+  for env; do
+    create_executable "${conda}/envs/${env}" "python"
+    create_executable "${conda}/envs/${env}" "activate"
+    remove_executable "${conda}/envs/${env}" "pyvenv"
+    create_executable "${conda}/envs/${env}" "conda"
+  done
+  
+}
+
+teardown_conda() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
--- a/test/version.bats
+++ b/test/version.bats
@@ -4,40 +4,33 @@ load test_helper

 setup() {
  export PYENV_ROOT="${TMP}/pyenv"
-  export PYENV_VIRTUALENV_VERSION="20150526"
 }

@test "display virtualenv version" {
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
+  setup_virtualenv "2.7.7"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
  stub pyenv-exec "virtualenv --version : echo \"1.11\""

-  create_executable "2.7.7" "virtualenv"
-  remove_executable "2.7.7" "pyvenv"
-
  run pyenv-virtualenv --version

  assert_success
-  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)"
+  [[ "$output" == "pyenv-virtualenv 20"*" (virtualenv 1.11)" ]]

  unstub pyenv-prefix
  unstub pyenv-exec
+  teardown_virtualenv "2.7.7"
 }

@test "display pyvenv version" {
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
+  setup_pyvenv "3.4.1"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.4.1/bin/pyvenv\""
-  stub pyenv-root "echo \"${PYENV_ROOT}\""
-
-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"

  run pyenv-virtualenv --version

  assert_success
-  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.4.1)"
+  [[ "$output" == "pyenv-virtualenv 20"*" (pyvenv 3.4.1)" ]]

  unstub pyenv-prefix
-  unstub pyenv-root
+  teardown_pyvenv "3.4.1"
 }
--- a/test/virtualenv-prefix.bats
+++ b/test/virtualenv-prefix.bats
@@ -1,158 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-setup() {
-  export PYENV_ROOT="${TMP}/pyenv"
-}
-
-create_virtualenv() {
-  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
-  touch "${PYENV_ROOT}/versions/$1/bin/activate"
-}
-
-remove_virtualenv() {
-  rm -fr "${PYENV_ROOT}/versions/$1"
-}
-
-@test "display prefix with using sys.real_prefix" {
-  stub pyenv-version-name "echo venv27"
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\""
-  create_virtualenv "venv27"
-
-  PYENV_VERSION="venv27" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv27"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/2.7.6
-OUT
-}
-
-@test "display prefixes with using sys.real_prefix" {
-  stub pyenv-version-name "echo venv27:venv32"
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\"" \
-                    "venv32 : echo \"${PYENV_ROOT}/versions/venv32\""
-  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\"" \
-                  "echo \"${PYENV_ROOT}/versions/3.2.1\""
-  create_virtualenv "venv27"
-  create_virtualenv "venv32"
-
-  PYENV_VERSION="venv27:venv32" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv27"
-  remove_virtualenv "venv32"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/2.7.6:${PYENV_ROOT}/versions/3.2.1
-OUT
-}
-
-@test "display prefix with using sys.base_prefix" {
-  stub pyenv-version-name "echo venv33"
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
-  create_virtualenv "venv33"
-
-  PYENV_VERSION="venv33" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/3.3.3
-OUT
-}
-
-@test "display prefixes with using sys.base_prefix" {
-  stub pyenv-version-name "echo venv33:venv34"
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
-                    "venv34 : echo \"${PYENV_ROOT}/versions/venv34\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\"" \
-                  "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.4.0\""
-  create_virtualenv "venv33"
-  create_virtualenv "venv34"
-
-  PYENV_VERSION="venv33:venv34" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-  remove_virtualenv "venv34"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/3.3.3:${PYENV_ROOT}/versions/3.4.0
-OUT
-}
-
-@test "should fail if the version is the system" {
-  stub pyenv-version-name "echo system"
-
-  PYENV_VERSION="system" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: version \`system' is not a virtualenv
-OUT
-}
-
-@test "should fail if the version is not a virtualenv" {
-  stub pyenv-version-name "echo 3.4.0"
-  stub pyenv-prefix "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
-  mkdir -p "${PYENV_ROOT}/versions/3.4.0"
-
-  PYENV_VERSION="3.4.0" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  rmdir "${PYENV_ROOT}/versions/3.4.0"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: version \`3.4.0' is not a virtualenv
-OUT
-}
-
-@test "should fail if one of the versions is not a virtualenv" {
-  stub pyenv-version-name "echo venv33:3.4.0"
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
-                    "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
-  create_virtualenv "venv33"
-  mkdir -p "${PYENV_ROOT}/versions/3.4.0"
-
-  PYENV_VERSION="venv33:3.4.0" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-  rmdir "${PYENV_ROOT}/versions/3.4.0"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: version \`3.4.0' is not a virtualenv
-OUT
-}
-
-
--- a/test/virtualenv.bats
+++ b/test/virtualenv.bats
@@ -7,10 +7,8 @@ setup() {
 }

 stub_pyenv() {
+  setup_version "${PYENV_VERSION}"
  create_executable "${PYENV_VERSION}" "virtualenv"
-  remove_executable "${PYENV_VERSION}" "pyvenv"
-
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-hooks "virtualenv : echo"
@@ -21,116 +19,113 @@ unstub_pyenv() {
  unstub pyenv-prefix
  unstub pyenv-hooks
  unstub pyenv-rehash
+  teardown_version "${PYENV_VERSION}"
 }

@test "create virtualenv from given version" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  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 pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : false"
+  stub pyenv-exec "python -s */get-pip.py : true"
  stub curl true

-  run pyenv-virtualenv "3.2.1" "venv"
+  run pyenv-virtualenv "2.7.11" "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...
+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

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "create virtualenv from current version" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  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 pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : false"
+  stub pyenv-exec "python -s */get-pip.py : 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...
+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

  unstub_pyenv
  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "create virtualenv with short options" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  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 pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : false"
+  stub pyenv-exec "python -s */get-pip.py : true"
  stub curl true

-  run pyenv-virtualenv -v -p python venv
+  run pyenv-virtualenv -v -p ${TMP}/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...
+PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert_success

  unstub_pyenv
  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "create virtualenv with long options" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  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 pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : false"
+  stub pyenv-exec "python -s */get-pip.py : true"
  stub curl true

-  run pyenv-virtualenv --verbose --python=python venv
+  run pyenv-virtualenv --verbose --python=${TMP}/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...
+PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert_success

  unstub_pyenv
  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "no whitespace allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo bar"
+  run pyenv-virtualenv "2.7.11" "foo bar"

  assert_failure
  assert_output <<OUT
@@ -139,10 +134,52 @@ OUT
 }

@test "no tab allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo	bar baz"
+  run pyenv-virtualenv "2.7.11" "foo	bar baz"

  assert_failure
  assert_output <<OUT
 pyenv-virtualenv: no whitespace allowed in virtualenv name.
 OUT
 }
+
+@test "system not allowed as virtualenv name" {
+  run pyenv-virtualenv "2.7.11" "system"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: \`system' is not allowed as virtualenv name.
+OUT
+}
+
+@test "no slash allowed in virtualenv name" {
+  run pyenv-virtualenv "2.7.11" "foo/bar"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: no slash allowed in virtualenv name.
+OUT
+}
+
+@test "slash allowed if it is the long name of the virtualenv" {
+  export PYENV_VERSION="2.7.11"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : false"
+  stub pyenv-exec "python -s */get-pip.py : true"
+  stub curl true
+
+  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
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  unstub curl
+}
--- a/test/virtualenvs.bats
+++ b/test/virtualenvs.bats
@@ -12,7 +12,6 @@ setup() {

@test "list virtual environments only" {
  stub pyenv-version-name ": echo system"
-  stub pyenv-versions "--bare : echo \"system\";echo \"2.7.6\";echo \"3.3.3\";echo \"venv27\";echo \"venv33\""
  stub pyenv-virtualenv-prefix "2.7.6 : false"
  stub pyenv-virtualenv-prefix "3.3.3 : false"
  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
@@ -20,49 +19,48 @@ setup() {

  run pyenv-virtualenvs

-  unstub pyenv-version-name
-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-
  assert_success
  assert_output <<OUT
  venv27 (created from ${PYENV_ROOT}/versions/2.7.6)
  venv33 (created from ${PYENV_ROOT}/versions/3.3.3)
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
 }

@test "list virtual environments with hit prefix" {
  stub pyenv-version-name ": echo venv33"
-  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "2.7.6 : false"
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""

  run pyenv-virtualenvs

-  unstub pyenv-version-name
-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-
  assert_success
  assert_output <<OUT
  venv27 (created from /usr)
 * venv33 (created from /usr)
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
 }

@test "list virtual environments with --bare" {
-  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "2.7.6 : false"
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""

  run pyenv-virtualenvs --bare

-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-
  assert_success
  assert_output <<OUT
 venv27
 venv33
 OUT
+
+  unstub pyenv-virtualenv-prefix
 }
Author	SHA1	Message	Date
Yamashita, Yuu	17ee6e72b6	v20160202	2016-02-02 08:47:11 +00:00
Yamashita, Yuu	1f761275cd	Install virtualenv 13.1.2 for CPython 3.2 (yyuu/pyenv#531 )	2016-01-30 04:34:23 +00:00
Yamashita, Yuu	51ebc8ff8a	v20160112	2016-01-12 01:53:27 +00:00
Yamashita, Yuu	4c8eeebbff	Add missing declaration of `virtualenv_prefix` to fix looking up executables from source version (#62 )	2016-01-12 00:33:34 +00:00
Yamashita, Yuu	433992e376	Merge pull request #138 from kerstin/autoactivate Clarification of auto-activation/deactivation feature	2016-01-03 07:44:19 +09:00
Kerstin Kollmann	efe6d6757c	clarify how auto-activation works (requirements)	2016-01-02 16:31:37 +01:00
Yamashita, Yuu	5963688fc4	v20151229	2015-12-29 09:13:51 +00:00
Yamashita, Yuu	13b7dc172a	need to use `functions -q` to check existence of the function in fish (#136 )	2015-12-29 09:03:31 +00:00
Yamashita, Yuu	0b42fbc27d	v20151222	2015-12-22 10:38:02 +00:00
Yamashita, Yuu	bc5d308d05	Remove version string from test	2015-12-22 10:37:22 +00:00
Yamashita, Yuu	9414a6bb30	Stop showing `version not installed` in precmd (#49 )	2015-12-18 02:32:01 +00:00
Yamashita, Yuu	b9951fa69c	Uninstall all virtualenvs inside `envs` on the uninstallation of the parent version	2015-12-18 00:30:29 +00:00
Yamashita, Yuu	2d73d058bd	Fix wrong library path for virtualenv on PyPy/Jython (fixes #134 )	2015-12-15 00:24:02 +00:00
Yamashita, Yuu	907c6b4265	Merge branch 'detect-virtualenv-prefix-without-executing-python'	2015-12-10 03:54:06 +00:00
Yamashita, Yuu	1e88df88a9	Rewrite virtualenv-prefix without executing python (#132 )	2015-12-10 03:53:16 +00:00
Yamashita, Yuu	c61fdaa478	Fix installation script to install hook scripts as well (#62 )	2015-12-09 23:57:51 +00:00
Yamashita, Yuu	fbb7d2876e	Merge pull request #131 from leeclemens/patch-1 Add envs/*/my-virtual-env dir for uninstall	2015-12-07 07:02:30 +09:00
Lee Clemens	a64f194163	Add envs/*/my-virtual-env dir for uninstall Both directories need to be deleted or a subsequent install with the same name will fail pyenv install 3.4.3 my-virtual-env: rm -rf ~/.pyenv/versions/my-virtual-env ~/.pyenv/versions/3.4.3/my-virtual-env	2015-12-06 12:11:08 -05:00
Yamashita, Yuu	17d22e7a13	Add `PYENV_VIRTUAL_ENV` to check if the virtualenv has been activated via pyenv-virtualenv or not (#128 )	2015-12-05 01:44:10 +00:00
Yamashita, Yuu	8d307def52	Merge branch 'envs-riwyo-anyenv-workaround' (fixes #130 )	2015-12-04 02:50:27 +00:00
Yamashita, Yuu	a5d406a545	Add tests for extra `envs` in `PYENV_ROOT`	2015-12-04 02:41:43 +00:00
Yamashita, Yuu	9c49fcd734	Fix broken tests	2015-12-04 02:33:37 +00:00
Yamashita, Yuu	3fc832f4c7	Create virtualenv inside `real_prefix`	2015-12-04 00:43:10 +00:00
Yamashita, Yuu	aae3bf2786	Add workaround for rywyo/anyenv	2015-12-04 00:43:03 +00:00
Yamashita, Yuu	035f5185b5	Skip `ensurepip` if `--no-setuptools`, `--no-pip` or `--without-pip` is given (fixes #127 )	2015-12-04 00:07:01 +00:00
Yamashita, Yuu	b9d17df337	`pyenv-which-ext` isn't necessary for Anaconda since latest pyenv has built-in hook	2015-12-03 09:55:25 +00:00
Yamashita, Yuu	e230817496	Restored `--no-error` for compatibility with v20151103 and earlier	2015-12-02 23:59:41 +00:00
Yamashita, Yuu	6e91d75069	Stop showing message about `pyenv virtualenv-init` on activate (#122 ) `pyenv virtualenv-init` is just an option. Always showing message about it would be too much to do.	2015-12-02 23:49:07 +00:00
Yamashita, Yuu	cf7dea411d	Merge pull request #125 from yyuu/conda-create Use `conda create` to create virtual environment if `conda` is available	2015-11-27 22:38:42 +09:00
Yamashita, Yuu	fa11d65bf6	Add tests for `conda create`	2015-11-27 13:36:33 +00:00
Yamashita, Yuu	48b491f343	Add test helpers for virtualenv, pyvenv and conda	2015-11-27 13:31:00 +00:00
Yamashita, Yuu	6a2b77ed5b	Fix tests	2015-11-27 12:36:59 +00:00
Yamashita, Yuu	a67be6dbe7	Update README about `conda create`	2015-11-27 04:55:04 +00:00
Yamashita, Yuu	789c349570	Allow specifying python version for conda via `-p` or `--python`	2015-11-27 04:41:00 +00:00
Yamashita, Yuu	bad8dcf768	Use `conda create` to create virtualenv if the source version is a Anaconda/Miniconda	2015-11-27 04:32:34 +00:00
Yamashita, Yuu	116e133c90	Activate a virtualenv of current version if specified version is not a virtualenv ```sh % pyenv versions system * miniconda3-3.16.0 (set by PYENV_VERSION environment variable) miniconda3-3.16.0/envs/venv % pyenv activate venv pyenv-virtualenv: deactivate miniconda3-3.16.0 pyenv-virtualenv: activate miniconda3-3.16.0/envs/venv ```	2015-11-27 00:04:05 +00:00
Yamashita, Yuu	35732c8393	Merge branch 'virtualenv-without-python-executable'	2015-11-26 12:40:57 +00:00
Yamashita, Yuu	c3d044d70a	Only use premitives in which hooks to avoid infinite loop (#104 )	2015-11-26 12:39:15 +00:00
Yamashita, Yuu	bdda7214a8	Should not try to find system-site-packages if virtualenv is a conda's environment (#104 )	2015-11-26 11:07:26 +00:00
Yamashita, Yuu	1edff311d5	exits as error if the virtual environment doesn't have `python` executable (#104 ) conda's environment might not have `python` executable. If the prefix doesn't contain `python` in it, `pyenv-which` might be ran into infinite loop if some of `which` hooks invoke `pyenv-virtualenv-prefix`.	2015-11-26 10:34:32 +00:00
Yamashita, Yuu	353062df09	Merge pull request #124 from yyuu/deactivation-before-activation-should-not-return-non-zero Deactivation before activation should not return as non-zero	2015-11-26 19:32:25 +09:00
Yamashita, Yuu	aae07d1318	Deactivation before activation should not return as non-zero (fixes #116 )	2015-11-26 09:15:02 +00:00
Yamashita, Yuu	aea9eda680	Merge pull request #123 from yyuu/remove-pyenv-deactivate Remove `PYENV_DEACTIVATE`	2015-11-26 14:06:14 +09:00
Yamashita, Yuu	5e92253943	Fix broken `--skip-aliases`	2015-11-25 12:04:48 +00:00
Yamashita, Yuu	0bbb12a3bf	Use glob to check if the virtualenv is inside pyenv's prefix or not	2015-11-24 00:04:18 +00:00
Yamashita, Yuu	4e9d697887	Suppress message about `virtualenv-init` if `-quiet` given (fixes #122 )	2015-11-23 13:34:46 +00:00
Yamashita, Yuu	5f87786adf	Remove `PYENV_DEACTIVATE` (fixes #121 ) This means that pyenv-virtualenv will not allow manual deactivation of virtualenv if pyenv-virtualenv-init is enabled. This must be acceptable since the activation of virtualenv is just setting of environment variables in current implementation.	2015-11-23 13:33:31 +00:00
Yamashita, Yuu	f92a3a26c5	Add `--skip-aliases` to `pyenv virtualenvs` (fixes #120 )	2015-11-23 12:06:22 +00:00
Yamashita, Yuu	5fd9cf826d	Merge branch 'slashes'	2015-11-23 09:38:55 +00:00
Yamashita, Yuu	59bc189bec	Basically `/` should not be allowed as a part of name of virtualenv	2015-11-23 09:38:39 +00:00
Yamashita, Yuu	ede56c1c2e	Merge pull request #119 from gitter-badger/gitter-badge Add a Gitter chat badge to README.md	2015-11-22 11:18:16 +09:00
The Gitter Badger	34ee1a47d7	Add Gitter badge	2015-11-22 02:17:12 +00:00
Yamashita, Yuu	caa5832b8a	Allow manual activation of virtualenvs inside `$(pyenv-root)/versions` (#115 )	2015-11-16 02:29:46 +00:00
Yamashita, Yuu	de1deb1e81	Merge branch 'non-pyenv-virtualenv'	2015-11-12 13:47:37 +00:00
Yamashita, Yuu	83bc6a49e4	Restore variables set by `activate` script of virtualenv properly (#150 ) The `activate` script does't export the variables of `_OLD_VIRTUAL_*`, most the deactivation code needed to be moved to `sh-deactivate`.	2015-11-12 13:45:33 +00:00
Yamashita, Yuu	47feedc934	exits as 0 if there is some virtualenv outside from pyenv is already activated (#114 )	2015-11-12 13:29:25 +00:00
Yamashita, Yuu	a73817eecc	Use canonical name for `VIRTUAL_ENV` as a workaround for IPython (fixes #113 )	2015-11-12 00:29:26 +00:00
Yamashita, Yuu	25bf4a6155	Unset environment variables to pass tests while activated	2015-11-12 00:27:02 +00:00
Yamashita, Yuu	0b9b19232a	Skip creating `$(pyenv root)/versions/system/envs/` directory for virtualenv from `system`	2015-11-11 01:34:59 +09:00
Yamashita, Yuu	bb623bd8bf	Prevent removing symlinks bound to different version (#106 )	2015-11-09 05:57:16 +00:00
Yamashita, Yuu	3152718bfd	Merge branch 'restore-prompt'	2015-11-09 01:58:19 +00:00
Yamashita, Yuu	ee18ffac9f	Change prompt after `activate` (#52 )	2015-11-09 01:57:17 +00:00
Yamashita, Yuu	c1b9238cbe	Reject creating a virtualenv named `system` (yyuu/pyenv#475 )	2015-11-08 23:44:58 +00:00
Yamashita, Yuu	6ac8afbcff	Merge pull request #111 from yyuu/activate-on-multiple-versions Change `activate` behavior on multiple versions	2015-11-08 18:42:09 +09:00
Yamashita, Yuu	950a742be3	Add short options	2015-11-08 09:18:29 +00:00
Yamashita, Yuu	bdd52a79cd	Revert `PYENV_DEACTIVATE` for backward compatibility	2015-11-08 08:34:43 +00:00
Yamashita, Yuu	d2edf5dddb	Fix tests	2015-11-08 06:32:34 +00:00
Yamashita, Yuu	f7d1aa7d94	Allow activating first version of virtualenv even if there are multiple versions in pyenv (#105 )	2015-11-08 06:32:28 +00:00
Yamashita, Yuu	ce6ec4f173	Merge pull request #110 from yyuu/init-refactor Refactor init code	2015-11-07 03:39:19 +09:00
Yamashita, Yuu	0fa5de07c9	fix broken tests	2015-11-06 18:26:23 +00:00
Yamashita, Yuu	017d20ad91	remove unnecessary logic from init script	2015-11-06 17:58:09 +00:00
Yamashita, Yuu	7f33ddd911	prompt should be managed by users, not by tools	2015-11-06 17:34:21 +00:00
Yamashita, Yuu	8731e9bf14	replaced `--no-error` by `--quiet`	2015-11-06 17:33:40 +00:00
Yamashita, Yuu	bf7e9ba59a	Show `activating...` messages by default	2015-11-06 17:27:50 +00:00
Yamashita, Yuu	dae2788f56	Update LICENSE	2015-11-06 19:42:39 +09:00
Yamashita, Yuu	2a8d0f40b4	Update README.md	2015-11-06 19:41:48 +09:00
Yamashita, Yuu	6523d00f9c	Merge pull request #108 from yyuu/hook-source-activate dd a script to hook `source activate` for Anaconda/Miniconda	2015-11-06 17:15:12 +09:00
Yamashita, Yuu	c54d480135	fix broken installer script	2015-11-06 06:52:40 +00:00
Yamashita, Yuu	e79ca1d53f	add shim for `deactivate`	2015-11-06 06:31:19 +00:00
Yamashita, Yuu	ad2ada84ab	fix broken tests	2015-11-06 06:28:22 +00:00
Yamashita, Yuu	270c379a32	rename tests	2015-11-06 06:15:53 +00:00
Yamashita, Yuu	dfd1655069	add a script to hook `source activate` for Anaconda/Miniconda (#103 )	2015-11-06 06:10:09 +00:00
Yamashita, Yuu	e489163f92	Merge pull request #106 from yyuu/uninstall-rehash-envs Support uninstall and rehash of virtual environments created in `envs`	2015-11-05 18:40:46 +09:00
Yamashita, Yuu	5c9909f4c1	Merge pull request #107 from yyuu/create-virtualenv-in-envs Create virtualenv inside `envs` directory as similar as Anaconda	2015-11-05 18:40:25 +09:00
Yamashita, Yuu	459d1aa92d	Merge pull request #104 from yyuu/activate-ng Rewrite `activate` without using virtualenv/venv/conda's script	2015-11-05 18:39:30 +09:00
Yamashita, Yuu	07b31aa2f6	Add tests for `virtualenv-delete`	2015-11-05 05:42:10 +00:00
Yamashita, Yuu	a233491f2b	Remove obsolete TODO comment	2015-11-05 01:58:44 +00:00
Yamashita, Yuu	c6a705b1d9	Setup `CONDA_DEFAULT_ENV` only if `conda` executable exists	2015-11-05 01:49:04 +00:00
Yamashita, Yuu	8038659299	Create virtualenv inside `envs` directory as similar as Anaconda	2015-11-04 14:56:01 +00:00
Yamashita, Yuu	7e821de319	Support creating shims of virtual environments in `envs` (#103 )	2015-11-04 14:09:11 +00:00
Yamashita, Yuu	0df362e8c8	Support deletion of virtualenv created in `envs`	2015-11-04 14:08:58 +00:00
Yamashita, Yuu	64ceee5c8e	Stop using virtualenv's `activate` script (#69 )	2015-11-04 13:50:17 +00:00
Yamashita, Yuu	2ae921c253	Treat all versions with `activate` script as a virtual environment	2015-11-04 13:07:46 +00:00
Yamashita, Yuu	7931f6c766	Specify branch for build status	2015-11-04 12:15:02 +00:00
Yamashita, Yuu	72cf0e1b1b	v20151103	2015-11-03 13:36:45 +00:00
Yamashita, Yuu	41ee00574c	Merge pull request #101 from blueyed/prepend-to-precmd init: zsh: prepend hook to precmd_functions	2015-11-03 05:25:20 +09:00
Daniel Hahler	f594876f31	init: zsh: prepend hook to precmd_functions This makes sure that $VIRTUAL_ENV is handled already in other precmd functions, especially your prompt.	2015-11-02 17:52:59 +01:00
Yamashita, Yuu	521576e8c4	workaround for `pyvenv --system-site-packages` (#62 )	2015-10-30 01:55:46 +00:00
Yamashita, Yuu	0048516a7d	Merge pull request #100 from bartoszj/master Passing return value from executed command.	2015-10-16 07:07:33 +09:00
Bartosz Janda	f657fad926	Passing return value from executed command.	2015-10-15 20:37:00 +02:00
Yamashita, Yuu	6a6947659a	v20151006	2015-10-06 14:06:58 +00:00
Yamashita, Yuu	d0c77019cc	use container-based infrastructure on travis-ci.org	2015-10-06 14:04:10 +00:00
Yamashita, Yuu	164925ca3c	change to SVG build status	2015-10-06 14:02:49 +00:00
Yamashita, Yuu	249759aa04	add foolproof for `-p` argument. find proper source version from pyenv if the given executable is only basename or is a shim script.	2015-10-06 13:53:43 +00:00
Yamashita, Yuu	e34a8bbee4	Merge pull request #98 from jerr0328/master pyenv-virtualenv-init fix for fish	2015-09-24 21:56:18 +09:00
Jeremy	d86fd13797	Fix test to not have quotes expected in command eval for Fish	2015-09-24 14:39:24 +02:00
Jeremy	a242067435	Fix pyenv-virtualenv-init script for fish where command was in string and not being evaluated	2015-09-24 14:06:20 +02:00
Yamashita, Yuu	45c73f9073	fix broken pattern matching to `pythonX.Y-config`	2015-09-22 23:49:04 +09:00
Yamashita, Yuu	cce1b9535d	Merge branch 'find-python-config-from-source-version'	2015-09-22 22:57:36 +09:00
Yamashita, Yuu	1ca0c84ed6	find `python-config` from source version if current version is a virtualenv	2015-09-22 22:56:34 +09:00
Yamashita, Yuu	d1a0f2c66d	Merge pull request #93 from aristiden7o/patch-1 update init step in brew installation instructions	2015-07-28 08:03:07 +09:00
Aristide Niyungeko	4776fe4e04	update init step in brew installation instructions This fixes issue: https://github.com/yyuu/pyenv-virtualenv/issues/36	2015-07-27 14:58:46 -07:00
Yamashita, Yuu	d27504b315	Merge pull request #92 from keik/master Apply code blocks style	2015-07-24 09:48:04 +09:00
keik	662b3e7d2f	Apply code blocks style	2015-07-24 09:46:23 +09:00
Yamashita, Yuu	15e4f651ae	Merge branch 'issue89' (fixes #89 )	2015-07-21 15:31:57 +09:00
Yamashita, Yuu	856098bf55	Separate change log from README	2015-07-21 10:14:48 +09:00
Yamashita, Yuu	7b34f7234e	Fix broken test	2015-07-20 19:14:57 +09:00
Yamashita, Yuu	e535faea4d	Ignore user's site-packages on ensurepip/get-pip (#89 ) https://www.python.org/dev/peps/pep-0370/	2015-07-20 19:05:52 +09:00
Yamashita, Yuu	b5c4131993	fix markdown	2015-07-19 21:37:50 +09:00
Yamashita, Yuu	90531a6a48	v20150719	2015-07-19 18:22:34 +09:00
Yamashita, Yuu	a04522204d	Update README	2015-07-19 18:17:49 +09:00
Yamashita, Yuu	c97ae36376	Merge pull request #91 from yyuu/conda-envs Manage Anaconda/Miniconda environment as a pyenv version	2015-07-19 15:11:14 +09:00
Yamashita, Yuu	b32d357353	Add tests for conda	2015-07-19 15:01:04 +09:00
Yamashita, Yuu	cdbf7c9972	activate "root" environment of anaconda/miniconda if environment name is not given	2015-07-19 04:19:34 +09:00
Yamashita, Yuu	25395f0331	activate: look for a conda environment if given name is not a pyenv's prefix	2015-07-19 03:38:48 +09:00
Yamashita, Yuu	be6701e7b6	Fix `Error: too many arguments.` on deactivating anaconda env	2015-07-19 01:04:23 +09:00
Yamashita, Yuu	e1523811fb	fix broken test	2015-07-19 00:08:12 +09:00
Yamashita, Yuu	65c74dbf2d	activate/deactivate anaconda/miniconda envs	2015-07-19 00:08:09 +09:00
Yamashita, Yuu	6132f4228e	EXPERIMENTAL a support for _envs_ created by anaconda/miniconda	2015-07-19 00:07:59 +09:00
Yamashita, Yuu	21239c9342	If the current virtualenv is created with `--system-site-packages` and an executable is not found in it, automatically look up the executable for source Python version. (fixes #62)	2015-07-18 20:39:56 +09:00
Yamashita, Yuu	1608344c56	Merge pull request #79 from blueyed/fix-shell-detection init: fix shell detection when invoked from a script	2015-06-27 04:03:58 +09:00
Daniel Hahler	8ca45c0e0a	init: fix shell detection when invoked from a script - fixes `ps` command to lookup parent process - adds `assert_output_contains_not` test helper Ref: https://github.com/yyuu/pyenv/issues/373	2015-06-26 20:47:08 +02:00
Yamashita Yuu	69fee6855d	Show error message if the source version is not installed (#83 )	2015-06-27 02:19:28 +09:00
Yamashita Yuu	e261806f96	Skip installing `setuptools` explicitly with using `ez_setup.py` (yyuu/pyenv#381 ) It will be done by `get-pip.py` and we don't have to do anything explicitly.	2015-05-27 00:06:16 +09:00