PyOpenSSL capitalization

This reverts commit 3c2839147f.

Readme.md

@@ -40,12 +40,13 @@ Specify a Runtime
 You can also provide arbitrary releases Python with a `runtime.txt` file.
 
     $ cat runtime.txt
-    python-3.4.1
+    python-3.4.2
 
 Runtime options include:
 
 - python-2.7.8
-- python-3.4.1
-- pypy-1.9 (experimental)
+- python-3.4.2
+- pypy-2.4.0 (unsupported, experimental)
+- pypy3-2.4.0 (unsupported, experimental)
 
 Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well.

bin/compile

@@ -24,12 +24,13 @@ CACHED_DIRS=".heroku"
 VIRTUALENV_LOC=".heroku/venv"
 LEGACY_TRIGGER="lib/python2.7"
 PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
+WEBCONCURRENCY_PROFILE_PATH="$BUILD_DIR/.profile.d/python.webconcurrency.sh"
 
-DEFAULT_PYTHON_VERSION="python-2.7.8"
+DEFAULT_PYTHON_VERSION="python-2.7.9"
 DEFAULT_PYTHON_STACK="cedar"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="1.5.6"
-SETUPTOOLS_VERSION="5.4.1"
+PIP_VERSION="6.0.6"
+SETUPTOOLS_VERSION="11.3.1"
 
 # Setup bpwatch
 export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
@@ -150,6 +151,9 @@ mkdir -p $(dirname $PROFILE_PATH)
 # Install Python.
 source $BIN_DIR/steps/python
 
+# Sanity check for setuptools/distribute.
+source $BIN_DIR/steps/setuptools
+
 # Uninstall removed dependencies with Pip.
 source $BIN_DIR/steps/pip-uninstall
 
@@ -159,11 +163,14 @@ source $BIN_DIR/steps/mercurial
 # Pylibmc support.
 source $BIN_DIR/steps/pylibmc
 
+# Libffi support.
+source $BIN_DIR/steps/cryptography
+
 # Install dependencies with Pip.
 source $BIN_DIR/steps/pip-install
 
 # Django collectstatic support.
-source $BIN_DIR/steps/collectstatic
+sub-env $BIN_DIR/steps/collectstatic
 
 
 # ### Finalize
@@ -173,12 +180,15 @@ source $BIN_DIR/steps/collectstatic
 set-env PATH '$HOME/.heroku/python/bin:$PATH'
 set-env PYTHONUNBUFFERED true
 set-env PYTHONHOME /app/.heroku/python
-set-env LIBRARY_PATH /app/.heroku/vendor/lib:/app/.heroku/python/lib
+set-env LIBRARY_PATH '/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH'
 set-env LD_LIBRARY_PATH '/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH'
 set-default-env LANG en_US.UTF-8
 set-default-env PYTHONHASHSEED random
 set-default-env PYTHONPATH /app/
 
+# Install sane-default script for WEB_CONCURRENCY environment variable.
+cp $ROOT_DIR/vendor/python.webconcurrency.sh $WEBCONCURRENCY_PROFILE_PATH
+
 
 # Experimental post_compile hook.
 bpwatch start post_compile

bin/steps/cryptography

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# This script serves as the Pylibmc build step of the
+# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
+# compiler.
+#
+# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an
+# adapter between a Python application and Heroku's runtime.
+#
+# This script is invoked by [`bin/compile`](/).
+
+# The location of the pre-compiled cryptography binary.
+VENDORED_LIBFFI="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libffi.tar.gz"
+
+PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+bpwatch start libffi_install
+
+# If pylibmc exists within requirements, use vendored cryptography.
+if (pip-grep -s requirements.txt bcrypt cffi cryptography PyOpenSSL &> /dev/null) then
+
+  if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
+    export LIBFFI=$(pwd)/vendor
+  else
+    echo "-----> Noticed cffi. Bootstrapping libffi."
+    mkdir -p .heroku/vendor
+    # Download and extract cryptography into target vendor directory.
+    curl $VENDORED_LIBFFI -s | tar zxv -C .heroku/vendor &> /dev/null
+
+    export LIBFFI=$(pwd)/vendor
+  fi
+fi
+
+bpwatch stop libffi_install

