Merge branch 'detect-virtualenv-prefix-without-executing-python'

bin/pyenv-virtualenv-prefix

@@ -19,17 +19,6 @@ else
   IFS=: versions=($(pyenv-version-name))
 fi
 
-real_prefix() { # virtualenv
-  local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.real_prefix)' 2>/dev/null
-}
-
-base_prefix() { # pyvenv
-  # FIXME: non-pyvenv versions also have sys.base_prefix
-  local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.base_prefix)' 2>/dev/null
-}
-
 VIRTUALENV_PREFIX_PATHS=()
 for version in "${versions[@]}"; do
   if [ "$version" = "system" ]; then
@@ -39,8 +28,27 @@ for version in "${versions[@]}"; do
   PYENV_PREFIX_PATH="$(pyenv-prefix "${version}")"
   if [ -x "${PYENV_PREFIX_PATH}/bin/python" ]; then
     if [ -f "${PYENV_PREFIX_PATH}/bin/activate" ]; then
-      VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
-      VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${VIRTUALENV_PREFIX_PATH:-${PYENV_PREFIX_PATH}}")
+      if [ -f "${PYENV_PREFIX_PATH}/bin/conda" ]; then
+        # conda
+        VIRTUALENV_PREFIX_PATH="${PYENV_PREFIX_PATH}"
+      else
+        if [ -f "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" ]; then
+          # pyvenv
+          virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
+          VIRTUALENV_PREFIX_PATH="${virtualenv_binpath%/bin}"
+        else
+          # virtualenv
+          shopt -s nullglob
+          VIRTUALENV_PREFIX_PATH="$(cat "${PYENV_ROOT}/versions/${version}/lib/"*"/orig-prefix.txt" </dev/null 2>&1 || true)"
+          shopt -u nullglob
+        fi
+      fi
+      if [ -d "${VIRTUALENV_PREFIX_PATH}" ]; then
+        VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${VIRTUALENV_PREFIX_PATH:-${PYENV_PREFIX_PATH}}")
+      else
+        echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+        exit 1
+      fi
     else
       echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
       exit 1

test/prefix.bats

@@ -17,99 +17,112 @@ remove_version() {
 }
 
 create_virtualenv() {
-  create_version "$@"
+  create_version "$1"
+  create_version "${2:-$1}"
+  mkdir -p "${PYENV_ROOT}/versions/$1/lib/python${2:-$1}"
+  echo "${PYENV_ROOT}/versions/${2:-$1}" > "${PYENV_ROOT}/versions/$1/lib/python${2:-$1}/orig-prefix.txt"
   touch "${PYENV_ROOT}/versions/$1/bin/activate"
 }
 
 remove_virtualenv() {
-  remove_version "$@"
+  remove_version "$1"
+  remove_version "${2:-$1}"
+}
+
+create_pyvenv() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  echo "home = ${PYENV_ROOT}/versions/${2:-$1}/bin" > "${PYENV_ROOT}/versions/$1/pyvenv.cfg"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+remove_pyvenv() {
+  remove_version "${2:-$1}"
+}
+
+create_conda() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  touch "${PYENV_ROOT}/versions/$1/bin/conda"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+remove_conda() {
+  remove_version "${2:-$1}"
 }
 
 @test "display prefix with using sys.real_prefix" {
   stub pyenv-version-name "echo venv27"
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\""
-  create_virtualenv "venv27"
+  create_virtualenv "venv27" "2.7.6"
 
   PYENV_VERSION="venv27" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv27"
-
   assert_success
   assert_output <<OUT
 ${PYENV_ROOT}/versions/2.7.6
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "venv27" "2.7.6"
 }
 
 @test "display prefixes with using sys.real_prefix" {
   stub pyenv-version-name "echo venv27:venv32"
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\"" \
                     "venv32 : echo \"${PYENV_ROOT}/versions/venv32\""
-  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\"" \
-                  "echo \"${PYENV_ROOT}/versions/3.2.1\""
-  create_virtualenv "venv27"
-  create_virtualenv "venv32"
+  create_virtualenv "venv27" "2.7.6"
+  create_virtualenv "venv32" "3.2.1"
 
   PYENV_VERSION="venv27:venv32" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv27"
-  remove_virtualenv "venv32"
-
   assert_success
   assert_output <<OUT
 ${PYENV_ROOT}/versions/2.7.6:${PYENV_ROOT}/versions/3.2.1
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "venv27" "2.7.6"
+  remove_virtualenv "venv32" "3.2.1"
 }
 
 @test "display prefix with using sys.base_prefix" {
   stub pyenv-version-name "echo venv33"
   stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
-  create_virtualenv "venv33"
+  create_virtualenv "venv33" "3.3.3"
 
   PYENV_VERSION="venv33" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-
   assert_success
   assert_output <<OUT
 ${PYENV_ROOT}/versions/3.3.3
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "venv33" "3.3.3"
 }
 
 @test "display prefixes with using sys.base_prefix" {
   stub pyenv-version-name "echo venv33:venv34"
   stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
                     "venv34 : echo \"${PYENV_ROOT}/versions/venv34\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\"" \
-                  "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.4.0\""
-  create_virtualenv "venv33"
-  create_virtualenv "venv34"
+  create_virtualenv "venv33" "3.3.3"
+  create_virtualenv "venv34" "3.4.0"
 
   PYENV_VERSION="venv33:venv34" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-  remove_virtualenv "venv34"
-
   assert_success
   assert_output <<OUT
 ${PYENV_ROOT}/versions/3.3.3:${PYENV_ROOT}/versions/3.4.0
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "venv33" "3.3.3"
+  remove_virtualenv "venv34" "3.4.0"
 }
 
 @test "should fail if the version is the system" {
@@ -117,12 +130,12 @@ OUT
 
   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
+
+  unstub pyenv-version-name
 }
 
 @test "should fail if the version is not a virtualenv" {
@@ -132,37 +145,32 @@ OUT
 
   PYENV_VERSION="3.4.0" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  remove_version "3.4.0"
-
   assert_failure
   assert_output <<OUT
 pyenv-virtualenv: version \`3.4.0' is not a virtualenv
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_version "3.4.0"
 }
 
 @test "should fail if one of the versions is not a virtualenv" {
   stub pyenv-version-name "echo venv33:3.4.0"
   stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
                     "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
-  create_virtualenv "venv33"
+  create_virtualenv "venv33" "3.3.3"
   create_version "3.4.0"
 
   PYENV_VERSION="venv33:3.4.0" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-  remove_version "3.4.0"
-
   assert_failure
   assert_output <<OUT
 pyenv-virtualenv: version \`3.4.0' is not a virtualenv
 OUT
-}
-
 
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "venv33" "3.3.3"
+  remove_version "3.4.0"
+}