Allow specifying python version for conda via -p or --python

This commit is contained in:
Yamashita, Yuu
2015-11-27 04:41:00 +00:00
parent bad8dcf768
commit 789c349570

View File

@@ -365,7 +365,14 @@ if [ -n "$UPGRADE" ]; then
fi fi
if [ -n "${USE_CONDA}" ]; then if [ -n "${USE_CONDA}" ]; then
: # e.g. `conda create -n py35 python=3.5 anaconda`
if [ -n "${VIRTUALENV_PYTHON}" ]; then
VIRTUALENV_PYTHON="${VIRTUALENV_PYTHON##*/}"
VIRTUALENV_PYTHON="${VIRTUALENV_PYTHON#python}"
if [ -n "${VIRTUALENV_PYTHON}" ]; then
VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="python=${VIRTUALENV_PYTHON}"
fi
fi
else else
if [ -n "${USE_PYVENV}" ]; then if [ -n "${USE_PYVENV}" ]; then
# Unset some arguments not supported by pyvenv # Unset some arguments not supported by pyvenv