bin/steps/pip-uninstall

@@ -3,7 +3,11 @@ set +e
 bpwatch start pip_uninstall
 if [[ -f .heroku/python/requirements-declared.txt ]]; then
 
-  pip-diff --stale .heroku/python/requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+  cp .heroku/python/requirements-declared.txt requirements-declared.txt
+
+  pip-diff --stale requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+
+  rm -fr requirements-declared.txt
 
   if [[ -s .heroku/python/requirements-stale.txt ]]; then
     puts-step "Uninstalling stale dependencies"

bin/steps/pylibmc

@@ -10,30 +10,27 @@
 # This script is invoked by [`bin/compile`](/).
 
 # The location of the pre-compiled libmemcached binary.
-VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz"
+VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
 
 # Syntax sugar.
 source $BIN_DIR/utils
 
+
 bpwatch start pylibmc_install
 
 # If pylibmc exists within requirements, use vendored libmemcached.
-if (pip-grep -s requirements.txt pylibmc) then
-  echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
-  cd .heroku
+if (pip-grep -s requirements.txt pylibmc &> /dev/null) then
 
-  if [ -d "vendor/lib/sasl2" ]; then
+  if [ -d ".heroku/vendor/lib/sasl2" ]; then
     export LIBMEMCACHED=$(pwd)/vendor
   else
+    echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
+    mkdir -p .heroku/vendor
     # Download and extract libmemcached into target vendor directory.
-    curl -s -L -o tmp-libmemcached.tar.gz $VENDORED_MEMCACHED
-    tar -zxvf tmp-libmemcached.tar.gz > /dev/null
-    rm tmp-libmemcached.tar.gz
+    curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
+
     export LIBMEMCACHED=$(pwd)/vendor
   fi
-
-  export LIBMEMCACHED=$(pwd)/vendor
-  cd ..
 fi
 
 bpwatch stop pylibmc_install

bin/steps/python

@@ -15,8 +15,7 @@ fi
 
 if [ ! $STACK = $CACHED_PYTHON_STACK ]; then
   bpwatch start uninstall_python
-    puts-step "Stack changed, re-installing runtime"
-    rm -fr .heroku/python
+    rm -fr .heroku/python .heroku/python-stack .heroku/vendor
     unset SKIP_INSTALL
   bpwatch stop uninstall_python
 fi
@@ -29,7 +28,7 @@ if [ ! "$SKIP_INSTALL" ]; then
     # Prepare destination directory.
     mkdir -p .heroku/python
 
-    curl http://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
+    curl https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
     if [[ $? != 0 ]] ; then
       puts-warn "Requested runtime ($PYTHON_VERSION) is not available for this stack ($STACK)."
       puts-warn "Aborting.  More info: https://devcenter.heroku.com/articles/python-support"
@@ -52,22 +51,22 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
 
   bpwatch start prepare_environment
 
+  TMPTARDIR=$(mktemp -d)
+  trap "rm -rf $TMPTARDIR" RETURN
+
   bpwatch start install_setuptools
     # Prepare it for the real world
     # puts-step "Installing Setuptools ($SETUPTOOLS_VERSION)"
-    cd $ROOT_DIR/vendor/
-    tar zxf setuptools-$SETUPTOOLS_VERSION.tar.gz
-    cd $ROOT_DIR/vendor/setuptools-$SETUPTOOLS_VERSION/
+    tar zxf $ROOT_DIR/vendor/setuptools-$SETUPTOOLS_VERSION.tar.gz -C $TMPTARDIR
+    cd $TMPTARDIR/setuptools-$SETUPTOOLS_VERSION/
     python setup.py install &> /dev/null
     cd $WORKING_DIR
   bpwatch stop install_setuptoools
 
   bpwatch start install_pip
     # puts-step "Installing Pip ($PIP_VERSION)"
