v20160315

Evaluate ${PATH} when outputted code is eval'd.

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Version History
 
+#### 20160315
+
+* Evaluate `${PATH}` when outputted code is eval'd. (#154)
+* Set proper `CONDA_DEFAULT_ENV` for shorter name (#160)
+
+#### 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)

README.md

@@ -111,14 +111,18 @@ $ pyenv virtualenv venv34
 `pyenv virtualenvs` shows you the list of existing virtualenvs and `conda` environments.
 
 ```sh
-$ pyenv shell venv27
+$ pyenv shell venv34
 $ pyenv virtualenvs
   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)
+  2.7.10/envs/my-virtual-env-2.7.10 (created from /home/yyuu/.pyenv/versions/2.7.10)
-  venv34 (created from /home/yyuu/.pyenv/versions/3.4.3)
+  3.4.3/envs/venv34 (created from /home/yyuu/.pyenv/versions/3.4.3)
+  my-virtual-env-2.7.10 (created from /home/yyuu/.pyenv/versions/2.7.10)
+* venv34 (created from /home/yyuu/.pyenv/versions/3.4.3)
 ```
 
+There are two entries for each virtualenv, and the shorter one is just a symlink.
+
 
 ### Activate virtualenv
 

bin/pyenv-sh-activate

@@ -180,7 +180,7 @@ esac
 
 # anaconda/miniconda
 if [ -x "${prefix}/bin/conda" ]; then
-  if [[ "${venv}" != "${venv%/envs/*}" ]]; then
+  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
     CONDA_DEFAULT_ENV="${venv##*/envs/}"
   else
     CONDA_DEFAULT_ENV="root"

bin/pyenv-virtualenv

@@ -9,7 +9,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20160112"
+PYENV_VIRTUALENV_VERSION="20160315"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -378,6 +378,23 @@ if [ -n "$UPGRADE" ]; then
   fi
 fi
 
+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
@@ -416,8 +433,12 @@ else
       fi
     fi
     if [ -z "${HAS_VIRTUALENV}" ]; then
-      VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
+      if [ -n "${VIRTUALENV_VERSION}" ]; then
-      pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
+        virtualenv_spec="virtualenv==${VIRTUALENV_VERSION}"
+      else
+        virtualenv_spec="virtualenv"
+      fi
+      pyenv-exec pip install $QUIET $VERBOSE "${virtualenv_spec}"
       HAS_VIRTUALENV=1
     fi
   fi

bin/pyenv-virtualenv-init

@@ -92,7 +92,7 @@ EOS
   ;;
 * )
   cat <<EOS
-export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:${PATH}";
+export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 EOS
   ;;

test/delete.bats

