v20131216

README.md

@@ -22,6 +22,23 @@ the `~/.pyenv/plugins/pyenv-virtualenv` directory. From that directory, you
 can check out a specific release tag. To update pyenv-virtualenv, run `git
 pull` to download the latest changes.
 
+### Installing with Homebrew (for OS X users)
+
+Mac OS X users can install pyenv-virtualenv with the
+[Homebrew](http://brew.sh) package manager. This
+will give you access to the `pyenv-virtualenv` command. If you have pyenv
+installed, you will also be able to use the `pyenv virtualenv` command.
+
+*This is recommended method of installation if you installed pyenv
+ with Homebrew.*
+
+    brew install pyenv-virtualenv
+
+Or, if you would like to install the latest development release:
+
+    brew install --HEAD pyenv-virtualenv
+
+
 ## Usage
 
 ### Using `pyenv virtualenv` with pyenv
@@ -74,6 +91,10 @@ You can set certain environment variables to control the pyenv-virtualenv.
 
 ## Version History
 
+#### 20131216
+
+ * Use latest release of setuptools and pip if the version not given via environment variables.
+
 #### 20130622
 
  * Removed bundled `virtualenv.py` script. Now pyenv-virtualenv installs `virtualenv` package into source version and then use it.

bin/pyenv-virtualenv

@@ -11,7 +11,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20130622"
+PYENV_VIRTUALENV_VERSION="20131216"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -283,13 +283,25 @@ mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
 venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" && {
   if virtualenv_is_pyvenv; then
-    [ -n "${EZ_SETUP_URL}" ] || EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION:-0.7.4}/ez_setup.py"
+    [ -n "${EZ_SETUP_URL}" ] || {
+      if [ -n "${SETUPTOOLS_VERSION}" ]; then
+        EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
+      else
+        EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py"
+      fi
+    }
     PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python -c 'import setuptools' 1>/dev/null 2>&1 || {
       echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
       http get "${EZ_SETUP_URL}" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python
     }
 
-    [ -n "${GET_PIP_URL}" ] || GET_PIP_URL="https://raw.github.com/pypa/pip/${PIP_VERSION:-master}/contrib/get-pip.py"
+    [ -n "${GET_PIP_URL}" ] || {
+      if [ -n "${PIP_VERSION}" ]; then
+        GET_PIP_URL="https://raw.github.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+      else
+        GET_PIP_URL="https://raw.github.com/pypa/pip/master/contrib/get-pip.py"
+      fi
+    }
     PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-which pip 1>/dev/null 2>&1 || {
       echo "Installing pip from ${GET_PIP_URL}..." 1>&2
       http get "${GET_PIP_URL}" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python