m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-09 12:03:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround for the issue with pyenv-which-ext (refs #26)

Browse Source
This commit is contained in:
Yamashita Yuu
2014-06-15 18:08:10 +09:00
parent 4a6ef11349
commit dc12a345d8
6 changed files with 94 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pyenv-virtualenv
View File

@@ -124,10 +124,12 @@ usage() {
} }
detect_venv() { detect_venv() {
if pyenv-which "virtualenv" 1>/dev/null 2>&1; then # Check the existence of executables as a workaround for the issue with pyenv-which-ext
# https://github.com/yyuu/pyenv-virtualenv/issues/26
if [ -x "$(pyenv-prefix)/bin/virtualenv" ]; then
HAS_VIRTUALENV=1 HAS_VIRTUALENV=1
fi fi
if pyenv-which "pyvenv" 1>/dev/null 2>&1; then if [ -x "$(pyenv-prefix)/bin/pyvenv" ]; then
HAS_PYVENV=1 HAS_PYVENV=1
fi fi
# Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given # Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given

12
test/hooks.bats
View File

@@ -13,14 +13,16 @@ setup() {
before_virtualenv 'echo before: \$VIRTUALENV_PATH' before_virtualenv 'echo before: \$VIRTUALENV_PATH'
after_virtualenv 'echo after: \$STATUS' after_virtualenv 'echo after: \$STATUS'
OUT OUT
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'" stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \ stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
"pyvenv : false" stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash" stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=3.2.1 \"\$@\""
stub pyenv-rehash "echo rehashed" stub pyenv-rehash "echo rehashed"
mkdir -p "${PYENV_ROOT}/versions/3.2.1" create_executable "3.2.1" "virtualenv"
remove_executable "3.2.1" "pyvenv"
run pyenv-virtualenv "3.2.1" venv run pyenv-virtualenv "3.2.1" venv
assert_success assert_success

92
test/pyvenv.bats
View File

@@ -9,7 +9,7 @@ setup() {
stub_pyenv() { stub_pyenv() {
export PYENV_VERSION="$1" export PYENV_VERSION="$1"
stub pyenv-version-name "echo \${PYENV_VERSION}" stub pyenv-version-name "echo \${PYENV_VERSION}"
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-hooks "virtualenv : echo" stub pyenv-hooks "virtualenv : echo"
stub pyenv-rehash " : echo rehashed" stub pyenv-rehash " : echo rehashed"
} }
@@ -22,68 +22,64 @@ unstub_pyenv() {
unstub pyenv-rehash unstub pyenv-rehash
} }
create_executable() {
mkdir -p "${PYENV_ROOT}/versions/$1/bin"
touch "${PYENV_ROOT}/versions/$1/bin/$2"
chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
}
remove_executable() {
rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
}
@test "use pyvenv if virtualenv is not available" { @test "use pyvenv if virtualenv is not available" {
stub_pyenv "3.4.0" stub_pyenv "3.4.1"
stub pyenv-which "virtualenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip3.4\";echo PYENV_VERSION=\${PYENV_VERSION} ensurepip" stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip3.4\";echo PYENV_VERSION=\${PYENV_VERSION} ensurepip"
stub pyenv-exec "echo 3.4" stub pyenv-exec "echo 3.4"
remove_executable "3.4.1" "virtualenv"
create_executable "3.4.1" "pyvenv"
run pyenv-virtualenv venv run pyenv-virtualenv venv
assert_success assert_success
assert_output <<OUT assert_output <<OUT
PYENV_VERSION=3.4.0 pyvenv ${PYENV_ROOT}/versions/venv PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
PYENV_VERSION=venv ensurepip PYENV_VERSION=venv ensurepip
rehashed rehashed
OUT OUT
assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ] assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
unstub_pyenv unstub_pyenv
unstub pyenv-which
unstub pyenv-exec unstub pyenv-exec
} }
@test "not use pyvenv if virtualenv is available" { @test "not use pyvenv if virtualenv is available" {
stub_pyenv "3.4.0" stub_pyenv "3.4.1"
stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo 3.4" stub pyenv-exec "echo 3.4"
create_executable "3.4.1" "virtualenv"
create_executable "3.4.1" "pyvenv"
run pyenv-virtualenv venv run pyenv-virtualenv venv
assert_success assert_success
assert_output <<OUT assert_output <<OUT
PYENV_VERSION=3.4.0 virtualenv ${PYENV_ROOT}/versions/venv PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
rehashed rehashed
OUT OUT
unstub_pyenv unstub_pyenv
unstub pyenv-which
unstub pyenv-exec unstub pyenv-exec
} }
@test "install virtualenv if pyvenv is not avaialble" { @test "install virtualenv if pyvenv is not avaialble" {
stub_pyenv "3.2.1" stub_pyenv "3.2.1"
stub pyenv-which "virtualenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pyvenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo 3.2" stub pyenv-exec "echo 3.2"
remove_executable "3.2.1" "virtualenv"
remove_executable "3.2.1" "pyvenv"
run pyenv-virtualenv venv run pyenv-virtualenv venv
assert_success assert_success
@@ -94,62 +90,68 @@ rehashed
OUT OUT
unstub_pyenv unstub_pyenv
unstub pyenv-which
unstub pyenv-exec unstub pyenv-exec
} }
@test "install virtualenv if -p has given" { @test "install virtualenv if -p has given" {
stub_pyenv "3.4.0" stub_pyenv "3.4.1"
stub pyenv-which "virtualenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo 3.4" stub pyenv-exec "echo 3.4"
remove_executable "3.4.1" "virtualenv"
create_executable "3.4.1" "pyvenv"
run pyenv-virtualenv -p python3 venv run pyenv-virtualenv -p python3 venv
assert_success assert_success
assert_output <<OUT assert_output <<OUT
PYENV_VERSION=3.4.0 pip install virtualenv PYENV_VERSION=3.4.1 pip install virtualenv
PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
rehashed rehashed
OUT OUT
unstub_pyenv unstub_pyenv
unstub pyenv-which
unstub pyenv-exec unstub pyenv-exec
} }
@test "install virtualenv if --python has given" { @test "install virtualenv if --python has given" {
stub_pyenv "3.4.0" stub_pyenv "3.4.1"
stub pyenv-which "virtualenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo 3.4" stub pyenv-exec "echo 3.4"
remove_executable "3.4.1" "virtualenv"
create_executable "3.4.1" "pyvenv"
run pyenv-virtualenv --python=python3 venv run pyenv-virtualenv --python=python3 venv
assert_success assert_success
assert_output <<OUT assert_output <<OUT
PYENV_VERSION=3.4.0 pip install virtualenv PYENV_VERSION=3.4.1 pip install virtualenv
PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
rehashed rehashed
OUT OUT
unstub_pyenv unstub_pyenv
unstub pyenv-which
unstub pyenv-exec unstub pyenv-exec
} }
@test "install virtualenv with unsetting troublesome pip options" { @test "install virtualenv with unsetting troublesome pip options" {
stub_pyenv "3.2.1" stub_pyenv "3.2.1"
stub pyenv-which "virtualenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pyvenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo 3.2" stub pyenv-exec "echo 3.2"
remove_executable "3.2.1" "virtualenv"
remove_executable "3.2.1" "pyvenv"
PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv
assert_success assert_success
@@ -160,14 +162,13 @@ rehashed
OUT OUT
unstub_pyenv unstub_pyenv
unstub pyenv-which
unstub pyenv-exec unstub pyenv-exec
} }
@test "install pip without using ensurepip" { @test "install pip without using ensurepip" {
stub_pyenv "3.3.0" stub_pyenv "3.3.5"
stub pyenv-which "virtualenv : false" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'" stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-which "pip : echo no pip; false" stub pyenv-which "pip : echo no pip; false"
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false" stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false"
@@ -178,11 +179,14 @@ OUT
stub curl "echo ez_setup.py" stub curl "echo ez_setup.py"
stub curl "echo get_pip.py" stub curl "echo get_pip.py"
remove_executable "3.3.5" "virtualenv"
create_executable "3.3.5" "pyvenv"
run pyenv-virtualenv venv run pyenv-virtualenv venv
assert_success assert_success
assert_output <<OUT assert_output <<OUT
PYENV_VERSION=3.3.0 pyvenv ${PYENV_ROOT}/versions/venv PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
PYENV_VERSION=venv no ensurepip PYENV_VERSION=venv no ensurepip
PYENV_VERSION=venv setuptools PYENV_VERSION=venv setuptools
PYENV_VERSION=venv pip PYENV_VERSION=venv pip

10
test/test_helper.bash
View File

@@ -96,3 +96,13 @@ assert_output_contains() {
} | flunk } | flunk
} }
} }
create_executable() {
mkdir -p "${PYENV_ROOT}/versions/$1/bin"
touch "${PYENV_ROOT}/versions/$1/bin/$2"
chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
}
remove_executable() {
rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
}

