Merge 5d7894d189 into aa9b8e9a5a

Signed-off-by: JasonnnW3000 <sufssl04@gmail.com>

.github/workflows/tests.yml

@@ -8,8 +8,8 @@ jobs:
         os:
           - ubuntu-22.04
           - ubuntu-20.04
-          - macos-12
-          - macos-11
+          - macos-14
+          - macos-13
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Version History
 
+#### 1.2.4
+* Fix failing to detect `-m venv` when "python" is not provided by the distro by @native-api in https://github.com/pyenv/pyenv-virtualenv/pull/479
+* README: Remove dollar signs from commands that are meant to be copied by @galonsky in https://github.com/pyenv/pyenv-virtualenv/pull/481
+* Reflect pyenv-latest switch change in 2.4.8 by @native-api in https://github.com/pyenv/pyenv-virtualenv/pull/484
+
 #### 1.2.3
 * Fix: add `colorize` helper by @silverjam in https://github.com/pyenv/pyenv-virtualenv/pull/470
 * Bump pyenv-virtualenv reporting version to match release by @ushuz in https://github.com/pyenv/pyenv-virtualenv/pull/471

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Yamashita, Yuu
+Copyright (c) 2025 Yamashita, Yuu
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -30,25 +30,25 @@ From inside that directory you can:
 
 1. **Check out pyenv-virtualenv into plugin directory**
 
-    ```sh
-    $ git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
+    ```bash
+    git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
     ```
 
     For the Fish shell:
 
-    ```sh
-    $ git clone https://github.com/pyenv/pyenv-virtualenv.git (pyenv root)/plugins/pyenv-virtualenv
+    ```fish
+    git clone https://github.com/pyenv/pyenv-virtualenv.git (pyenv root)/plugins/pyenv-virtualenv
     ```
 
 2. (OPTIONAL) **Add `pyenv virtualenv-init` to your shell** to enable auto-activation of virtualenvs. This is entirely optional but pretty useful. See "Activate virtualenv" below.
 
-    ```sh
-    $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc
+    ```bash
+    echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc
     ```
 
     **Fish shell note**:  Add this to your `~/.config/fish/config.fish`
 
-    ```sh
+    ```fish
     status --is-interactive; and pyenv virtualenv-init - | source
     ```
 
@@ -56,8 +56,8 @@ From inside that directory you can:
     
 3. **Restart your shell to enable pyenv-virtualenv**
 
-    ```sh
-    $ exec "$SHELL"
+    ```bash
+    exec "$SHELL"
     ```
 
 
@@ -72,13 +72,13 @@ installed, you will also be able to use the `pyenv virtualenv` command.
  with Homebrew.*
 
 ```sh
-$ brew install pyenv-virtualenv
+brew install pyenv-virtualenv
 ```
 
 Or, if you would like to install the latest development release:
 
 ```sh
-$ brew install --HEAD pyenv-virtualenv
+brew install --HEAD pyenv-virtualenv
 ```
 
 After installation, you'll still need to do
@@ -99,7 +99,7 @@ To create a virtualenv for the Python version used with pyenv, run
 of the virtualenv directory. For example,
 
 ```sh
