Skip to content

Commit dc12a34

Browse files
author
Yamashita Yuu
committed
Workaround for the issue with pyenv-which-ext (refs #26)
1 parent 4a6ef11 commit dc12a34

File tree

6 files changed

+94
-67
lines changed

6 files changed

+94
-67
lines changed

‎bin/pyenv-virtualenv

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,12 @@ usage() {
124124
}
125125

126126
detect_venv() {
127-
if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
127+
# Check the existence of executables as a workaround for the issue with pyenv-which-ext
128+
# https://github.com/yyuu/pyenv-virtualenv/issues/26
129+
if [ -x "$(pyenv-prefix)/bin/virtualenv" ]; then
128130
HAS_VIRTUALENV=1
129131
fi
130-
if pyenv-which "pyvenv" 1>/dev/null 2>&1; then
132+
if [ -x "$(pyenv-prefix)/bin/pyvenv" ]; then
131133
HAS_PYVENV=1
132134
fi
133135
# Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given

‎test/hooks.bats

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ setup() {
1313
before_virtualenv 'echo before: \$VIRTUALENV_PATH'
1414
after_virtualenv 'echo after: \$STATUS'
1515
OUT
16-
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
17-
stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \
18-
"pyvenv : false"
16+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
17+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
18+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
1919
stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
20-
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
20+
stub pyenv-exec "echo PYENV_VERSION=3.2.1 \"\$@\""
2121
stub pyenv-rehash "echo rehashed"
2222

23-
mkdir -p "${PYENV_ROOT}/versions/3.2.1"
23+
create_executable "3.2.1" "virtualenv"
24+
remove_executable "3.2.1" "pyvenv"
25+
2426
run pyenv-virtualenv "3.2.1" venv
2527

2628
assert_success

‎test/pyvenv.bats

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ setup() {
99
stub_pyenv() {
1010
export PYENV_VERSION="$1"
1111
stub pyenv-version-name "echo \${PYENV_VERSION}"
12-
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
12+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
1313
stub pyenv-hooks "virtualenv : echo"
1414
stub pyenv-rehash " : echo rehashed"
1515
}
@@ -22,68 +22,64 @@ unstub_pyenv() {
2222
unstub pyenv-rehash
2323
}
2424

25-
create_executable() {
26-
mkdir -p "${PYENV_ROOT}/versions/$1/bin"
27-
touch "${PYENV_ROOT}/versions/$1/bin/$2"
28-
chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
29-
}
30-
31-
remove_executable() {
32-
rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
33-
34-
}
35-
3625
@test "use pyvenv if virtualenv is not available" {
37-
stub_pyenv "3.4.0"
38-
stub pyenv-which "virtualenv : false"
39-
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
26+
stub_pyenv "3.4.1"
27+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
28+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
4029
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
4130
stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip3.4\";echo PYENV_VERSION=\${PYENV_VERSION} ensurepip"
4231
stub pyenv-exec "echo 3.4"
4332

33+
remove_executable "3.4.1" "virtualenv"
34+
create_executable "3.4.1" "pyvenv"
35+
4436
run pyenv-virtualenv venv
4537

4638
assert_success
4739
assert_output <<OUT
48-
PYENV_VERSION=3.4.0 pyvenv ${PYENV_ROOT}/versions/venv
40+
PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
4941
PYENV_VERSION=venv ensurepip
5042
rehashed
5143
OUT
5244
assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
5345

5446
unstub_pyenv
55-
unstub pyenv-which
5647
unstub pyenv-exec
5748
}
5849

5950
@test "not use pyvenv if virtualenv is available" {
60-
stub_pyenv "3.4.0"
61-
stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'"
62-
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv"
51+
stub_pyenv "3.4.1"
52+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
53+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
6354
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
6455
stub pyenv-exec "echo 3.4"
6556

57+
create_executable "3.4.1" "virtualenv"
58+
create_executable "3.4.1" "pyvenv"
59+
6660
run pyenv-virtualenv venv
6761

6862
assert_success
6963
assert_output <<OUT
70-
PYENV_VERSION=3.4.0 virtualenv ${PYENV_ROOT}/versions/venv
64+
PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
7165
rehashed
7266
OUT
7367

7468
unstub_pyenv
75-
unstub pyenv-which
7669
unstub pyenv-exec
7770
}
7871

7972
@test "install virtualenv if pyvenv is not avaialble" {
8073
stub_pyenv "3.2.1"
81-
stub pyenv-which "virtualenv : false"
82-
stub pyenv-which "pyvenv : false"
74+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
75+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
8376
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
8477
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
8578
stub pyenv-exec "echo 3.2"
8679

80+
remove_executable "3.2.1" "virtualenv"
81+
remove_executable "3.2.1" "pyvenv"
82+
8783
run pyenv-virtualenv venv
8884

8985
assert_success
@@ -94,62 +90,68 @@ rehashed
9490
OUT
9591

9692
unstub_pyenv
97-
unstub pyenv-which
9893
unstub pyenv-exec
9994
}
10095

10196
@test "install virtualenv if -p has given" {
102-
stub_pyenv "3.4.0"
103-
stub pyenv-which "virtualenv : false"
104-
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
97+
stub_pyenv "3.4.1"
98+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
99+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
105100
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
106101
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
107102
stub pyenv-exec "echo 3.4"
108103

104+
remove_executable "3.4.1" "virtualenv"
105+
create_executable "3.4.1" "pyvenv"
106+
109107
run pyenv-virtualenv -p python3 venv
110108

111109
assert_success
112110
assert_output <<OUT
113-
PYENV_VERSION=3.4.0 pip install virtualenv
114-
PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
111+
PYENV_VERSION=3.4.1 pip install virtualenv
112+
PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
115113
rehashed
116114
OUT
117115

118116
unstub_pyenv
119-
unstub pyenv-which
120117
unstub pyenv-exec
121118
}
122119

123120
@test "install virtualenv if --python has given" {
124-
stub_pyenv "3.4.0"
125-
stub pyenv-which "virtualenv : false"
126-
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
121+
stub_pyenv "3.4.1"
122+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
123+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
127124
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
128125
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
129126
stub pyenv-exec "echo 3.4"
130127

128+
remove_executable "3.4.1" "virtualenv"
129+
create_executable "3.4.1" "pyvenv"
130+
131131
run pyenv-virtualenv --python=python3 venv
132132

133133
assert_success
134134
assert_output <<OUT
135-
PYENV_VERSION=3.4.0 pip install virtualenv
136-
PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
135+
PYENV_VERSION=3.4.1 pip install virtualenv
136+
PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
137137
rehashed
138138
OUT
139139

140140
unstub_pyenv
141-
unstub pyenv-which
142141
unstub pyenv-exec
143142
}
144143

145144
@test "install virtualenv with unsetting troublesome pip options" {
146145
stub_pyenv "3.2.1"
147-
stub pyenv-which "virtualenv : false"
148-
stub pyenv-which "pyvenv : false"
146+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
147+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
149148
stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
150149
stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
151150
stub pyenv-exec "echo 3.2"
152151

152+
remove_executable "3.2.1" "virtualenv"
153+
remove_executable "3.2.1" "pyvenv"
154+
153155
PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv
154156

155157
assert_success
@@ -160,14 +162,13 @@ rehashed
160162
OUT
161163

162164
unstub_pyenv
163-
unstub pyenv-which
164165
unstub pyenv-exec
165166
}
166167

167168
@test "install pip without using ensurepip" {
168-
stub_pyenv "3.3.0"
169-
stub pyenv-which "virtualenv : false"
170-
stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
169+
stub_pyenv "3.3.5"
170+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
171+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
171172
stub pyenv-which "pip : echo no pip; false"
172173
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
173174
stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false"
@@ -178,11 +179,14 @@ OUT
178179
stub curl "echo ez_setup.py"
179180
stub curl "echo get_pip.py"
180181

182+
remove_executable "3.3.5" "virtualenv"
183+
create_executable "3.3.5" "pyvenv"
184+
181185
run pyenv-virtualenv venv
182186

183187
assert_success
184188
assert_output <<OUT
185-
PYENV_VERSION=3.3.0 pyvenv ${PYENV_ROOT}/versions/venv
189+
PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
186190
PYENV_VERSION=venv no ensurepip
187191
PYENV_VERSION=venv setuptools
188192
PYENV_VERSION=venv pip

‎test/test_helper.bash

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,13 @@ assert_output_contains() {
9696
} | flunk
9797
}
9898
}
99+
100+
create_executable() {
101+
mkdir -p "${PYENV_ROOT}/versions/$1/bin"
102+
touch "${PYENV_ROOT}/versions/$1/bin/$2"
103+
chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
104+
}
105+
106+
remove_executable() {
107+
rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
108+
}

‎test/version.bats

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,36 @@ setup() {
88
}
99

1010
@test "display virtualenv version" {
11-
stub pyenv-which "virtualenv : true"
12-
stub pyenv-which "pyvenv : true"
11+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
12+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
1313
stub pyenv-exec "virtualenv --version : echo \"1.11\""
1414

15-
run pyenv-virtualenv --version
15+
create_executable "2.7.7" "virtualenv"
16+
remove_executable "2.7.7" "pyvenv"
1617

17-
unstub pyenv-which
18-
unstub pyenv-exec
18+
run pyenv-virtualenv --version
1919

2020
assert_success
2121
assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)"
22+
23+
unstub pyenv-prefix
24+
unstub pyenv-exec
2225
}
2326

2427
@test "display pyvenv version" {
25-
stub pyenv-which "virtualenv : false"
26-
stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\""
27-
stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\""
28+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
29+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
30+
stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.4.1/bin/pyvenv\""
2831
stub pyenv-root "echo \"${PYENV_ROOT}\""
2932

30-
run pyenv-virtualenv --version
33+
remove_executable "3.4.1" "virtualenv"
34+
create_executable "3.4.1" "pyvenv"
3135

32-
unstub pyenv-which
33-
unstub pyenv-root
36+
run pyenv-virtualenv --version
3437

3538
assert_success
36-
assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.3.3)"
39+
assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.4.1)"
40+
41+
unstub pyenv-prefix
42+
unstub pyenv-root
3743
}

‎test/virtualenv.bats

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@ setup() {
88

99
stub_pyenv() {
1010
export PYENV_VERSION="$1"
11-
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
12-
stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'"
13-
stub pyenv-which "pyvenv : false"
11+
12+
create_executable "${PYENV_VERSION}" "virtualenv"
13+
remove_executable "${PYENV_VERSION}" "pyvenv"
14+
15+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
16+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
17+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
1418
stub pyenv-hooks "virtualenv : echo"
1519
stub pyenv-rehash " : echo rehashed"
1620
}
1721

1822
unstub_pyenv() {
1923
unset PYENV_VERSION
2024
unstub pyenv-prefix
21-
unstub pyenv-which
2225
unstub pyenv-hooks
2326
unstub pyenv-rehash
2427
}

0 commit comments

Comments
 (0)