30
test/version.bats
View File

@@ -8,30 +8,36 @@ setup() {
} }
@test "display virtualenv version" { @test "display virtualenv version" {
stub pyenv-which "virtualenv : true" stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
stub pyenv-which "pyvenv : true" stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
stub pyenv-exec "virtualenv --version : echo \"1.11\"" stub pyenv-exec "virtualenv --version : echo \"1.11\""
run pyenv-virtualenv --version create_executable "2.7.7" "virtualenv"
remove_executable "2.7.7" "pyvenv"
unstub pyenv-which run pyenv-virtualenv --version
unstub pyenv-exec
assert_success assert_success
assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)" assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)"
unstub pyenv-prefix
unstub pyenv-exec
} }
@test "display pyvenv version" { @test "display pyvenv version" {
stub pyenv-which "virtualenv : false" stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\"" stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\"" stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.4.1/bin/pyvenv\""
stub pyenv-root "echo \"${PYENV_ROOT}\"" stub pyenv-root "echo \"${PYENV_ROOT}\""
remove_executable "3.4.1" "virtualenv"
create_executable "3.4.1" "pyvenv"
run pyenv-virtualenv --version run pyenv-virtualenv --version
unstub pyenv-which
unstub pyenv-root
assert_success assert_success
assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.3.3)" assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.4.1)"
unstub pyenv-prefix
unstub pyenv-root
} }

11
test/virtualenv.bats
View File

@@ -8,9 +8,13 @@ setup() {
stub_pyenv() { stub_pyenv() {
export PYENV_VERSION="$1" export PYENV_VERSION="$1"
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" create_executable "${PYENV_VERSION}" "virtualenv"
stub pyenv-which "pyvenv : false" remove_executable "${PYENV_VERSION}" "pyvenv"
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
stub pyenv-hooks "virtualenv : echo" stub pyenv-hooks "virtualenv : echo"
stub pyenv-rehash " : echo rehashed" stub pyenv-rehash " : echo rehashed"
} }
@@ -18,7 +22,6 @@ stub_pyenv() {
unstub_pyenv() { unstub_pyenv() {
unset PYENV_VERSION unset PYENV_VERSION
unstub pyenv-prefix unstub pyenv-prefix
unstub pyenv-which
unstub pyenv-hooks unstub pyenv-hooks
unstub pyenv-rehash unstub pyenv-rehash
} }