-
-    cd $ROOT_DIR/vendor/
-    tar zxf pip-$PIP_VERSION.tar.gz
-    cd $ROOT_DIR/vendor/pip-$PIP_VERSION/
+    tar zxf $ROOT_DIR/vendor/pip-$PIP_VERSION.tar.gz -C $TMPTARDIR
+    cd $TMPTARDIR/pip-$PIP_VERSION/
     python setup.py install &> /dev/null
     cd $WORKING_DIR
 
@@ -76,4 +75,4 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
 fi
 
 set -e
-hash -r
+hash -r

bin/steps/setuptools

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+if (pip-grep -s requirements.txt setuptools distribute &> /dev/null) then
+
+  puts-warn 'The package setuptools/distribute is listed in requirements.txt.'
+  puts-warn 'Please remove to ensure expected behavior. '
+
+fi

builds/libraries/autoconf

@@ -6,7 +6,7 @@ OUT_PREFIX=$1
 echo "Building autoconf..."
 
 
-SOURCE_TARBALL='http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.gz'
+SOURCE_TARBALL='https://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.gz'
 curl -L $SOURCE_TARBALL | tar xz
 
 cd autoconf-2.68

builds/libraries/libffi

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+OUT_PREFIX=$1
+
+# Use new path, containing autoconf.
+export PATH="/app/.heroku/python/bin/:$PATH"
+hash -r
+
+
+echo "Building libffi..."
+
+SOURCE_TARBALL='https://cl.ly/2s1t1u3v0N0I/download/libffi-3.1.tar'
+
+curl -L $SOURCE_TARBALL | tar x
+
+cd libffi-3.1
+./configure --prefix=$OUT_PREFIX --disable-static &&
+make
+make install
+
+# Cleanup
+cd ..

builds/libraries/sqlite

@@ -6,7 +6,7 @@ OUT_PREFIX=$1
 echo "Building SQLite..."
 
 
-SOURCE_TARBALL='http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'
+SOURCE_TARBALL='https://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'
 
 curl $SOURCE_TARBALL | tar xz
 # jx

builds/libraries/vendor/libffi

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/autoconf
+# Build Path: /app/.heroku/vendor/
 
 OUT_PREFIX=$1
 
@@ -11,14 +10,12 @@ hash -r
 
 echo "Building libffi..."
 
-SOURCE_TARBALL='https://github.com/atgreen/libffi/archive/master.tar.gz'
+SOURCE_TARBALL='ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz'
 
-curl -L $SOURCE_TARBALL | tar xz
-mv libffi-master libffi
+curl -L $SOURCE_TARBALL | tar x
 
-cd libffi
-./autogen.sh
-./configure --prefix=$OUT_PREFIX --enable-shared
+cd libffi-3.1
+./configure --prefix=$OUT_PREFIX --disable-static &&
 make
 make install
 

builds/libraries/vendor/libmemcache

@@ -22,7 +22,8 @@ curl -LO ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 tar xzf cyrus-sasl-2.1.26.tar.gz
 
 pushd cyrus-sasl-2.1.26
-./configure --prefix=${OUT_PREFIX}
+./configure --prefix=${OUT_PREFIX} --with-plugindir=${OUT_PREFIX}lib/sasl2 --with-configdir=${OUT_PREFIX}lib/sasl2
+
 make -s -j 9
 make install -s
 popd

builds/runtimes/pypy-2.3

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
+# Build Deps: libraries/sqlite, libraries/libffi
 
 # NOTICE: This formula only works for the cedar-14 stack, not cedar.
 

