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

Add HAS_VIRTUALENV, HAS_PYVENV and USE_PYVENV

Browse Source
This commit is contained in:
Yamashita Yuu
2014-01-18 18:03:14 +09:00
parent e7cc57acb8
commit 1cbcee3fc8
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
bin/pyenv-virtualenv
View File

@@ -111,20 +111,15 @@ usage() {
[ -z "$1" ] || exit "$1" [ -z "$1" ] || exit "$1"
} }
virtualenv_is_pyvenv() {
# Use pyvenv only if virtualenv is not installed and there is pyvenv
if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
return 1
else
pyenv-which "pyvenv" 1>/dev/null 2>&1
fi
}
venv() { venv() {
if virtualenv_is_pyvenv; then local args=("$@")
pyenv-exec pyvenv "$@" if [ -n "${USE_PYVENV}" ]; then
pyenv-exec pyvenv "${args[@]}"
local last="${args[${#args[@]}-1]}"
ensurepip "${last##*/}"
else else
pyenv-exec virtualenv "$@" pyenv-exec virtualenv "${args[@]}"
fi fi
} }
@@ -174,6 +169,12 @@ install_pip() {
} | PYENV_VERSION="${version}" pyenv-exec python } | PYENV_VERSION="${version}" pyenv-exec python
} }
install_virtualenv() {
local version="$1"
VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
PYENV_VERSION="${version}" pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
}
ensurepip() { ensurepip() {
local version="$1" local version="$1"
if PYENV_VERSION="${version}" pyenv-exec python -m ensurepip 2>/dev/null; then if PYENV_VERSION="${version}" pyenv-exec python -m ensurepip 2>/dev/null; then
@@ -272,7 +273,22 @@ UPGRADE_LIST="${TMP}/pyenv-virtualenv.${SEED}.txt"
VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}" VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
if virtualenv_is_pyvenv; then unset HAS_VIRTUALENV
unset HAS_PYVENV
unset USE_PYVENV
if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
HAS_VIRTUALENV=1
fi
if pyenv-which "pyvenv" 1>/dev/null 2>&1; then
HAS_PYVENV=1
fi
# Use pyvenv only if virtualenv is not installed and there is pyvenv
if [ -n "${HAS_PYVENV}" ] && [ -z "${HAS_VIRTUALENV}" ]; then
USE_PYVENV=1
fi
if [ -n "${USE_PYVENV}" ]; then
# Unset some arguments not supported by pyvenv # Unset some arguments not supported by pyvenv
unset QUIET unset QUIET
unset VERBOSE unset VERBOSE
@@ -281,11 +297,10 @@ if virtualenv_is_pyvenv; then
VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--upgrade" VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--upgrade"
fi fi
else else
pyenv-which "virtualenv" 1>/dev/null 2>&1 || { if [ -z "${HAS_VIRTUALENV}" ]; then
VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}" install_virtualenv "${PYENV_VERSION}"
pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}" HAS_VIRTUALENV=1
pyenv-rehash fi
}
fi fi
# Unset environment variables which starts with `VIRTUALENV_`. # Unset environment variables which starts with `VIRTUALENV_`.
@@ -352,11 +367,7 @@ STATUS=0
# change to cache directory to reuse them between invocation. # change to cache directory to reuse them between invocation.
mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}" mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
cd "${PYENV_VIRTUALENV_CACHE_PATH}" cd "${PYENV_VIRTUALENV_CACHE_PATH}"
venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" && { venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
if virtualenv_is_pyvenv; then
ensurepip "${VIRTUALENV_NAME}"
fi
} 1>&2 || STATUS="$?"
## Migrate previously installed packages from requirements.txt ## Migrate previously installed packages from requirements.txt
if [ -n "$UPGRADE" ]; then if [ -n "$UPGRADE" ]; then