don't uninstall pip or setuptools

Detect pyOpenSSL

Makefile

@@ -3,3 +3,8 @@
 
 tests:
 	./bin/test
+
+tools:
+	git clone https://github.com/kennethreitz/pip-pop.git
+	mv pip-pop/bin/* vendor/pip-pop/
+	rm -fr pip-pop

Readme.md

@@ -17,7 +17,7 @@ Example usage:
     $ git push heroku master
     ...
     -----> Python app detected
-    -----> Installing runtime (python-2.7.8)
+    -----> Installing runtime (python-2.7.9)
     -----> Installing dependencies using pip
            Downloading/unpacking requests (from -r requirements.txt (line 1))
            Installing collected packages: requests
@@ -28,7 +28,7 @@ Example usage:
 
 You can also add it to upcoming builds of an existing application:
 
-    $ heroku config:add BUILDPACK_URL=git://github.com/heroku/heroku-buildpack-python.git
+    $ heroku buildpack:set git://github.com/heroku/heroku-buildpack-python.git
 
 The buildpack will detect your app as Python if it has the file `requirements.txt` in the root.
 
@@ -40,13 +40,13 @@ Specify a Runtime
 You can also provide arbitrary releases Python with a `runtime.txt` file.
 
     $ cat runtime.txt
-    python-3.4.2
+    python-3.4.3
 
 Runtime options include:
 
-- python-2.7.8
+- python-2.7.9
-- python-3.4.2
+- python-3.4.3
 - pypy-2.4.0 (unsupported, experimental)
-- pypy3-2.3.1 (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.9"
 DEFAULT_PYTHON_STACK="cedar"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="1.5.6"
+PIP_VERSION="6.1.1"
-SETUPTOOLS_VERSION="7.0"
+SETUPTOOLS_VERSION="15.2"
 
 # Setup bpwatch
 export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
@@ -166,7 +167,7 @@ source $BIN_DIR/steps/pylibmc
 source $BIN_DIR/steps/cryptography
 
 # Install dependencies with Pip.
-sub-env $BIN_DIR/steps/pip-install
+source $BIN_DIR/steps/pip-install
 
 # Django collectstatic support.
 sub-env $BIN_DIR/steps/collectstatic
@@ -179,12 +180,15 @@ sub-env $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/collectstatic

@@ -2,7 +2,7 @@
 
 source $BIN_DIR/utils
 
-MANAGE_FILE=$(find . -maxdepth 3 -type f -name 'manage.py' | head -1)
+MANAGE_FILE=$(find . -maxdepth 3 -type f -name 'manage.py' -printf '%d\t%P\n' | sort -nk1 | cut -f2 | head -1)
 MANAGE_FILE=${MANAGE_FILE:-fakepath}
 
 [ -f .heroku/collectstatic_disabled ] && DISABLE_COLLECTSTATIC=1
@@ -33,4 +33,4 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ]; then
     echo
 fi
 
-bpwatch stop collectstatic
+bpwatch stop collectstatic

bin/steps/cryptography

@@ -10,7 +10,7 @@
 # This script is invoked by [`bin/compile`](/).
 
 # The location of the pre-compiled cryptography binary.
-VENDORED_LIBFFI="http://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libffi.tar.gz"
+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"
 
@@ -20,7 +20,7 @@ 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 &> /dev/null) then
+if (pip-grep -s requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL &> /dev/null) then
 
   if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
     export LIBFFI=$(pwd)/vendor

bin/steps/pip-install

@@ -1,7 +1,3 @@
-#!/usr/bin/env bash
-
-source $BIN_DIR/utils
-
 # Install dependencies with Pip.
 puts-step "Installing dependencies with pip"
 
@@ -17,4 +13,4 @@ cp requirements.txt .heroku/python/requirements-declared.txt
 [ ! "$FRESH_PYTHON" ] && bpwatch stop pip_install
 [ "$FRESH_PYTHON" ] && bpwatch stop pip_install_first
 
-echo
+echo

bin/steps/pip-uninstall

@@ -5,7 +5,7 @@ if [[ -f .heroku/python/requirements-declared.txt ]]; then
 
   cp .heroku/python/requirements-declared.txt requirements-declared.txt
 
-  pip-diff --stale requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+  pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip > .heroku/python/requirements-stale.txt
 
   rm -fr requirements-declared.txt
 

bin/steps/pylibmc

@@ -10,7 +10,7 @@
 # This script is invoked by [`bin/compile`](/).
 
 # The location of the pre-compiled libmemcached binary.
-VENDORED_MEMCACHED="http://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
+VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
 
 # Syntax sugar.
 source $BIN_DIR/utils

bin/steps/python

@@ -15,7 +15,6 @@ fi
 
 if [ ! $STACK = $CACHED_PYTHON_STACK ]; then
   bpwatch start uninstall_python
-    puts-step "Stack changed, re-installing runtime"
     rm -fr .heroku/python .heroku/python-stack .heroku/vendor
     unset SKIP_INSTALL
   bpwatch stop uninstall_python
@@ -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"

bin/utils

@@ -36,7 +36,7 @@ set-default-env() {
   echo "export $1=\${$1:-$2}" >> $PROFILE_PATH
 }
 
-# Usage: $ set-default-env key value
+# Usage: $ un-set-env key
 un-set-env() {
   echo "unset $1" >> $PROFILE_PATH
 }
@@ -68,7 +68,7 @@ deep-rm() {
   # subshell to avoid surprising caller with shopts.
   (
     shopt -s dotglob
-    rm -rf "$1"/!(tmp|.|..)
+    rm -rf "$1"/!(.curlrc|.netrc|tmp|.|..)
   )
 }
 

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

@@ -10,7 +10,7 @@ hash -r
 
 echo "Building libffi..."
 
-SOURCE_TARBALL='http://cl.ly/2s1t1u3v0N0I/download/libffi-3.1.tar'
+SOURCE_TARBALL='https://cl.ly/2s1t1u3v0N0I/download/libffi-3.1.tar'
 
 curl -L $SOURCE_TARBALL | tar x
 

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/runtimes/pypy-2.5.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.5.0-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-2.5.0-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-2.5.1

@@ -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.5.1-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-2.5.1-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $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,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.9

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.7.9/Python-2.7.9.tgz'
+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

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

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.3.6/Python-3.3.6.tgz'
+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

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

@@ -5,7 +5,7 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.4.2/Python-3.4.2.tgz'
+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

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

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """Usage:
-  pip-diff (--fresh | --stale) <reqfile1> <reqfile2>
+  pip-diff (--fresh | --stale) <reqfile1> <reqfile2> [--exclude <package>...]
   pip-diff (-h | --help)
 
 Options:
@@ -14,6 +14,9 @@ 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):
@@ -32,13 +35,13 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        finder = PackageFinder([], [])
+        finder = PackageFinder([], [], session=requests)
-        for requirement in parse_requirements(reqfile, finder=finder):
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
             if requirement.req:
                 self.requirements.append(requirement.req)
 
 
-    def diff(self, requirements, ignore_versions=False):
+    def diff(self, requirements, ignore_versions=False, excludes=None):
         r1 = self
         r2 = requirements
         results = {'fresh': [], 'stale': []}
@@ -52,7 +55,7 @@ class Requirements(object):
         for req in r2.requirements:
             r = req.project_name if ignore_versions else req
 
-            if r not in other_reqs:
+            if r not in other_reqs and r not in excludes:
                 results['fresh'].append(req)
 
         # Generate stale packages.
@@ -64,7 +67,7 @@ class Requirements(object):
         for req in r1.requirements:
             r = req.project_name if ignore_versions else req
 
-            if r not in other_reqs:
+            if r not in other_reqs and r not in excludes:
                 results['stale'].append(req)
 
         return results
@@ -73,9 +76,10 @@ class Requirements(object):
 
 
 
-def diff(r1, r2, include_fresh=False, include_stale=False):
+def diff(r1, r2, include_fresh=False, include_stale=False, excludes=None):
 
     include_versions = True if include_stale else False
+    excludes = excludes if len(excludes) else []
 
     try:
         r1 = Requirements(r1)
@@ -84,7 +88,7 @@ def diff(r1, r2, include_fresh=False, include_stale=False):
         print('There was a problem loading the given requirements files.')
         exit(os.EX_NOINPUT)
 
-    results = r1.diff(r2, ignore_versions=True)
+    results = r1.diff(r2, ignore_versions=True, excludes=excludes)
 
     if include_fresh:
         for line in results['fresh']:
@@ -103,7 +107,8 @@ def main():
         'r1': args['<reqfile1>'],
         'r2': args['<reqfile2>'],
         'include_fresh': args['--fresh'],
-        'include_stale': args['--stale']
+        'include_stale': args['--stale'],
+        'excludes': args['<package>']
     }
 
     diff(**kwargs)

vendor/pip-pop/pip-grep

@@ -11,7 +11,9 @@ 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):
@@ -30,8 +32,8 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        finder = PackageFinder([], [])
+        finder = PackageFinder([], [], session=requests)
-        for requirement in parse_requirements(reqfile, finder=finder):
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
             self.requirements.append(requirement)
 
 

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