builds/runtimes/pypy-2.4.0

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+# NOTICE: This formula only works for the cedar-14 stack, not cedar.
+
+OUT_PREFIX=$1
+
+echo "Building PyPy..."
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-2.4.0-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy3-2.4.0

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+# NOTICE: This formula only works for the cedar-14 stack, not cedar.
+
+OUT_PREFIX=$1
+
+echo "Building PyPy..."
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy3-2.4.0-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy3 $OUT_PREFIX/bin/python

builds/runtimes/python-2.4.4

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.4.4/Python-2.4.4.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.4.4/Python-2.4.4.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.4.4 src
 cd src

builds/runtimes/python-2.4.5

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.4.5/Python-2.4.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.4.5/Python-2.4.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.4.5 src
 cd src

builds/runtimes/python-2.4.6

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.4.6/Python-2.4.6.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.4.6/Python-2.4.6.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.4.6 src
 cd src

builds/runtimes/python-2.5.0

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.5/Python-2.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.5/Python-2.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.5 src
 cd src

builds/runtimes/python-2.5.1

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.5.1/Python-2.5.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.5.1/Python-2.5.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.5.1 src
 cd src

builds/runtimes/python-2.5.2

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.5.2/Python-2.5.2.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.5.2/Python-2.5.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.5.2 src
 cd src

builds/runtimes/python-2.5.3

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.5.3/Python-2.5.3.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.5.3/Python-2.5.3.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.5.3 src
 cd src

builds/runtimes/python-2.5.4

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.5.4/Python-2.5.4.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.5.4/Python-2.5.4.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.5.4 src
 cd src

builds/runtimes/python-2.5.5

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.5.5/Python-2.5.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.5.5/Python-2.5.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.5.5 src
 cd src

builds/runtimes/python-2.5.6

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.5.6/Python-2.5.6.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.5.6/Python-2.5.6.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.5.6 src
 cd src

builds/runtimes/python-2.6.0

@@ -10,7 +10,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://www.python.org/ftp/python/2.6/Python-2.6.tar.bz2'
+SOURCE_TARBALL='https://www.python.org/ftp/python/2.6/Python-2.6.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 mv Python-2.6 src
 cd src

builds/runtimes/python-2.6.1

@@ -10,7 +10,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.1/Python-2.6.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.1/Python-2.6.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.1 src
 cd src

builds/runtimes/python-2.6.2

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.2/Python-2.6.2.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.2/Python-2.6.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.2 src
 cd src

builds/runtimes/python-2.6.3

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.3/Python-2.6.3.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.3/Python-2.6.3.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.3 src
 cd src

builds/runtimes/python-2.6.4

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.4/Python-2.6.4.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.4/Python-2.6.4.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.4 src
 cd src

builds/runtimes/python-2.6.5

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.5/Python-2.6.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.5/Python-2.6.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.5 src
 cd src

builds/runtimes/python-2.6.6

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.6/Python-2.6.6.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.6/Python-2.6.6.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.6 src
 cd src

builds/runtimes/python-2.6.7

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.7/Python-2.6.7.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.7/Python-2.6.7.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.7 src
 cd src

builds/runtimes/python-2.6.8

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.8/Python-2.6.8.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.8/Python-2.6.8.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.8 src
 cd src

builds/runtimes/python-2.6.9

@@ -8,7 +8,7 @@ OUT_PREFIX=$1
 unset LANG PYTHONHOME PYTHONPATH
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.9/Python-2.6.9.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.6.9/Python-2.6.9.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.6.9 src
 cd src

builds/runtimes/python-2.7.0

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7/Python-2.7.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7/Python-2.7.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7 src
 cd src

builds/runtimes/python-2.7.1

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.1/Python-2.7.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.1/Python-2.7.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.1 src
 cd src

builds/runtimes/python-2.7.2

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.2/Python-2.7.2.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.2/Python-2.7.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.2 src
 cd src

builds/runtimes/python-2.7.3

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.3/Python-2.7.3.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.3/Python-2.7.3.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.3 src
 cd src