@@ -23,8 +23,8 @@ setup() {
 }
 
 @test "delete virtualenv by symlink" {
-  mkdir -p "${PYENV_ROOT}/versions/2.7.10/envs/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
-  ln -fs "${PYENV_ROOT}/versions/2.7.10/envs/venv27" "${PYENV_ROOT}/versions/venv27"
+  ln -fs "${PYENV_ROOT}/versions/2.7.11/envs/venv27" "${PYENV_ROOT}/versions/venv27"
 
   stub pyenv-rehash "true"
 
@@ -34,55 +34,55 @@ setup() {
 
   unstub pyenv-rehash
 
-  [ ! -d "${PYENV_ROOT}/versions/2.7.10/envs/venv27" ]
+  [ ! -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.10/envs/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
-  ln -fs "${PYENV_ROOT}/versions/2.7.10/envs/venv27" "${PYENV_ROOT}/versions/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.10/envs/venv27"
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
 
   assert_success
 
   unstub pyenv-rehash
 
-  [ ! -d "${PYENV_ROOT}/versions/2.7.10/envs/venv27" ]
+  [ ! -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.10/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.10/envs/venv27"
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
 
   assert_success
 
   unstub pyenv-rehash
 
-  [ ! -d "${PYENV_ROOT}/versions/2.7.10/envs/venv27" ]
+  [ ! -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.10/envs/venv27"
+  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.10/envs/venv27"
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
 
   assert_success
 
   unstub pyenv-rehash
 
-  [ ! -d "${PYENV_ROOT}/versions/2.7.10/envs/venv27" ]
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
   [ -d "${PYENV_ROOT}/versions/venv27" ]
 }

test/envs.bats

@@ -19,28 +19,28 @@ unstub_pyenv() {
 }
 
 @test "path should be handled properly even if there is 'envs' in PYENV_ROOT" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
-  setup_pyvenv "3.4.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.4.1/envs/venv/bin"
+  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.4.1/envs/venv/bin/pip"
+  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/3.4.1/envs/venv
+PYENV_VERSION=3.5.1 pyvenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
-PYENV_VERSION=3.4.1/envs/venv python -s -m ensurepip
+PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
 rehashed
 OUT
-  assert [ -e "${PYENV_ROOT}/versions/3.4.1/envs/venv/bin/pip" ]
+  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.4.1"
+  teardown_pyvenv "3.5.1"
 }

test/hooks.bats

@@ -13,22 +13,22 @@ setup() {
 before_virtualenv 'echo before: \$VIRTUALENV_PATH'
 after_virtualenv 'echo after: \$STATUS'
 OUT
-  setup_version "3.2.1"
+  setup_version "3.5.1"
-  create_executable "3.2.1" "virtualenv"
+  create_executable "3.5.1" "virtualenv"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.5.1'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.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.2.1 \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=3.5.1 \"\$@\""
   stub pyenv-rehash "echo rehashed"
 
-  run pyenv-virtualenv "3.2.1" venv
+  run pyenv-virtualenv "3.5.1" venv
 
   assert_success
   assert_output <<-OUT
-before: ${PYENV_ROOT}/versions/3.2.1/envs/venv
+before: ${PYENV_ROOT}/versions/3.5.1/envs/venv
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
+PYENV_VERSION=3.5.1 virtualenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
-PYENV_VERSION=3.2.1 python -s -m ensurepip
+PYENV_VERSION=3.5.1 python -s -m ensurepip
 after: 0
 rehashed
 OUT
@@ -37,5 +37,5 @@ OUT
   unstub pyenv-hooks
   unstub pyenv-exec
   unstub pyenv-rehash
-  teardown_version "3.2.1"
+  teardown_version "3.5.1"
 }

test/init.bats

@@ -50,7 +50,7 @@ load test_helper
   run pyenv-virtualenv-init - bash
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:${PATH}";
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?
@@ -91,7 +91,7 @@ EOS
   run pyenv-virtualenv-init - zsh
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:${PATH}";
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?

test/pip.bats

@@ -21,54 +21,54 @@ unstub_pyenv() {
 }
 
 @test "install pip with ensurepip" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
-  setup_pyvenv "3.4.1"
+  setup_pyvenv "3.5.1"
   stub_pyenv "${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.4.1/envs/venv/bin"
+  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.4.1/envs/venv/bin/pip"
+  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/3.4.1/envs/venv
+PYENV_VERSION=3.5.1 pyvenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
-PYENV_VERSION=3.4.1/envs/venv python -s -m ensurepip
+PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
 rehashed
 OUT
-  assert [ -e "${PYENV_ROOT}/versions/3.4.1/envs/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.4.1"
+  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.5"
+  setup_pyvenv "3.3.6"
   stub_pyenv "${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.3.5/envs/venv/bin"
+  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.5/envs/venv/bin/pip"
+  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
 
   run pyenv-virtualenv venv
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/3.3.5/envs/venv
+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=3.3.5/envs/venv python -s ${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/3.3.5/envs/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.5"
+  teardown_pyvenv "3.3.6"
 }

test/prefix.bats

@@ -73,18 +73,18 @@ remove_conda() {
 @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.6"
+  create_virtualenv "foo" "2.7.11"
 
   PYENV_VERSION="foo" run pyenv-virtualenv-prefix
 
   assert_success
   assert_output <<OUT
-${PYENV_ROOT}/versions/2.7.6
+${PYENV_ROOT}/versions/2.7.11
 OUT
 
   unstub pyenv-version-name
   unstub pyenv-prefix
-  remove_virtualenv "foo" "2.7.6"
+  remove_virtualenv "foo" "2.7.11"
 }
 
 @test "display prefix of virtualenv created by virtualenv (pypy)" {
@@ -125,57 +125,57 @@ OUT
   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.6"
+  create_virtualenv "foo" "2.7.11"
-  create_virtualenv "bar" "3.2.1"
+  create_virtualenv "bar" "3.5.1"
 
   PYENV_VERSION="foo:bar" run pyenv-virtualenv-prefix
 
   assert_success
   assert_output <<OUT
-${PYENV_ROOT}/versions/2.7.6:${PYENV_ROOT}/versions/3.2.1
+${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.6"
+  remove_virtualenv "foo" "2.7.11"
-  remove_virtualenv "bar" "3.2.1"
+  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.3"
+  create_pyvenv "foo" "3.3.6"
 
   PYENV_VERSION="foo" run pyenv-virtualenv-prefix
 
   assert_success
   assert_output <<OUT
-${PYENV_ROOT}/versions/3.3.3
+${PYENV_ROOT}/versions/3.3.6
 OUT
 
   unstub pyenv-version-name
   unstub pyenv-prefix
-  remove_pyvenv "foo" "3.3.3"
+  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.3"
+  create_pyvenv "foo" "3.3.6"
-  create_pyvenv "bar" "3.4.0"
+  create_pyvenv "bar" "3.4.4"
 
   PYENV_VERSION="foo:bar" run pyenv-virtualenv-prefix
 
   assert_success
   assert_output <<OUT
-${PYENV_ROOT}/versions/3.3.3:${PYENV_ROOT}/versions/3.4.0
+${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.3"
+  remove_pyvenv "foo" "3.3.6"
-  remove_pyvenv "bar" "3.4.0"
+  remove_pyvenv "bar" "3.4.4"
 }
 
 @test "display prefix of virtualenv created by conda" {
@@ -209,38 +209,38 @@ OUT
 }
 
 @test "should fail if the version is not a virtualenv" {
-  stub pyenv-version-name "echo 3.4.0"
+  stub pyenv-version-name "echo 3.4.4"
-  stub pyenv-prefix "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
+  stub pyenv-prefix "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\""
-  create_version "3.4.0"
+  create_version "3.4.4"
 
-  PYENV_VERSION="3.4.0" run pyenv-virtualenv-prefix
+  PYENV_VERSION="3.4.4" run pyenv-virtualenv-prefix
 
   assert_failure
   assert_output <<OUT
-pyenv-virtualenv: version \`3.4.0' is not a virtualenv
+pyenv-virtualenv: version \`3.4.4' is not a virtualenv
 OUT
 
   unstub pyenv-version-name
   unstub pyenv-prefix
-  remove_version "3.4.0"
+  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.0"
+  stub pyenv-version-name "echo venv33:3.4.4"
   stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
-                    "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
+                    "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\""
-  create_virtualenv "venv33" "3.3.3"
+  create_virtualenv "venv33" "3.3.6"
-  create_version "3.4.0"
+  create_version "3.4.4"
 
-  PYENV_VERSION="venv33:3.4.0" run pyenv-virtualenv-prefix
+  PYENV_VERSION="venv33:3.4.4" run pyenv-virtualenv-prefix
 
   assert_failure
   assert_output <<OUT
-pyenv-virtualenv: version \`3.4.0' is not a virtualenv
+pyenv-virtualenv: version \`3.4.4' is not a virtualenv
 OUT
 
   unstub pyenv-version-name
   unstub pyenv-prefix
-  remove_virtualenv "venv33" "3.3.3"
+  remove_virtualenv "venv33" "3.3.6"
-  remove_version "3.4.0"
+  remove_version "3.4.4"
 }

test/pyvenv.bats

@@ -21,8 +21,8 @@ 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.4.1"
+  setup_pyvenv "3.5.1"
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-virtualenv-prefix " : false"
@@ -33,20 +33,20 @@ unstub_pyenv() {
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/3.4.1/envs/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.4.1"
+  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.4.1"
+  setup_pyvenv "3.5.1"
-  create_executable "3.4.1" "virtualenv"
+  create_executable "3.5.1" "virtualenv"
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-virtualenv-prefix " : false"
@@ -57,14 +57,14 @@ OUT
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/3.4.1/envs/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.4.1"
+  teardown_pyvenv "3.5.1"
 }
 
 @test "install virtualenv if pyvenv is not avaialble" {
@@ -73,32 +73,27 @@ OUT
   stub_pyenv "${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 "pip install virtualenv* : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   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 pip install virtualenv
+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
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
 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.4.1"
+  setup_pyvenv "3.5.1"
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-virtualenv-prefix " : false"
@@ -109,8 +104,8 @@ OUT
   run pyenv-virtualenv -p ${TMP}/python3 venv
 
   assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.5.1 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.4.1/envs/venv
+PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
   assert_success
@@ -118,12 +113,12 @@ OUT
   unstub_pyenv
   unstub pyenv-virtualenv-prefix
   unstub pyenv-exec
-  teardown_pyvenv "3.4.1"
+  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.4.1"
+  setup_pyvenv "3.5.1"
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-virtualenv-prefix " : false"
@@ -134,8 +129,8 @@ OUT
   run pyenv-virtualenv --python=${TMP}/python3 venv
 
   assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.5.1 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.4.1/envs/venv
+PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
   assert_success
@@ -143,7 +138,7 @@ OUT
   unstub_pyenv
   unstub pyenv-virtualenv-prefix
   unstub pyenv-exec
-  teardown_pyvenv "3.4.1"
+  teardown_pyvenv "3.5.1"
 }
 
 @test "install virtualenv with unsetting troublesome pip options" {
@@ -152,25 +147,20 @@ OUT
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   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 "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} \"\$@\""
-  stub pyenv-exec "python -s -m ensurepip : false"
-  stub pyenv-exec "python -s */get-pip.py : true"
-  stub curl true
 
   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 pip install virtualenv==13.1.2
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/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
   teardown_version "3.2.1"
 }

test/virtualenv.bats

@@ -23,7 +23,7 @@ unstub_pyenv() {
 }
 
 @test "create virtualenv from given version" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-virtualenv-prefix " : false"
   stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
@@ -31,11 +31,11 @@ unstub_pyenv() {
   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/3.2.1/envs/venv
+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
@@ -47,7 +47,7 @@ OUT
 }
 
 @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-virtualenv-prefix " : false"
@@ -60,7 +60,7 @@ OUT
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
+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
@@ -73,7 +73,7 @@ OUT
 }
 
 @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-virtualenv-prefix " : false"
@@ -85,7 +85,7 @@ OUT
   run pyenv-virtualenv -v -p ${TMP}/python venv
 
   assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/3.2.1/envs/venv
+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
@@ -99,7 +99,7 @@ OUT
 }
 
 @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-virtualenv-prefix " : false"
@@ -111,7 +111,7 @@ OUT
   run pyenv-virtualenv --verbose --python=${TMP}/python venv
 
   assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/3.2.1/envs/venv
+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
@@ -125,7 +125,7 @@ OUT
 }
 
 @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
@@ -134,7 +134,7 @@ 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
@@ -143,7 +143,7 @@ OUT
 }
 
 @test "system not allowed as virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "system"
+  run pyenv-virtualenv "2.7.11" "system"
 
   assert_failure
   assert_output <<OUT
@@ -152,7 +152,7 @@ OUT
 }
 
 @test "no slash 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
@@ -161,7 +161,7 @@ OUT
 }
 
 @test "slash allowed if it is the long name of the virtualenv" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
   stub_pyenv "${PYENV_VERSION}"
   stub pyenv-virtualenv-prefix " : false"
   stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
@@ -169,11 +169,11 @@ OUT
   stub pyenv-exec "python -s */get-pip.py : true"
   stub curl true
 
-  run pyenv-virtualenv "3.2.1" "3.2.1/envs/foo"
+  run pyenv-virtualenv "2.7.11" "2.7.11/envs/foo"
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/foo
+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