Skip to content

Commit 5c9909f

Browse files
yyuuyyuu
committed
Merge pull request #107 from yyuu/create-virtualenv-in-envs
Create virtualenv inside `envs` directory as similar as Anaconda
2 parents 459d1aa + a233491 commit 5c9909f

File tree

6 files changed

+65
-40
lines changed

6 files changed

+65
-40
lines changed

‎bin/pyenv-virtualenv

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,24 @@ if ! pyenv-prefix 1>/dev/null 2>&1; then
287287
exit 1
288288
fi
289289

290+
if pyenv-virtualenv-prefix "${VERSION_NAME}" 1>/dev/null 2>&1; then
291+
echo "pyenv-virtualenv: nested virtualenv is not supported." 1>&2
292+
exit 1
293+
fi
294+
290295
if [ -z "$TMPDIR" ]; then
291296
TMP="/tmp"
292297
else
293298
TMP="${TMPDIR%/}"
294299
fi
295300

296-
VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
301+
VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VERSION_NAME}/envs/${VIRTUALENV_NAME}"
302+
303+
COMPAT_VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
304+
if [ -e "${COMPAT_VIRTUALENV_PATH}" ] || [ -L "${COMPAT_VIRTUALENV_PATH}" ]; then
305+
echo "pyenv-virtualenv: \`${COMPAT_VIRTUALENV_PATH}' already exists." 1>&2
306+
exit 1
307+
fi
297308

298309
unset HAS_VIRTUALENV
299310
unset HAS_PYVENV
@@ -400,7 +411,7 @@ if [ -d "${VIRTUALENV_PATH}/bin" ]; then
400411
fi
401412

402413
if [ -n "$UPGRADE" ]; then
403-
PYENV_VERSION="${VIRTUALENV_NAME}" prepare_requirements
414+
PYENV_VERSION="${VERSION_NAME}/envs/${VIRTUALENV_NAME}" prepare_requirements
404415
fi
405416
fi
406417

@@ -422,11 +433,16 @@ mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
422433
cd "${PYENV_VIRTUALENV_CACHE_PATH}"
423434
venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
424435

436+
## Create symlink in the `versions` directory for backward compatibility
437+
if [ -d "${VIRTUALENV_PATH}" ]; then
438+
ln -fs "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
439+
fi
440+
425441
## Install setuptools and pip.
426-
PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
442+
PYENV_VERSION="${VERSION_NAME}/envs/${VIRTUALENV_NAME}" build_package_ensurepip
427443

428444
## Migrate previously installed packages from requirements.txt.
429-
PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
445+
PYENV_VERSION="${VERSION_NAME}/envs/${VIRTUALENV_NAME}" install_requirements || true
430446

431447
# Execute `after_virtualenv` hooks.
432448
for hook in "${after_hooks[@]}"; do eval "$hook"; done

‎test/hooks.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ OUT
2727

2828
assert_success
2929
assert_output <<-OUT
30-
before: ${PYENV_ROOT}/versions/venv
31-
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
30+
before: ${PYENV_ROOT}/versions/3.2.1/envs/venv
31+
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
3232
after: 0
3333
rehashed
3434
OUT