builds/runtimes/python-2.7.4

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.4/Python-2.7.4.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.4/Python-2.7.4.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.4 src
 cd src

builds/runtimes/python-2.7.5

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.5/Python-2.7.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.5/Python-2.7.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.5 src
 cd src

builds/runtimes/python-2.7.6

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.6/Python-2.7.6.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.6/Python-2.7.6.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.6 src
 cd src

builds/runtimes/python-2.7.7

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.7/Python-2.7.7.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.7/Python-2.7.7.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.7 src
 cd src

builds/runtimes/python-2.7.7-shared

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.7/Python-2.7.7.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.7/Python-2.7.7.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.7 src
 cd src

builds/runtimes/python-2.7.8

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.8/Python-2.7.8.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.8/Python-2.7.8.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.8 src
 cd src

builds/runtimes/python-2.7.8-shared

@@ -5,11 +5,11 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.8/Python-2.7.8.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.8/Python-2.7.8.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.8 src
 cd src
 
-./configure --prefix=$OUT_PREFIX
+./configure --prefix=$OUT_PREFIX --enable-shared
 make
 make install

builds/runtimes/python-2.7.9

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building Python..."
+SOURCE_TARBALL='https://python.org/ftp/python/2.7.9/Python-2.7.9.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.7.9 src
+cd src
+
+./configure --prefix=$OUT_PREFIX  --with-ensurepip=no
+make
+make install

builds/runtimes/python-3.1.0

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.1/Python-3.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.1/Python-3.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.1 src
 cd src

builds/runtimes/python-3.1.1

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.1.1/Python-3.1.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.1.1/Python-3.1.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.1.1 src
 cd src

builds/runtimes/python-3.1.2

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.1.2/Python-3.1.2.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.1.2/Python-3.1.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.1.2 src
 cd src

builds/runtimes/python-3.1.3

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.1.3/Python-3.1.3.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.1.3/Python-3.1.3.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.1.3 src
 cd src

builds/runtimes/python-3.1.4

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.1.4/Python-3.1.4.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.1.4/Python-3.1.4.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.1.4 src
 cd src

builds/runtimes/python-3.1.5

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.1.5/Python-3.1.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.1.5/Python-3.1.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.1.5 src
 cd src

builds/runtimes/python-3.2.0

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.2/Python-3.2.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.2/Python-3.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.2 src
 cd src

builds/runtimes/python-3.2.1

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.2.1/Python-3.2.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.2.1/Python-3.2.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.2.1 src
 cd src

builds/runtimes/python-3.2.2

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.2.2/Python-3.2.2.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.2.2/Python-3.2.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.2.2 src
 cd src

builds/runtimes/python-3.2.3

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.2.3/Python-3.2.3.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.2.3/Python-3.2.3.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.2.3 src
 cd src

builds/runtimes/python-3.2.4

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.2.4/Python-3.2.4.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.2.4/Python-3.2.4.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.2.4 src
 cd src

builds/runtimes/python-3.2.5

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.2.5/Python-3.2.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.2.5/Python-3.2.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.2.5 src
 cd src

builds/runtimes/python-3.3.0

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.3.0/Python-3.3.0.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.3.0 src
 cd src

builds/runtimes/python-3.3.1

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.3.1/Python-3.3.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.3.1 src
 cd src

builds/runtimes/python-3.3.2

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.3.2/Python-3.3.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.3.2 src
 cd src

builds/runtimes/python-3.3.3

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.3.3/Python-3.3.3.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.3.3/Python-3.3.3.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.3.3 src
 cd src

builds/runtimes/python-3.3.4

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.3.4/Python-3.3.4.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.3.4/Python-3.3.4.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.3.4 src
 cd src

builds/runtimes/python-3.3.5

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.3.5/Python-3.3.5.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.3.5/Python-3.3.5.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.3.5 src
 cd src

