diff --git a/README.md b/README.md index e6707cd..66bbe52 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ You can set certain environment variables to control the pyenv-virtualenv. * `VIRTUALENV_VERSION`, if set, forces pyenv-virtualenv to install desired version of virtualenv. If the virtualenv has not been installed, pyenv-virtualenv will try to install the given version of virtualenv. +* `SETUPTOOLS_VERSION` and `PIP_VERSION`, if set and if pyvenv is preferred + than virtualenv, install specified version of setuptools and pip. ## Version History @@ -72,6 +74,8 @@ You can set certain environment variables to control the pyenv-virtualenv. #### 2013XXYY * Removed bundled `virtualenv.py` script. Now pyenv-virtualenv installs `virtualenv` package into source version and then use it. + * On Python 3.3+, use `pyvenv` as virtualenv command if `virtualenv` is not available. + * Install setuptools and pip into environments created by `pyvenv`. #### 20130614 diff --git a/bin/pyenv-virtualenv b/bin/pyenv-virtualenv index 2557b3f..3dd8699 100755 --- a/bin/pyenv-virtualenv +++ b/bin/pyenv-virtualenv @@ -294,11 +294,11 @@ fi if virtualenv_is_pyvenv; then PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python -c 'import setuptools' 1>/dev/null 2>&1 || { - http get "https://bitbucket.org/pypa/setuptools/raw/0.7.4/ez_setup.py" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python + http get "https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION:-0.7.4}/ez_setup.py" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python } PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-which pip 1>/dev/null 2>&1 || { - http get "https://raw.github.com/pypa/pip/master/contrib/get-pip.py" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python + http get "https://raw.github.com/pypa/pip/${PIP_VERSION:-master}/contrib/get-pip.py" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python } fi