From b55a5e5ec86ef36f3443b3be4618f13e84771dd3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz <me@kennethreitz.com> Date: Mon, 2 Jun 2014 09:35:57 -0400 Subject: [PATCH] python-2.7.7, new build infrastructure --- bin/compile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/compile b/bin/compile index a70383b1..4794640e 100755 --- a/bin/compile +++ b/bin/compile @@ -25,7 +25,7 @@ VIRTUALENV_LOC=".heroku/venv" LEGACY_TRIGGER="lib/python2.7" PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh" -DEFAULT_PYTHON_VERSION="python-2.7.6" +DEFAULT_PYTHON_VERSION="python-2.7.7" PYTHON_EXE="/app/.heroku/python/bin/python" PIP_VERSION="1.5.6" SETUPTOOLS_VERSION="3.6" @@ -110,7 +110,6 @@ fi # If no runtime given, assume default version. if [ ! -f runtime.txt ]; then - puts-step "No runtime.txt provided; assuming $DEFAULT_PYTHON_VERSION." echo $DEFAULT_PYTHON_VERSION > runtime.txt fi @@ -156,13 +155,17 @@ fi if [ ! "$SKIP_INSTALL" ]; then bpwatch start install_python puts-step "Preparing Python runtime ($PYTHON_VERSION)" - curl http://envy-versions.s3.amazonaws.com/$PYTHON_VERSION.tar.bz2 -s | tar jx &> /dev/null + + # Prepare destination directory. + mkdir -p .heroku/python + + curl http://lang-python.s3.amazonaws.com/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null if [[ $? != 0 ]] ; then puts-warn "Requested runtime ($PYTHON_VERSION) was not found." puts-warn "Aborting. More info: https://devcenter.heroku.com/articles/python-support" exit 1 fi - mv python .heroku/python + bpwatch stop install_python # Record for future reference. -- GitLab