Fix issues with manual activation of virtual environments (#34)

README.md

@@ -3,12 +3,12 @@
 [![Build Status](https://travis-ci.org/yyuu/pyenv-virtualenv.png)](https://travis-ci.org/yyuu/pyenv-virtualenv)
 
 pyenv-virtualenv is a [pyenv](https://github.com/yyuu/pyenv) plugin
-that provides features to manage virtualenvs and conda environments
+that provides a `pyenv virtualenv` command to create virtualenv for Python
-for Python on UNIX-like systems.
+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
-(additionally) to manage your virtualenvs.)
+to manage your virtualenvs.)
 
 ## Installation
 
@@ -17,45 +17,36 @@ and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtual
 This will install the latest development version of pyenv-virtualenv into
 the `~/.pyenv/plugins/pyenv-virtualenv` directory. 
 
-**Important note:**  If you installed pyenv into a non-standard directory, make
+**Important note:**  If you installed pyenv into a non-standard directory, make sure that you clone this
-sure that you clone this repo into the 'plugins' directory of wherever you
+repo into the 'plugins' directory of wherever you installed into.
-installed into.
 
 From inside that directory you can:
  - Check out a specific release tag. 
- - Get the latest development release by running `git pull` to download the
+ - Get the latest development release by running `git pull` to download the latest changes.
-   latest changes.
 
 1. **Check out pyenv-virtualenv into plugin directory**
 
-```
+        $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
-$ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
-```
 
-2. (OPTIONAL) **Add `pyenv virtualenv-init` to your shell** to enable auto-activation of virtualenv. This is entirely optional but pretty useful.
+2. **Add `pyenv virtualenv-init` to your shell** to enable activation of virtualenv
 
-```
+        $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
-$ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
-```
 
     **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
-    **Pyenv note**: You may also need to add 'eval "$(pyenv init -)"' to your profile if you haven't done so already.
 
-3. **Restart your shell to enable pyenv-virtualenv**
+3. **Restart your shell to the enable pyenv-virtualenv**
 
-```
+        $ exec "$SHELL"
-$ exec "$SHELL"
-```
 
 
 ### Installing with Homebrew (for OS X users)
 
 Mac OS X users can install pyenv-virtualenv with the
-[Homebrew](http://brew.sh) package manager.
+[Homebrew](http://brew.sh) package manager. This
-This will give you access to the `pyenv-virtualenv` command. If you have pyenv
+will give you access to the `pyenv-virtualenv` command. If you have pyenv
 installed, you will also be able to use the `pyenv virtualenv` command.
 
-*This is the recommended method of installation if you installed pyenv
+*This is recommended method of installation if you installed pyenv
  with Homebrew.*
 
 ```
@@ -68,180 +59,80 @@ Or, if you would like to install the latest development release:
 $ brew install --HEAD pyenv-virtualenv
 ```
 
-After installation, you'll still need to add `eval "$(pyenv virtualenv-init -)"` to your profile (as stated in the caveats).
+After installation, you'll still need to add `eval "$(pyenv virtualenv-init -)"` to your
-You'll only ever have to do this once.
+profile (as stated in the caveats). You'll only ever have to do this once.
 
 
 ## Usage
 
 ### Using `pyenv virtualenv` with pyenv
 
-To create a virtualenv for the Python version used with pyenv, run
+To create a virtualenv for the Python version use with pyenv, run
 `pyenv virtualenv`, specifying the Python version you want and the name
 of the virtualenv directory. For example,
 
 ```
-$ pyenv virtualenv 2.7.10 my-virtual-env-2.7.10
+$ pyenv virtualenv 2.7.7 my-virtual-env-2.7.7
 ```
 
-will create a virtualenv based on Python 2.7.10 under `~/.pyenv/versions` in a
+will create a virtualenv based on Python 2.7.7
-folder called `my-virtual-env-2.7.10`.
+under `~/.pyenv/versions` in a folder called `my-virtual-env-2.7.7`. 
 
 
 ### Create virtualenv from current version
 
-If there is only one argument given to `pyenv virtualenv`, the virtualenv will
+If there is only one argument is given to `pyenv virtualenv`,
-be created with the given name based on the current pyenv Python version.
+virtualenv will be created with given name based on current
+version.
 
 ```
 $ pyenv version
-3.4.3 (set by /home/yyuu/.pyenv/version)
+3.4.1 (set by /home/yyuu/.pyenv/version)
 $ pyenv virtualenv venv34
 ```
 
 
 ### List existing virtualenvs
 
-`pyenv virtualenvs` shows you the list of existing virtualenvs and `conda` environments.
+`pyenv virtualenvs` shows you the list of existing virtualenvs.
 
 ```
 $ pyenv shell venv27
 $ pyenv virtualenvs
-  miniconda3-3.9.1 (created from /home/yyuu/.pyenv/versions/miniconda3-3.9.1)
+* venv27 (created from /home/yyuu/.pyenv/versions/2.7.7)
-  miniconda3-3.9.1/envs/myenv (created from /home/yyuu/.pyenv/versions/miniconda3-3.9.1)
+  venv34 (created from /home/yyuu/.pyenv/versions/3.4.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
+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.
+The `pyenv-virtualenv` will automatically activate/deactivate the virtualenv if the `eval "$(pyenv virtualenv-init -)"` is properly configured in your shell.
 
-`pyenv-virtualenv` will automatically activate/deactivate the virtualenv if
+You can also activate and deactivate a pyenv virtualenv this way:
-the `eval "$(pyenv virtualenv-init -)"` is properly configured in your shell.
-
-You can also activate and deactivate a pyenv virtualenv manually:
-
-```sh
-pyenv activate <name>
-pyenv deactivate
-```
-
-
-### Delete existing virtualenv
-
-Removing the directory in `~/.pyenv/versions` will delete the virtualenv, or you can run:
-
-```sh
-pyenv uninstall my-virtual-env
-```
-
-
-### virtualenv and pyvenv
-
-There is a [venv](http://docs.python.org/3/library/venv.html) module available
-for CPython 3.3 and newer.
-It provides a command-line tool `pyvenv` which is the successor of `virtualenv`
-and distributed by default.
-
-`pyenv-virtualenv` uses `pyvenv` if it is available and the `virtualenv`
-command is not available.
-
-
-### Anaconda and Miniconda
-
-Because Anaconda and Miniconda may install standard commands (e.g. `curl`, `openssl`, `sqlite3`, etc.) into their prefix,
-we'd recommend you to install [pyenv-which-ext](https://github.com/yyuu/pyenv-which-ext).
-
-You can manage `conda` environments by `conda env` as same manner as standard Anaconda/Miniconda installations.
-To use those environments, you can use `pyenv activate` and `pyenv deactivate`.
-
-```
-(root)$ pyenv version
-miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
-(root)$ conda env list
-# conda environments:
-#
-myenv                    /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv
-root                  *  /home/yyuu/.pyenv/versions/miniconda3-3.9.1
-(root)$ pyenv activate myenv
-discarding /home/yyuu/.pyenv/versions/miniconda3-3.9.1/bin from PATH
-prepending /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin to PATH
-(myenv)$ python --version
-Python 3.4.3 :: Continuum Analytics, Inc.
-(myenv)$ pyenv deactivate
-discarding /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin from PATH
-```
-
-You can use version like `miniconda3-3.9.1/envs/myenv` to specify `conda` environment as a version in pyenv.
-
-```
-(root)$ pyenv version
-miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
-(root)$ pyenv shell miniconda3-3.9.1/envs/myenv
-(myenv)$ which python
-/home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin/python
-```
 
+    pyenv activate <name>
+    pyenv deactivate
 
 ### Special environment variables
 
-You can set certain environment variables to control pyenv-virtualenv.
+You can set certain environment variables to control the pyenv-virtualenv.
 
 * `PYENV_VIRTUALENV_CACHE_PATH`, if set, specifies a directory to use for
   caching downloaded package files.
-* `VIRTUALENV_VERSION`, if set, forces pyenv-virtualenv to install the desired
+* `VIRTUALENV_VERSION`, if set, forces pyenv-virtualenv to install desired
-  version of virtualenv. If `virtualenv` has not been installed,
+  version of virtualenv. If the virtualenv has not been installed,
   pyenv-virtualenv will try to install the given version of virtualenv.
-* `GET_PIP`, if set and `pyvenv` is preferred over `virtualenv`,
+* `EZ_SETUP` and `GET_PIP`, if set and pyvenv is preferred than virtualenv,
-  use `get_pip.py` from the specified location.
+  use `ez_setup.py` and `get_pip.py` at specified location.
-* `GET_PIP_URL`, if set and `pyvenv` is preferred over
+* `EZ_SETUP_URL` and `GET_PIP_URL`, if set and pyvenv is preferred
-  `virtualenv`, download `get_pip.py` from the specified URL.
+  than virtualenv, download `ez_setup.py` and `get_pip.py` from specified URL.
-* `PIP_VERSION`, if set and `pyvenv` is preferred
+* `SETUPTOOLS_VERSION` and `PIP_VERSION`, if set and pyvenv is preferred
-  over `virtualenv`, install the specified version of pip.
+  than virtualenv, install specified version of setuptools and pip.
 
 
 ## Version History
 
-#### 20150719
-
-* Add support for `conda` environments created by Anaconda/Miniconda (#91)
-* Look up commands for original version as well if the environment is created with `--system-site-packages` (#62)
-* Add error message if the source version is not installed (#83)
-
-#### 20150526
-
-* Use `typeset -g` with `precmd_functions` (#75)
-* 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)

bin/pyenv-sh-activate

@@ -14,36 +14,19 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-unset NOERROR
+# Provide pyenv completions
-unset VERBOSE
+if [ "$1" = "--complete" ]; then
+  echo --unset
+  exec pyenv-virtualenvs --bare
+fi
 
-while [ $# -gt 0 ]; do
+if [ "$1" = "--unset" ]; then
-  case "$1" in
+  echo "pyenv deactivate"
-  "--complete" )
+  exit
-    # Provide pyenv completions
+fi
-    echo --unset
-    exec pyenv-virtualenvs --bare
-    ;;
-  "--no-error" )
-    NOERROR=1
-    ;;
-  "--unset" )
-    echo "pyenv deactivate"
-    exit
-    ;;
-  "--verbose" )
-    VERBOSE=1
-    ;;
-  * )
-    break
-    ;;
-  esac
-  shift 1
-done
 
-no_shell=
 versions=("$@")
-if [ -z "${versions}" ]; then
+if [ -z "$versions" ]; then
   no_shell=1
   OLDIFS="$IFS"
   IFS=: versions=($(pyenv-version-name))
@@ -57,96 +40,53 @@ if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
 fi
 
 if [ "${#versions[@]}" -gt 1 ]; then
-  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
+  echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
-  echo "false"
   exit 1
 fi
 
-if pyenv-prefix "${versions}" 1>/dev/null 2>&1; then
+pyenv-virtualenv-prefix "${versions}" 1>/dev/null
-  if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
-    echo "false"
-    exit 1
-  fi
-else
-  version="$(pyenv-version-name)"
-  if [[ "${versions}" == "root" ]]; then
-    versions="${version%/envs/*}"
-  else
-    versions="${version%/envs/*}/envs/${versions}"
-  fi
-  if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not an environment of anaconda/miniconda" 1>&2
-    echo "false"
-    exit 1
-  fi
-fi
 
-shell="${PYENV_SHELL:-${SHELL##*/}}"
+shell="$(basename "${PYENV_SHELL:-$SHELL}")"
-prefix="$(pyenv-prefix "${versions}")"
+case "$shell" in
+bash )
+  profile="$HOME/.bash_profile"
+  ;;
+zsh )
+  profile="$HOME/.zshrc"
+  ;;
+ksh )
+  profile="$HOME/.profile"
+  ;;
+fish )
+  profile="$HOME/.config/fish/config.fish"
+  ;;
+* )
+  profile="$HOME/.profile"
+  ;;
+esac
 
-unset conda_env
+# Display setup instruction if 'pyenv virtualenv-init -' is not found in "$profile"
-
+if [ -f "$profile" ] && grep -q 'pyenv init -' "$profile" && ! grep -q 'pyenv virtualenv-init -' "$profile"; then
-if [ -f "${prefix}/bin/conda" ]; then
-  if [[ "$shell" != "bash" ]] && [[ "$shell" != "zsh" ]]; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda" 1>&2
-    echo "false"
-    exit 1
-  fi
-  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
-    conda_env="${prefix##*/envs/}"
-  else
-    conda_env="root"
-  fi
-fi
-
-# Display setup instruction, if pyenv-virtualenv has not been initialized.
-# if 'pyenv virtualenv-init -' is not found in "$profile"
-if [ -z "$PYENV_VIRTUALENV_INIT" ]; then
   pyenv-virtualenv-init >&2 || true
 fi
 
-if [ -n "$VERBOSE" ]; then
-  echo "pyenv-virtualenv: activate ${versions}" 1>&2
-fi
-
 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
-  case "$shell" in
-  fish )
-    echo "setenv PYENV_ACTIVATE_SHELL 1;"
-    ;;
-  * )
-    echo "export PYENV_ACTIVATE_SHELL=1;"
-    ;;
-  esac
 fi
 
-if [ -n "${conda_env}" ]; then
+case "$shell" in
-  # anaconda/miniconda
+fish )
+  cat <<EOS
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "$(pyenv-prefix "${versions}")";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
+EOS
+ ;;
+*    )
   cat <<EOS
 unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${prefix}";
+export PYENV_ACTIVATE="$(pyenv-prefix "${versions}")";
-. "${prefix%/envs/*}/bin/activate" "${conda_env}";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
-else
+  ;;
-  # virtualenv/pyvenv
+esac
-  case "$shell" in
-  fish )
-    cat <<EOS
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${prefix}";
-. "${prefix}/bin/activate.fish";
-EOS
-   ;;
-  *    )
-    cat <<EOS
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${prefix}";
-. "${prefix}/bin/activate";
-EOS
-    ;;
-  esac
-fi

bin/pyenv-sh-deactivate

@@ -9,112 +9,30 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-unset NOERROR
-unset VERBOSE
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-  "--no-error" )
-    NOERROR=1
-    ;;
-  "--verbose" )
-    VERBOSE=1
-    ;;
-  * )
-    break
-    ;;
-  esac
-  shift 1
-done
-
 shell="$(basename "${PYENV_SHELL:-$SHELL}")"
-prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}"
-
-unset conda_env
-
-if [ -f "${prefix}/bin/conda" ]; then
-  if [[ "$shell" != "bash" ]] && [[ "$shell" != "zsh" ]]; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda" 1>&2
-    echo "false"
-    exit 1
-  fi
-  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
-    conda_env="${prefix##*/envs/}"
-  else
-    conda_env="root"
-  fi
-fi
-
-if [ -n "${conda_env}" ]; then
-  echo "if [ -f \"${prefix%/envs/*}/bin/deactivate\" ]; then"
-else
-  case "$shell" in
-  fish )
-    echo "if functions -q deactivate;"
-    ;;
-  *    )
-    echo "if declare -f deactivate 1>/dev/null 2>&1; then"
-    ;;
-  esac
-fi
-
-if [ -n "$VERBOSE" ]; then
-  echo "  echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
-fi
-
-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;"
-    ;;
-  * )
-    echo "  unset PYENV_ACTIVATE_SHELL;"
-    ;;
-  esac
-fi
-
-if [ -n "${conda_env}" ]; then
-  cat <<EOS
-  export PYENV_DEACTIVATE="$prefix";
-  unset PYENV_ACTIVATE;
-  . "${prefix%/envs/*}/bin/deactivate";
-else
-EOS
-else
-  case "$shell" in
-  fish )
-    cat <<EOS
-  setenv PYENV_DEACTIVATE "$prefix";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-EOS
-    ;;
-  *    )
-    cat <<EOS
-  export PYENV_DEACTIVATE="$prefix";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-EOS
-    ;;
-  esac
-fi
-
-if [ -z "$NOERROR" ]; then
-  echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"
-fi
-
-echo "  false;"
-
 case "$shell" in
 fish )
-  echo "end;"
+  cat <<EOS
+if functions -q deactivate
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+end;
+EOS
   ;;
 *    )
-  echo "fi;"
+  cat <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+fi;
+EOS
   ;;
 esac
+
+if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
+  # Backward compatibility issue
+  # https://github.com/yyuu/pyenv-virtualenv/issues/26
+  echo "pyenv shell --unset;"
+fi

bin/pyenv-virtualenv

@@ -2,14 +2,14 @@
 #
 # Summary: Create a Python virtualenv using the pyenv-virtualenv plugin
 #
-# Usage: pyenv virtualenv [-f|--force] [VIRTUALENV_OPTIONS] [version] <virtualenv-name>
+# Usage: pyenv virtualenv [-f|--force] [VIRTUALENV_OPTIONS] <version> <virtualenv-name>
 #        pyenv virtualenv --version
 #        pyenv virtualenv --help
 #
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20150719"
+PYENV_VIRTUALENV_VERSION="20140615"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -182,7 +182,31 @@ build_package_get_pip() {
 }
 
 build_package_ensurepip() {
-  pyenv-exec python -m ensurepip 2>/dev/null || build_package_get_pip "$@" || return 1
+  pyenv-exec python -m ensurepip 2>/dev/null|| {
+    build_package_ez_setup "$@" && build_package_get_pip "$@"
+  } || return 1
+
+  create_symlinks "$(pyenv-exec python -c 'import sys;v=sys.version_info;sys.stdout.write("python%d.%d"%(v[0],v[1]))')"
+}
+
+create_symlinks() {
+  local suffix="$1"
+
+  local file link
+  shopt -s nullglob
+  for file in "${VIRTUALENV_PATH}/bin"/*; do
+    if [[ "${file##*/}" == *"${suffix}" ]]; then
+      if [[ "${file}" == *"-${suffix}" ]]; then
+        link="${file%%-${suffix}}"
+      else
+        link="${file%%${suffix}}"
+      fi
+      if [ ! -e "${link}" ]; then
+        ( cd "${file%/*}" && ln -fs "${file##*/}" "${link##*/}" )
+      fi
+    fi
+  done
+  shopt -u nullglob
 }
 
 prepare_requirements() {
@@ -273,19 +297,11 @@ if [ -z "${VERSION_NAME}" ] || [ -z "${VIRTUALENV_NAME}" ]; then
   usage 1
 fi
 
-if [ "$VIRTUALENV_NAME" != "${VIRTUALENV_NAME%[[:space:]]*}" ]; then
-  echo "pyenv-virtualenv: no whitespace 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.
+# Source version must exists before creating virtualenv
-if ! pyenv-prefix 1>/dev/null 2>&1; then
+pyenv-prefix 1>/dev/null 2>&1 || usage 1
-  echo "pyenv-virtualenv: \`${PYENV_VERSION}' is not installed in pyenv." 1>&2
-  exit 1
-fi
 
 if [ -z "$TMPDIR" ]; then
   TMP="/tmp"
@@ -329,12 +345,12 @@ else
   fi
 fi
 
-# Unset environment variables which start with `VIRTUALENV_`.
+# Unset environment variables which starts with `VIRTUALENV_`.
 # These variables are reserved for virtualenv.
 unset VIRTUALENV_VERSION
 
 
-# Download specified version of ez_setup.py/get-pip.py.
+# Download specified version of ez_setup.py/get-pip.py
 if [ -n "${SETUPTOOLS_VERSION}" ]; then
   EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
 fi
@@ -397,19 +413,19 @@ trap cleanup SIGINT
 
 # Invoke virtualenv and record exit status in $STATUS.
 STATUS=0
-# virtualenv may download distribute/setuptools into the current directory.
+# virtualenv may download distribute/setuptools in current directory.
-# Change to cache directory to reuse them between invocations.
+# change to cache directory to reuse them between invocation.
 mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
 venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
 
-## Install setuptools and pip.
+## Install setuptools and pip
 PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
 
-## Migrate previously installed packages from requirements.txt.
+## Migrate previously installed packages from requirements.txt
 PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
 
-# Execute `after_virtualenv` hooks.
+# Execute `after_virtualenv` hooks
 for hook in "${after_hooks[@]}"; do eval "$hook"; done
 
 # Run `pyenv-rehash` after a successful installation.

bin/pyenv-virtualenv-init

@@ -18,13 +18,12 @@ do
   fi
 done
 
-shell="${1:-$PYENV_SHELL}"
+shell="$1"
 if [ -z "$shell" ]; then
-  shell="$(ps -p "$PPID" -o 'args=' 2>/dev/null || true)"
+  shell="$(ps c -p "$PPID" -o 'ucomm=' 2>/dev/null || true)"
   shell="${shell##-}"
   shell="${shell%% *}"
-  shell="${shell:-$SHELL}"
+  shell="$(basename "${shell:-$SHELL}")"
-  shell="${shell##*/}"
 fi
 
 if [ -z "$print" ]; then
@@ -76,24 +75,18 @@ 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" ]
+    if [ (pyenv version-name) = "system" ]
-      pyenv deactivate --no-error --verbose
+      eval (pyenv sh-deactivate); or true
-      set -e PYENV_DEACTIVATE
       return 0
     end
-    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
-      if pyenv deactivate --no-error --verbose
+      eval (pyenv sh-deactivate); or true
-        set -e PYENV_DEACTIVATE
+      eval (pyenv sh-activate 2>/dev/null); or true
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
     end
   else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
+    if [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
-      pyenv activate --no-error --verbose; or true
+      eval (pyenv sh-activate 2>/dev/null); or true
     end
   end
 end
@@ -114,22 +107,17 @@ esac
 if [[ "$shell" != "fish" ]]; then
   cat <<EOS
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
-      eval "\$(pyenv sh-deactivate --no-error --verbose)"
+      pyenv deactivate || true
-      unset PYENV_DEACTIVATE
       return 0
     fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
-      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
+      pyenv deactivate || true
-        unset PYENV_DEACTIVATE
+      pyenv activate 2>/dev/null || true
-        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
-      else
-        eval "\$(pyenv sh-activate --no-error --verbose)"
-      fi
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
-      eval "\$(pyenv sh-activate --no-error --verbose)" || true
+      pyenv activate 2>/dev/null || true
     fi
   fi
 };
@@ -145,7 +133,7 @@ EOS
     ;;
   zsh )
     cat <<EOS
-typeset -g -a precmd_functions
+typeset -a precmd_functions
 if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
   precmd_functions+=_pyenv_virtualenv_hook;
 fi

bin/pyenv-virtualenv-prefix

@@ -31,31 +31,11 @@ base_prefix() { # pyvenv
 }
 
 VIRTUALENV_PREFIX_PATHS=()
-for version_string in "${versions[@]}"; do
+for version in "${versions[@]}"; do
-  version="${version_string%%/*}"
-  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)
+    VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
-    if [ -f "${PREFIX}/bin/conda" ]; then
+    VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
-      if [[ "${version_string}" != "${version_string%/envs/*}" ]]; then
-        conda_env="${version_string##*/envs/}"
-        if [ -f "${PREFIX}/envs/${conda_env}/bin/conda" ]; then
-          VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
-        else
-          echo "pyenv-virtualenv: version \`${version_string}' is not an environment of anaconda/miniconda" 1>&2
-          exit 1
-        fi
-      else
-        VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
-      fi
-    else
-      VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
-      VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
-    fi
   else
     echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
     exit 1

bin/pyenv-virtualenvs

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

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

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

test/activate.bats

@@ -13,7 +13,6 @@ setup() {
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -25,30 +24,7 @@ setup() {
   assert_output <<EOS
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
+source "\${PYENV_ACTIVATE}/bin/activate";
-EOS
-}
-
-@test "activate virtualenv from current version (verbose)" {
-  export PYENV_VIRTUALENV_INIT=1
-
-  stub pyenv-version-name "echo venv"
-  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-
-  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose
-
-  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
 }
 
@@ -58,7 +34,6 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -68,16 +43,10 @@ EOS
 
   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";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -87,7 +56,6 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -99,7 +67,7 @@ EOS
   assert_output <<EOS
 set -e PYENV_DEACTIVATE;
 setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -109,7 +77,6 @@ EOS
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
 
   PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
 
@@ -119,16 +86,10 @@ EOS
 
   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";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -137,9 +98,8 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
-  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
+  run pyenv-sh-activate "venv27"
 
   unstub pyenv-virtualenv-prefix
   unstub pyenv-prefix
@@ -147,10 +107,9 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv shell "venv27";
-export PYENV_ACTIVATE_SHELL=1;
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -159,74 +118,18 @@ EOS
 
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
-  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
+  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";
-export PYENV_ACTIVATE_SHELL=1;
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+source "\${PYENV_ACTIVATE}/bin/activate";
-EOS
-}
-
-@test "activate virtualenv from command-line argument (fish)" {
-  export PYENV_VIRTUALENV_INIT=1
-
-  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-
-  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
-
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-pyenv shell "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
-EOS
-}
-
-@test "activate virtualenv from command-line argument (fish) (without pyenv-virtualenv-init)" {
-  export PYENV_VIRTUALENV_INIT=
-
-  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-
-  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
-
-  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";
-setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
 EOS
 }
 
@@ -241,33 +144,12 @@ EOS
 
 @test "should fail if the version is not a virtualenv" {
   stub pyenv-virtualenv-prefix "3.3.3 : false"
-  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-sh-activate "3.3.3"
 
   unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
 
   assert_failure
-  assert_output <<EOS
-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"
-  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
-
-  run pyenv-sh-activate --no-error "3.3.3"
-
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
-  assert_failure
-  assert_output <<EOS
-false
-EOS
 }
 
 @test "should fail if there are multiple versions" {
@@ -276,16 +158,6 @@ EOS
   assert_failure
   assert_output <<EOS
 pyenv-virtualenv: cannot activate multiple versions at once: venv venv27
-false
-EOS
-}
-
-@test "should fail if there are multiple versions (no-error)" {
-  run pyenv-sh-activate --no-error "venv" "venv27"
-
-  assert_failure
-  assert_output <<EOS
-false
 EOS
 }
 

test/conda-activate.bats

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

test/conda-deactivate.bats

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

test/conda-virtualenv-prefix.bats

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

test/deactivate.bats

@@ -7,218 +7,64 @@ setup() {
 }
 
 @test "deactivate virtualenv" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
-  export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
   unset PYENV_ACTIVATE;
   deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
 fi;
 EOS
 }
 
-@test "deactivate virtualenv (verbose)" {
+@test "deactivate virtualenv (without pyenv-virtualenv-init)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=
-  export PYENV_ACTIVATE_SHELL=
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --verbose
-
-  assert_success
-  assert_output <<EOS
-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;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  false;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv (with shell activation)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=1
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
 if declare -f deactivate 1>/dev/null 2>&1; then
-  pyenv shell --unset;
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
-  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;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv (with shell activation) (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=1
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-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;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv which has been activated manually" {
-  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE=
-  export PYENV_ACTIVATE_SHELL=
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate
-
-  assert_success
-  assert_output <<EOS
-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;
 fi;
+pyenv shell --unset;
 EOS
 }
 
 @test "deactivate virtualenv (fish)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
-  export PYENV_ACTIVATE_SHELL=
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
-if functions -q deactivate;
+if functions -q deactivate
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
+  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)" {
+@test "deactivate virtualenv (fish) (without pyenv-virtualenv-init)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=
-  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;
+if functions -q deactivate
-  pyenv shell --unset;
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
-  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 VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE=
-  export PYENV_ACTIVATE_SHELL=
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate
-
-  assert_success
-  assert_output <<EOS
-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;
 end;
+pyenv shell --unset;
 EOS
 }
 

test/init.bats

@@ -3,32 +3,12 @@
 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 ]
@@ -52,22 +32,17 @@ load test_helper
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
-      eval "\$(pyenv sh-deactivate --no-error --verbose)"
+      pyenv deactivate || true
-      unset PYENV_DEACTIVATE
       return 0
     fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
-      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
+      pyenv deactivate || true
-        unset PYENV_DEACTIVATE
+      pyenv activate 2>/dev/null || true
-        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
-      else
-        eval "\$(pyenv sh-activate --no-error --verbose)"
-      fi
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
-      eval "\$(pyenv sh-activate --no-error --verbose)" || true
+      pyenv activate 2>/dev/null || true
     fi
   fi
 };
@@ -83,24 +58,18 @@ EOS
   assert_output <<EOS
 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" ]
+    if [ (pyenv version-name) = "system" ]
-      pyenv deactivate --no-error --verbose
+      eval (pyenv sh-deactivate); or true
-      set -e PYENV_DEACTIVATE
       return 0
     end
-    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
-      if pyenv deactivate --no-error --verbose
+      eval (pyenv sh-deactivate); or true
-        set -e PYENV_DEACTIVATE
+      eval (pyenv sh-activate 2>/dev/null); or true
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
     end
   else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
+    if [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
-      pyenv activate --no-error --verbose; or true
+      eval (pyenv sh-activate 2>/dev/null); or true
     end
   end
 end
@@ -114,26 +83,21 @@ EOS
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
-      eval "\$(pyenv sh-deactivate --no-error --verbose)"
+      pyenv deactivate || true
-      unset PYENV_DEACTIVATE
       return 0
     fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
-      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
+      pyenv deactivate || true
-        unset PYENV_DEACTIVATE
+      pyenv activate 2>/dev/null || true
-        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
-      else
-        eval "\$(pyenv sh-activate --no-error --verbose)"
-      fi
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
-      eval "\$(pyenv sh-activate --no-error --verbose)" || true
+      pyenv activate 2>/dev/null || true
     fi
   fi
 };
-typeset -g -a precmd_functions
+typeset -a precmd_functions
 if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
   precmd_functions+=_pyenv_virtualenv_hook;
 fi

test/pip.bats

@@ -26,7 +26,8 @@ unstub_pyenv() {
   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"
+  stub pyenv-exec "python -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip3.4"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -52,7 +53,10 @@ OUT
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
   stub pyenv-exec "python -m ensurepip : false"
-  stub pyenv-exec "python */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
+  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/pip3.3"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub curl true
   stub curl true
 
   remove_executable "3.3.5" "virtualenv"
@@ -63,6 +67,8 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+PYENV_VERSION=venv python ${TMP}/pyenv/cache/ez_setup.py
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 PYENV_VERSION=venv python ${TMP}/pyenv/cache/get-pip.py
 rehashed

test/pyvenv.bats

@@ -27,6 +27,7 @@ unstub_pyenv() {
   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"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -50,6 +51,7 @@ OUT
   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"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
 
   create_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -74,7 +76,10 @@ OUT
   stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
+  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub curl true
   stub curl true
 
   remove_executable "3.2.1" "virtualenv"
@@ -86,6 +91,7 @@ OUT
   assert_output <<OUT
 PYENV_VERSION=3.2.1 pip install virtualenv
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -103,6 +109,7 @@ OUT
   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 "python -c * : echo ${PYENV_VERSION%.*}"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -128,6 +135,7 @@ OUT
   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 "python -c * : echo ${PYENV_VERSION%.*}"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -153,7 +161,10 @@ OUT
   stub pyenv-exec "pip install virtualenv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
+  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub curl true
   stub curl true
 
   remove_executable "3.2.1" "virtualenv"
@@ -165,6 +176,7 @@ OUT
   assert_output <<OUT
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT

test/test_helper.bash

@@ -97,16 +97,6 @@ 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"
@@ -116,19 +106,3 @@ create_executable() {
 remove_executable() {
   rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
 }
-
-create_conda() {
-  local version="$1"
-  shift 1
-  mkdir -p "${PYENV_ROOT}/versions/$version/bin"
-  touch "${PYENV_ROOT}/versions/$version/bin/activate"
-  touch "${PYENV_ROOT}/versions/$version/bin/conda"
-  chmod +x "${PYENV_ROOT}/versions/$version/bin/conda"
-  local conda_env
-  for conda_env; do
-    mkdir -p "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin"
-    touch "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/activate"
-    touch "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/conda"
-    chmod +x "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/conda"
-  done
-}

test/version.bats

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

test/virtualenv-prefix.bats

@@ -102,19 +102,6 @@ ${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\""

test/virtualenv.bats

@@ -28,7 +28,10 @@ unstub_pyenv() {
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
+  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub curl true
   stub curl true
 
   run pyenv-virtualenv "3.2.1" "venv"
@@ -36,6 +39,7 @@ unstub_pyenv() {
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -51,7 +55,10 @@ OUT
   stub pyenv-version-name "echo \${PYENV_VERSION}"
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
+  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub curl true
   stub curl true
 
   run pyenv-virtualenv venv
@@ -59,6 +66,7 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -75,7 +83,10 @@ OUT
   stub pyenv-version-name "echo \${PYENV_VERSION}"
   stub pyenv-exec "virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
+  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub curl true
   stub curl true
 
   run pyenv-virtualenv -v -p python venv
@@ -83,6 +94,7 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -99,7 +111,10 @@ OUT
   stub pyenv-version-name "echo \${PYENV_VERSION}"
   stub pyenv-exec "virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : false"
+  stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
+  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub curl true
   stub curl true
 
   run pyenv-virtualenv --verbose --python=python venv
@@ -107,6 +122,7 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
@@ -116,21 +132,3 @@ OUT
   unstub pyenv-exec
   unstub curl
 }
-
-@test "no whitespace allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo bar"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: no whitespace allowed in virtualenv name.
-OUT
-}
-
-@test "no tab allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo	bar baz"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: no whitespace allowed in virtualenv name.
-OUT
-}

test/virtualenvs.bats

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