Repository: aurora Updated Branches: refs/heads/master 528198ecb -> c41420fd7
Update virtualenv version to 15.0.2 Update virtualenv to 15.0.2. This includes updates to `pip==8.1.2`, `setuptools==21.2.1`, and `wheel==0.29.0`. Full changelog: https://virtualenv.pypa.io/en/stable/changes/ Additional changes to our scripts: * abort the pants bootstrapping script if an error is encountered * switch to download URLs that are working for the latest virtualenv version * disable the recently added auto-updating of pip and setuptools so that we gain a reproducable build environment Bugs closed: AURORA-1717 Reviewed at https://reviews.apache.org/r/49868/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/c41420fd Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/c41420fd Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/c41420fd Branch: refs/heads/master Commit: c41420fd7eec8243a00cb693a185a92f64b2dd1c Parents: 528198e Author: Stephan Erb <[email protected]> Authored: Sun Jul 10 16:26:33 2016 -0600 Committer: John Sirois <[email protected]> Committed: Sun Jul 10 16:26:33 2016 -0600 ---------------------------------------------------------------------- build-support/virtualenv | 6 +++--- pants | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/c41420fd/build-support/virtualenv ---------------------------------------------------------------------- diff --git a/build-support/virtualenv b/build-support/virtualenv index 03c1432..0542a66 100755 --- a/build-support/virtualenv +++ b/build-support/virtualenv @@ -14,7 +14,7 @@ # # Wrapper for self-bootstrapping virtualenv set -ex -VIRTUALENV_VERSION=14.0.6 +VIRTUALENV_VERSION=15.0.2 if which python2.7 >/dev/null; then PY=`which python2.7` @@ -28,10 +28,10 @@ echo "Using $PY" >&2 HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd) if ! [ -f "$HERE/virtualenv-$VIRTUALENV_VERSION/BOOTSTRAPPED" ]; then pushd "$HERE" - curl -O https://pypi.python.org/packages/source/v/virtualenv/virtualenv-$VIRTUALENV_VERSION.tar.gz + curl -LO https://pypi.io/packages/source/v/virtualenv/virtualenv-$VIRTUALENV_VERSION.tar.gz tar zxvf virtualenv-$VIRTUALENV_VERSION.tar.gz touch virtualenv-$VIRTUALENV_VERSION/BOOTSTRAPPED # 2PC popd fi -exec "$PY" "$HERE/virtualenv-$VIRTUALENV_VERSION/virtualenv.py" "$@" +exec "$PY" "$HERE/virtualenv-$VIRTUALENV_VERSION/virtualenv.py" --no-download "$@" http://git-wip-us.apache.org/repos/asf/aurora/blob/c41420fd/pants ---------------------------------------------------------------------- diff --git a/pants b/pants index a11588a..b1ca382 100755 --- a/pants +++ b/pants @@ -21,13 +21,14 @@ # # You can learn more here: https://pantsbuild.github.io/setup # ==================================================================== +set -e PYTHON=${PYTHON:-$(which python2.7)} PANTS_HOME="${PANTS_HOME:-${HOME}/.cache/pants/setup}" PANTS_BOOTSTRAP="${PANTS_HOME}/bootstrap-$(uname -s)-$(uname -m)" -VENV_VERSION=13.1.0 +VENV_VERSION=15.0.2 VENV_PACKAGE=virtualenv-${VENV_VERSION} VENV_TARBALL=${VENV_PACKAGE}.tar.gz @@ -54,7 +55,7 @@ function bootstrap_venv { mkdir -p "${PANTS_BOOTSTRAP}" && \ staging_dir=$(tempdir "${PANTS_BOOTSTRAP}") && \ cd "${staging_dir}" && \ - curl -O https://pypi.python.org/packages/source/v/virtualenv/${VENV_TARBALL} && \ + curl -LO https://pypi.io/packages/source/v/virtualenv/${VENV_TARBALL} && \ tar -xzf ${VENV_TARBALL} && \ ln -s "${staging_dir}/${VENV_PACKAGE}" "${staging_dir}/latest" && \ mv "${staging_dir}/latest" "${PANTS_BOOTSTRAP}/${VENV_PACKAGE}" @@ -81,9 +82,8 @@ function bootstrap_pants { ( venv_path="$(bootstrap_venv)" && \ staging_dir=$(tempdir "${PANTS_BOOTSTRAP}") && \ - "${PYTHON}" "${venv_path}/virtualenv.py" "${staging_dir}/install" && \ - source "${staging_dir}/install/bin/activate" && \ - pip install "${pants_requirement}" && \ + "${PYTHON}" "${venv_path}/virtualenv.py" --no-download "${staging_dir}/install" && \ + "${staging_dir}/install/bin/python" "${staging_dir}/install/bin/pip" install "${pants_requirement}" && \ ln -s "${staging_dir}/install" "${staging_dir}/${pants_version}" && \ mv "${staging_dir}/${pants_version}" "${PANTS_BOOTSTRAP}/${pants_version}" ) 1>&2 @@ -92,4 +92,4 @@ function bootstrap_pants { } pants_dir=$(bootstrap_pants) && \ -exec "${pants_dir}/bin/pants" "$@" +exec "${pants_dir}/bin/python" "${pants_dir}/bin/pants" "$@"