-$ pyenv virtualenv 2.7.10 my-virtual-env-2.7.10
+pyenv virtualenv 2.7.10 my-virtual-env-2.7.10
 ```
 
 will create a virtualenv based on Python 2.7.10 under `$(pyenv root)/versions` in a
@@ -243,6 +243,7 @@ You can set certain environment variables to control pyenv-virtualenv.
 * `PIP_VERSION`, if set and `venv` is preferred
   over `virtualenv`, install the specified version of pip.
 * `PYENV_VIRTUALENV_VERBOSE_ACTIVATE`, if set, shows some verbose outputs on activation and deactivation
+* `PYENV_VIRTUALENV_PROMPT`, if set, allows users to customize how `pyenv-virtualenv` modifies their shell prompt. The default prompt ("(venv)") is overwritten with any user-specified text. Specify the location of the virtual environment name with the string `{venv}`. For example, the default prompt string would be `({venv})`.
 
 ## Version History
 

bin/pyenv-activate

@@ -22,10 +22,8 @@ fi
 
 { printf "\x1B[31;1m"
   echo
-  echo "Failed to activate virtualenv."
-  echo
-  echo "Perhaps pyenv-virtualenv has not been loaded into your shell properly."
-  echo "Please restart current shell and try again."
+  echo "\`pyenv activate' requires Pyenv and Pyenv-Virtualenv to be loaded into your shell."
+  echo "Check your shell configuration and Pyenv and Pyenv-Virtualenv installation instructions."
   echo
   printf "\x1B[0m"
 } 1>&2

bin/pyenv-deactivate

@@ -11,10 +11,8 @@ set -e
 
 { printf "\x1B[31;1m"
   echo
-  echo "Failed to deactivate virtualenv."
-  echo
-  echo "Perhaps pyenv-virtualenv has not been loaded into your shell properly."
-  echo "Please restart current shell and try again."
+  echo "\`pyenv deactivate' requires Pyenv and Pyenv-Virtualenv to be loaded into your shell."
+  echo "Check your shell configuration and Pyenv and Pyenv-Virtualenv installation instructions."
   echo
   printf "\x1B[0m"
 } 1>&2

bin/pyenv-sh-activate

@@ -262,9 +262,14 @@ EOS
     fi
     ;;
   * )
+    if [ -z "${PYENV_VIRTUALENV_PROMPT}" ]; then
+      PYENV_VIRTUALENV_PROMPT="(${venv})"
+    else
+      PYENV_VIRTUALENV_PROMPT="${PYENV_VIRTUALENV_PROMPT/\{venv\}/${venv}}"
+    fi
     cat <<EOS
 export _OLD_VIRTUAL_PS1="\${PS1:-}";
-export PS1="(${venv}) \${PS1:-}";
+export PS1="${PYENV_VIRTUALENV_PROMPT} \${PS1:-}";
 EOS
     ;;
   esac

bin/pyenv-virtualenv

@@ -13,7 +13,7 @@
 #   -u/--upgrade     Imply --force
 #
 
-PYENV_VIRTUALENV_VERSION="1.2.3"
+PYENV_VIRTUALENV_VERSION="1.2.4"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -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}"
@@ -317,7 +325,7 @@ else
 fi
 
 if [[ -n "${VERSION_NAME}" ]] && command -v pyenv-latest >/dev/null; then
-  VERSION_NAME="$(pyenv-latest -q "${VERSION_NAME}" || echo "${VERSION_NAME}")"
+  VERSION_NAME="$(pyenv-latest -f "${VERSION_NAME}")"
 fi
 
 if [ -z "${VERSION_NAME}" ] || [ -z "${VIRTUALENV_NAME}" ]; then
@@ -597,7 +605,13 @@ STATUS=0
 mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
 if [ -n "${USE_CONDA}" ]; then
-  pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" python || STATUS="$?"
+  if [ -z "$VIRTUALENV_PYTHON" ]; then
+    #process substitution doesn't seem to work unless it's directly inserted to the command line
+    #if we add it to VIRTUALENV_OPTIONS instead, "broken pipe" happens
+    pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" --file <(pyenv-exec conda list python --full-name --export) || STATUS="$?"
+  else
+    pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" || STATUS="$?"
+  fi
 else
   if [ -n "${USE_M_VENV}" ]; then
     pyenv-exec "${M_VENV_PYTHON_BIN:-python}" -m venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
@@ -617,7 +631,8 @@ fi
 
 ## Create symlink in the `versions` directory for backward compatibility
 if [ -d "${VIRTUALENV_PATH}" ] && [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
-  ln -fs "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
+  # Overwrite an existing link, can happen if running with -f
+  ln -fsn "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
 fi
 
 if [ ! -e "${VIRTUALENV_PATH}/bin/pydoc" ]; then

bin/pyenv-virtualenv-init

@@ -95,8 +95,10 @@ EOS
   ;;
 * )
   cat <<EOS
-export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims"* ]]; then
+  export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 EOS
   ;;
 esac

test/activate.bats

@@ -15,6 +15,7 @@ setup() {
   unset PYENV_VIRTUALENV_DISABLE_PROMPT
   unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
   unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset PYENV_VIRTUALENV_PROMPT
   unset _OLD_VIRTUAL_PS1
   stub pyenv-hooks "activate : echo"
 }
@@ -44,6 +45,31 @@ EOS
   unstub pyenv-sh-deactivate
 }
 
+@test "activate virtualenv from current version with custom prompt" {
+  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-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="bash" PYENV_VERSION="venv" PYENV_VIRTUALENV_PROMPT='venv:{venv}' run pyenv-sh-activate
+
+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export _OLD_VIRTUAL_PS1="\${PS1:-}";
+export PS1="venv:venv \${PS1:-}";
+EOS
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+}
+
 @test "activate virtualenv from current version (quiet)" {
   export PYENV_VIRTUALENV_INIT=1
 

test/conda-activate.bats

@@ -16,6 +16,7 @@ setup() {
   unset PYENV_VIRTUALENV_DISABLE_PROMPT
   unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
   unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset PYENV_VIRTUALENV_PROMPT
   unset _OLD_VIRTUAL_PS1
   stub pyenv-hooks "activate : echo"
 }
@@ -53,6 +54,35 @@ EOS
   teardown_conda "anaconda-2.3.0"
 }
 
+@test "activate conda root from current version with custom prompt" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  setup_conda "anaconda-2.3.0"
+  stub pyenv-version-name "echo anaconda-2.3.0"
+  stub pyenv-virtualenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" PYENV_VIRTUALENV_PROMPT='venv:{venv}' run pyenv-sh-activate
+
+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
+export CONDA_DEFAULT_ENV="root";
+export _OLD_VIRTUAL_PS1="\${PS1:-}";
+export PS1="venv:anaconda-2.3.0 \${PS1:-}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0";
+EOS
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0"
+}
+
 @test "activate conda root from current version (fish)" {
   export PYENV_VIRTUALENV_INIT=1
 

test/conda.bats

@@ -32,8 +32,8 @@ unstub_pyenv() {
   run pyenv-virtualenv venv
 
   assert_success
-  assert_output <<OUT
-PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python
+  assert_output_wildcards <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes --file /dev/fd/*
 rehashed
 OUT
 
@@ -56,7 +56,7 @@ OUT
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5
 rehashed
 OUT
 
@@ -79,7 +79,7 @@ OUT
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5
 rehashed
 OUT
 

test/deactivate.bats

@@ -1,4 +1,4 @@
- #!/usr/bin/env bats
+#!/usr/bin/env bats
 
 load test_helper
 

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

test/hooks.bats

@@ -6,6 +6,7 @@ setup() {
   export PYENV_ROOT="${TMP}/pyenv"
   export HOOK_PATH="${TMP}/i has hooks"
   mkdir -p "$HOOK_PATH"
+  unset PYENV_VIRTUALENV_PROMPT
 }
 
 @test "pyenv-virtualenv hooks" {
@@ -17,7 +18,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 \"\$@\""

test/init.bats

@@ -50,8 +50,10 @@ load test_helper
   run pyenv-virtualenv-init - bash
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${TMP}/pyenv/plugins/pyenv-virtualenv/shims"* ]]; then
+  export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\${VIRTUAL_ENV-}" ]; then
@@ -93,8 +95,10 @@ EOS
   run pyenv-virtualenv-init - zsh
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${TMP}/pyenv/plugins/pyenv-virtualenv/shims"* ]]; then
+  export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\${VIRTUAL_ENV-}" ]; then

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

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
-}
+}

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} \"\$@\""

test/test_helper.bash

@@ -83,6 +83,16 @@ assert_equal() {
   fi
 }
 
+assert_equal_wildcards() {
+  if [[ $1 != $2 ]]; then
+    { echo "expected:"
+      echo "$2"
+      echo "actual:"
+      echo "$1"
+    } | flunk
+  fi
+}
+
 assert_output() {
   local expected
   if [ $# -eq 0 ]; then expected="$(cat -)"
@@ -91,6 +101,14 @@ assert_output() {
   assert_equal "$expected" "$output"
 }
 
+assert_output_wildcards() {
+  local expected
+  if [ $# -eq 0 ]; then expected="$(cat -)"
+  else expected="$1"
+  fi
+  assert_equal_wildcards "$output" "$expected"
+}
+
 assert_output_contains() {
   local expected="$1"
   echo "$output" | grep -F "$expected" >/dev/null || {
@@ -171,3 +189,4 @@ setup_conda() {
 teardown_conda() {
   rm -fr "${PYENV_ROOT}/versions/$1"
 }
+

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"

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,14 +56,12 @@ 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"
   stub pyenv-exec "python -s */get-pip.py : true"
   stub curl true
-  stub pyenv-latest "-q 2.7 : echo 2.7.11"
+  stub pyenv-latest "-f 2.7 : echo 2.7.11"
 
   run pyenv-virtualenv "2.7" "venv"
 
@@ -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"