builds/runtimes/python-3.3.6

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building Python..."
+SOURCE_TARBALL='https://python.org/ftp/python/3.3.6/Python-3.3.6.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.3.6 src
+cd src
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.4.0

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.4.0/Python-3.4.0.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.4.0/Python-3.4.0.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.4.0 src
 cd src

builds/runtimes/python-3.4.1

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.4.1/Python-3.4.1.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.4.1/Python-3.4.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.4.1 src
 cd src

builds/runtimes/python-3.4.2

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building Python..."
+SOURCE_TARBALL='https://python.org/ftp/python/3.4.2/Python-3.4.2.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.4.2 src
+cd src
+
+./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
+

builds/runtimes/python-3.4.3

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building Python..."
+SOURCE_TARBALL='https://python.org/ftp/python/3.4.3/Python-3.4.3.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.4.3 src
+cd src
+
+./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
+

vendor/pip-pop/pip-diff

@@ -13,6 +13,10 @@ Options:
 import os
 from docopt import docopt
 from pip.req import parse_requirements
+from pip.index import PackageFinder
+from pip._vendor.requests import session
+
+requests = session()
 
 class Requirements(object):
     def __init__(self, reqfile=None):
@@ -31,7 +35,8 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        for requirement in parse_requirements(reqfile):
+        finder = PackageFinder([], [], session=requests)
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
             if requirement.req:
                 self.requirements.append(requirement.req)
 
@@ -79,18 +84,18 @@ def diff(r1, r2, include_fresh=False, include_stale=False):
         r1 = Requirements(r1)
         r2 = Requirements(r2)
     except ValueError:
-        print 'There was a problem loading the given requirements files.'
+        print('There was a problem loading the given requirements files.')
         exit(os.EX_NOINPUT)
 
     results = r1.diff(r2, ignore_versions=True)
 
     if include_fresh:
         for line in results['fresh']:
-            print line.project_name if include_versions else line
+            print(line.project_name if include_versions else line)
 
     if include_stale:
         for line in results['stale']:
-            print line.project_name if include_versions else line
+            print(line.project_name if include_versions else line)
 
 
 
@@ -109,4 +114,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()

vendor/pip-pop/pip-grep

@@ -10,6 +10,10 @@ Options:
 import os
 from docopt import docopt
 from pip.req import parse_requirements
+from pip.index import PackageFinder
+from pip._vendor.requests import session
+
+requests = session()
 
 class Requirements(object):
     def __init__(self, reqfile=None):
@@ -28,7 +32,8 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        for requirement in parse_requirements(reqfile):
+        finder = PackageFinder([], [], session=requests)
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
             self.requirements.append(requirement)
 
 
@@ -41,7 +46,7 @@ def grep(reqfile, packages, silent=False):
     except ValueError:
 
         if not silent:
-            print 'There was a problem loading the given requirement file.'
+            print('There was a problem loading the given requirement file.')
 
         exit(os.EX_NOINPUT)
 
@@ -52,12 +57,12 @@ def grep(reqfile, packages, silent=False):
             if requirement.req.project_name in packages:
 
                 if not silent:
-                    print 'Package {} found!'.format(requirement.req.project_name)
+                    print('Package {} found!'.format(requirement.req.project_name))
 
                 exit(0)
 
     if not silent:
-        print 'Not found.'.format(requirement.req.project_name)
+        print('Not found.'.format(requirement.req.project_name))
 
     exit(1)
 
@@ -73,4 +78,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()

vendor/python.webconcurrency.sh

@@ -0,0 +1,21 @@
+case $(ulimit -u) in
+
+# 1X DYNO
+256)
+  export DYNO_RAM=512
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-2}
+  ;;
+
+# 2X DYNO
+512)
+  export DYNO_RAM=1024
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4}
+  ;;
+
+# PX DYNO
+32768)
+  export DYNO_RAM=6144
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-9}
+  ;;
+
+esac