Fix failing to detect -m venv when "python" is not provided by the distro (#479)

2025-11-08 11:33:55 -05:00 · 2024-04-10 00:14:13 +03:00
parent b90bd92853
commit 37917069ec
9 changed files with 32 additions and 44 deletions
--- a/bin/pyenv-virtualenv
+++ b/bin/pyenv-virtualenv
@@ -155,9 +155,17 @@ detect_venv() {
    if [ -x "${prefix}/bin/virtualenv" ]; then
      HAS_VIRTUALENV=1
    fi
-    # Prefer `python3.x` executable if available (#206, #282)
    local python
-    for python in "python${PYENV_VERSION%.*}" "python${PYENV_VERSION%%.*}" "python"; do
+    local -a pythons
+    if [[ $PYENV_VERSION == "system" ]]; then
+      # Prefer `python3.x` executable if available (#206, #282)
+      pythons=("python3" "python" "python2")
+    else
+      # as per PEP 394, custom activated Python environments should provide the "python" command
+      # this includes Pyenv-provided installations
+      pythons=("python")
+    fi
+    for python in "${pythons[@]}"; do
      if pyenv-exec "${python}" -m venv --help 1>/dev/null 2>&1; then
        HAS_M_VENV=1
        M_VENV_PYTHON_BIN="${python}"
--- a/test/envs.bats
+++ b/test/envs.bats
@@ -25,15 +25,15 @@ unstub_pyenv() {
  stub pyenv-version-name "echo '${PYENV_VERSION}'"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.5 -m venv --help : true"
-  stub pyenv-exec "python3.5 -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
  stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip"

  run pyenv-virtualenv venv

  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.5.1 python3.5 -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1 python -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
 rehashed
 OUT
--- a/test/hooks.bats
+++ b/test/hooks.bats
@@ -17,7 +17,7 @@ OUT
  create_executable "3.5.1" "virtualenv"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.5.1'"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.5.1'"
-  stub pyenv-exec "python3.5 -m venv --help : true"
+  stub pyenv-exec "python -m venv --help : true"
  stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
  stub pyenv-exec "echo PYENV_VERSION=3.5.1 \"\$@\""
  stub pyenv-exec "echo PYENV_VERSION=3.5.1 \"\$@\""
--- a/test/pip.bats
+++ b/test/pip.bats
@@ -26,15 +26,16 @@ unstub_pyenv() {
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.5 -m venv --help : true"
-  stub pyenv-exec "python3.5 -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
  stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip"

  run pyenv-virtualenv venv

  assert_success
+
  assert_output <<OUT
-PYENV_VERSION=3.5.1 python3.5 -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1 python -m venv ${TMP}/pyenv/versions/3.5.1/envs/venv
 PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
 rehashed
 OUT
@@ -52,8 +53,8 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.3 -m venv --help : true"
-  stub pyenv-exec "python3.3 -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.3.6/envs/venv/bin"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.3.6/envs/venv/bin"
  stub pyenv-exec "python -s -m ensurepip : false"
  stub pyenv-exec "python -s */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.3.6/envs/venv/bin/pip"
  stub curl true
@@ -62,7 +63,7 @@ OUT

  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.3.6 python3.3 -m venv ${PYENV_ROOT}/versions/3.3.6/envs/venv
+PYENV_VERSION=3.3.6 python -m venv ${PYENV_ROOT}/versions/3.3.6/envs/venv
 Installing pip from https://bootstrap.pypa.io/pip/3.3/get-pip.py...
 PYENV_VERSION=3.3.6/envs/venv python -s ${TMP}/pyenv/cache/get-pip.py
 rehashed
--- a/test/python.bats
+++ b/test/python.bats
@@ -33,8 +33,6 @@ teardown() {
  create_executable "2.7.8" "python2.7"
  remove_executable "2.7.9" "python2.7"

-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"
@@ -42,13 +40,13 @@ teardown() {

  run pyenv-virtualenv --verbose --python=python2.7 venv

+  unstub pyenv-exec
  assert_output <<OUT
 PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.8/bin/python2.7 ${PYENV_ROOT}/versions/2.7.8/envs/venv
 OUT
  assert_success

  unstub pyenv-which
-  unstub pyenv-exec

  remove_executable "2.7.7" "python2.7"
  remove_executable "2.7.8" "python2.7"
@@ -60,8 +58,6 @@ OUT
  remove_executable "2.7.8" "python2.7"
  create_executable "2.7.9" "python2.7"

-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"
@@ -118,4 +114,4 @@ pyenv-virtualenv: \`99.99.99' is not installed in pyenv.
 It does not look like a valid Python version. See \`pyenv install --list' for available versions.
 OUT
  assert_failure
-}
+}
--- a/test/pyvenv.bats
+++ b/test/pyvenv.bats
@@ -26,14 +26,14 @@ unstub_pyenv() {
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.5 -m venv --help : true"
-  stub pyenv-exec "python3.5 -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"

  run pyenv-virtualenv venv

  assert_output <<OUT
-PYENV_VERSION=3.5.1 python3.5 -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1 python -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
@@ -52,7 +52,7 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.5 -m venv --help : true"
+  stub pyenv-exec "python -m venv --help : true"
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"

@@ -77,8 +77,6 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.2 -m venv --help : false"
-  stub pyenv-exec "python3 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "pip install virtualenv* : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
@@ -105,7 +103,7 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.5 -m venv --help : true"
+  stub pyenv-exec "python -m venv --help : true"
  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 : true"
@@ -132,7 +130,7 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.5 -m venv --help : true"
+  stub pyenv-exec "python -m venv --help : true"
  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 : true"
@@ -159,8 +157,6 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python3.2 -m venv --help : false"
-  stub pyenv-exec "python3 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "pip install virtualenv* : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "virtualenv * : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -171,3 +171,4 @@ setup_conda() {
 teardown_conda() {
  rm -fr "${PYENV_ROOT}/versions/$1"
 }
+
--- a/test/version.bats
+++ b/test/version.bats
@@ -10,8 +10,6 @@ setup() {
  setup_virtualenv "2.7.7"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
  stub pyenv-version-name "echo 2.7.7"
-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv --version : echo \"1.11\""

@@ -29,12 +27,12 @@ setup() {
  setup_m_venv "3.4.1"
  stub pyenv-version-name "echo 3.4.1"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
-  stub pyenv-exec "python3.4 -m venv --help : true"
+  stub pyenv-exec "python -m venv --help : true"

  run pyenv-virtualenv --version

  assert_success
-  [[ "$output" == "pyenv-virtualenv "?.?.?" (python3.4 -m venv)" ]]
+  [[ "$output" == "pyenv-virtualenv "?.?.?" (python -m venv)" ]]

  unstub pyenv-prefix
  teardown_m_venv "3.4.1"
--- a/test/virtualenv.bats
+++ b/test/virtualenv.bats
@@ -26,8 +26,6 @@ unstub_pyenv() {
  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"; mkdir -p \"\$2/bin\""
  stub pyenv-exec "python -s -m ensurepip : false"
@@ -58,8 +56,6 @@ OUT
@test "create virtualenv from a given prefix" {
  stub_pyenv "2.7.11"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
@@ -89,8 +85,6 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-version-name "echo \${PYENV_VERSION}"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
@@ -119,8 +113,6 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-version-name "echo \${PYENV_VERSION}"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
@@ -149,8 +141,6 @@ OUT
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-version-name "echo \${PYENV_VERSION}"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
@@ -214,8 +204,6 @@ OUT
  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-virtualenv-prefix " : false"
-  stub pyenv-exec "python2.7 -m venv --help : false"
-  stub pyenv-exec "python2 -m venv --help : false"
  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"