‎test/pip.bats

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ unstub_pyenv() {
2525
stub_pyenv "${PYENV_VERSION}"
2626
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
2727
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
28-
stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
29-
stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
28+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
29+
stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.4.1/envs/venv/bin"
30+
stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.4.1/envs/venv/bin/pip"
3031

3132
remove_executable "3.4.1" "virtualenv"
3233
create_executable "3.4.1" "pyvenv"
@@ -35,11 +36,11 @@ unstub_pyenv() {
3536

3637
assert_success
3738
assert_output <<OUT
38-
PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
39-
PYENV_VERSION=venv python -s -m ensurepip
39+
PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/3.4.1/envs/venv
40+
PYENV_VERSION=3.4.1/envs/venv python -s -m ensurepip
4041
rehashed
4142
OUT
42-
assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
43+
assert [ -e "${PYENV_ROOT}/versions/3.4.1/envs/venv/bin/pip" ]
4344

4445
unstub_pyenv
4546
unstub pyenv-exec
@@ -50,9 +51,10 @@ OUT
5051
stub_pyenv "${PYENV_VERSION}"
5152
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
5253
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
53-
stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
54+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
55+
stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.3.5/envs/venv/bin"
5456
stub pyenv-exec "python -s -m ensurepip : false"
55-
stub pyenv-exec "python -s */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
57+
stub pyenv-exec "python -s */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.3.5/envs/venv/bin/pip"
5658
stub curl true
5759

5860
remove_executable "3.3.5" "virtualenv"
@@ -62,12 +64,12 @@ OUT
6264

6365
assert_success
6466
assert_output <<OUT
65-
PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
67+
PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/3.3.5/envs/venv
6668
Installing pip from https://bootstrap.pypa.io/get-pip.py...
67-
PYENV_VERSION=venv python -s ${TMP}/pyenv/cache/get-pip.py
69+
PYENV_VERSION=3.3.5/envs/venv python -s ${TMP}/pyenv/cache/get-pip.py
6870
rehashed
6971
OUT
70-
assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
72+
assert [ -e "${PYENV_ROOT}/versions/3.3.5/envs/venv/bin/pip" ]
7173

7274
unstub_pyenv
7375
unstub pyenv-exec

‎test/python.bats

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ teardown() {
3030
create_executable "2.7.8" "python2.7"
3131
remove_executable "2.7.9" "python2.7"
3232

33-
stub pyenv-exec "virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.8/bin/python2.7 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
33+
stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
3434
stub pyenv-exec "python -s -m ensurepip : true"
3535
stub pyenv-which "python2.7 : echo ${PYENV_ROOT}/versions/2.7.8/bin/python2.7"
3636

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

3939
assert_output <<OUT
40-
PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.8/bin/python2.7 ${PYENV_ROOT}/versions/venv
40+
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
4141
OUT
4242
assert_success
4343

@@ -54,7 +54,7 @@ OUT
5454
remove_executable "2.7.8" "python2.7"
5555
create_executable "2.7.9" "python2.7"
5656

57-
stub pyenv-exec "virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.9/bin/python2.7 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
57+
stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
5858
stub pyenv-exec "python -s -m ensurepip : true"
5959
stub pyenv-which "python2.7 : false"
6060
stub pyenv-whence "python2.7 : echo 2.7.7; echo 2.7.8; echo 2.7.9"
@@ -63,7 +63,7 @@ OUT
6363
run pyenv-virtualenv --verbose --python=python2.7 venv
6464

6565
assert_output <<OUT
66-
PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.9/bin/python2.7 ${PYENV_ROOT}/versions/venv
66+
PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.9/bin/python2.7 ${PYENV_ROOT}/versions/2.7.8/envs/venv
6767
OUT
6868
assert_success
6969

‎test/pyvenv.bats

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ unstub_pyenv() {
2525
stub_pyenv "${PYENV_VERSION}"
2626
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
2727
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
28-
stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
28+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
29+
stub pyenv-exec "pyvenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
2930
stub pyenv-exec "python -s -m ensurepip : true"
3031

3132
remove_executable "3.4.1" "virtualenv"
@@ -35,7 +36,7 @@ unstub_pyenv() {
3536

3637
assert_success
3738
assert_output <<OUT
38-
PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
39+
PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/3.4.1/envs/venv
3940
rehashed
4041
OUT
4142

@@ -48,7 +49,8 @@ OUT
4849
stub_pyenv "${PYENV_VERSION}"
4950
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
5051
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
51-
stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
52+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
53+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
5254
stub pyenv-exec "python -s -m ensurepip : true"
5355

5456
create_executable "3.4.1" "virtualenv"
@@ -58,7 +60,7 @@ OUT
5860

5961
assert_success
6062
assert_output <<OUT
61-
PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
63+
PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/3.4.1/envs/venv
6264
rehashed
6365
OUT
6466

@@ -71,8 +73,9 @@ OUT
7173
stub_pyenv "${PYENV_VERSION}"
7274
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
7375
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
76+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
7477
stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
75-
stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
78+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
7679
stub pyenv-exec "python -s -m ensurepip : false"
7780
stub pyenv-exec "python -s */get-pip.py : true"
7881
stub curl true
@@ -85,7 +88,7 @@ OUT
8588
assert_success
8689
assert_output <<OUT
8790
PYENV_VERSION=3.2.1 pip install virtualenv
88-
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
91+
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
8992
Installing pip from https://bootstrap.pypa.io/get-pip.py...
9093
rehashed
9194
OUT
@@ -100,8 +103,9 @@ OUT
100103
stub_pyenv "${PYENV_VERSION}"
101104
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
102105
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
106+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
103107
stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
104-
stub pyenv-exec "virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
108+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
105109
stub pyenv-exec "python -s -m ensurepip : true"
106110

107111
remove_executable "3.4.1" "virtualenv"
@@ -111,7 +115,7 @@ OUT
111115

112116
assert_output <<OUT
113117
PYENV_VERSION=3.4.1 pip install virtualenv
114-
PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv
118+
PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.4.1/envs/venv
115119
rehashed
116120
OUT
117121
assert_success
@@ -125,8 +129,9 @@ OUT
125129
stub_pyenv "${PYENV_VERSION}"
126130
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
127131
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
132+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
128133
stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
129-
stub pyenv-exec "virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
134+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
130135
stub pyenv-exec "python -s -m ensurepip : true"
131136

132137
remove_executable "3.4.1" "virtualenv"
@@ -136,7 +141,7 @@ OUT
136141

137142
assert_output <<OUT
138143
PYENV_VERSION=3.4.1 pip install virtualenv
139-
PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv
144+
PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.4.1/envs/venv
140145
rehashed
141146
OUT
142147
assert_success
@@ -150,8 +155,9 @@ OUT
150155
stub_pyenv "${PYENV_VERSION}"
151156
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
152157
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
158+
stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
153159
stub pyenv-exec "pip install virtualenv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
154-
stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
160+
stub pyenv-exec "virtualenv * : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
155161
stub pyenv-exec "python -s -m ensurepip : false"
156162
stub pyenv-exec "python -s */get-pip.py : true"
157163
stub curl true
@@ -164,7 +170,7 @@ OUT
164170
assert_success
165171
assert_output <<OUT
166172
PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv
167-
PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
173+
PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
168174
Installing pip from https://bootstrap.pypa.io/get-pip.py...
169175
rehashed
170176
OUT

‎test/virtualenv.bats

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ stub_pyenv() {
1313
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
1414
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
1515
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
16+
stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
1617
stub pyenv-hooks "virtualenv : echo"
1718
stub pyenv-rehash " : echo rehashed"
1819
}
@@ -26,7 +27,7 @@ unstub_pyenv() {
2627
@test "create virtualenv from given version" {
2728
export PYENV_VERSION="3.2.1"
2829
stub_pyenv "${PYENV_VERSION}"
29-
stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
30+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
3031
stub pyenv-exec "python -s -m ensurepip : false"
3132
stub pyenv-exec "python -s */get-pip.py : true"
3233
stub curl true
@@ -35,7 +36,7 @@ unstub_pyenv() {
3536

3637
assert_success
3738
assert_output <<OUT
38-
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
39+
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
3940
Installing pip from https://bootstrap.pypa.io/get-pip.py...
4041
rehashed
4142
OUT
@@ -49,7 +50,7 @@ OUT
4950
export PYENV_VERSION="3.2.1"
5051
stub_pyenv "${PYENV_VERSION}"
5152
stub pyenv-version-name "echo \${PYENV_VERSION}"
52-
stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
53+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
5354
stub pyenv-exec "python -s -m ensurepip : false"
5455
stub pyenv-exec "python -s */get-pip.py : true"
5556
stub curl true
@@ -58,7 +59,7 @@ OUT
5859

5960
assert_success
6061
assert_output <<OUT
61-
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
62+
PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
6263
Installing pip from https://bootstrap.pypa.io/get-pip.py...
6364
rehashed
6465
OUT
@@ -73,15 +74,15 @@ OUT
7374
export PYENV_VERSION="3.2.1"
7475
stub_pyenv "${PYENV_VERSION}"
7576
stub pyenv-version-name "echo \${PYENV_VERSION}"
76-
stub pyenv-exec "virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
77+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
7778
stub pyenv-exec "python -s -m ensurepip : false"
7879
stub pyenv-exec "python -s */get-pip.py : true"
7980
stub curl true
8081

8182
run pyenv-virtualenv -v -p ${TMP}/python venv
8283

8384
assert_output <<OUT
84-
PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv
85+
PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/3.2.1/envs/venv
8586
Installing pip from https://bootstrap.pypa.io/get-pip.py...
8687
rehashed
8788
OUT
@@ -97,15 +98,15 @@ OUT
9798
export PYENV_VERSION="3.2.1"
9899
stub_pyenv "${PYENV_VERSION}"
99100
stub pyenv-version-name "echo \${PYENV_VERSION}"
100-
stub pyenv-exec "virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
101+
stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
101102
stub pyenv-exec "python -s -m ensurepip : false"
102103
stub pyenv-exec "python -s */get-pip.py : true"
103104
stub curl true
104105

105106
run pyenv-virtualenv --verbose --python=${TMP}/python venv
106107

107108
assert_output <<OUT
108-
PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv
109+
PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/3.2.1/envs/venv
109110
Installing pip from https://bootstrap.pypa.io/get-pip.py...
110111
rehashed
111112
OUT

0 commit comments

Comments
 (0)