v75

Update readme to Python 2.7.11 and 3.5.1

CHANGELOG.md

@@ -0,0 +1,75 @@
+# Python Buildpack Changelog
+
+## v75 (2016-01-29)
+
+Updated pip and Setuptools.
+
+## v74 (2015-12-29)
+
+Added warnings for lack of Procfile.
+
+## v72 (2015-12-07)
+
+Updated default Python to 2.7.11.
+
+## v72 (2015-12-03)
+
+Added friendly warnings for common build failures.
+
+## v70 (2015-10-29)
+
+Improved compatibility with multi and node.js buildpacks.
+
+## v69 (2015-10-12)
+
+Revert to v66.
+
+## v68 (2015-10-12)
+
+Fixed .heroku/venv error with modern apps.
+
+## v67 (2015-10-12)
+
+Further improved cache compatibility with multi and node.js buildpacks.
+
+## v66 (2015-10-09)
+
+Improved compatibility with multi and node.js buildpacks.
+
+## v65 (2015-10-08)
+
+Reverted v64.
+
+## v64 (2015-10-08)
+
+Improved compatibility with multi and node.js buildpacks.
+
+## v63 (2015-10-08)
+
+Updated Pip and Setuptools.
+
+- Setuptools updated to v18.3.2
+- Pip updated to v7.1.2
+
+
+## v62 (2015-08-07)
+
+Updated Pip and Setuptools.
+
+- Setuptools updated to v18.1
+- Pip updated to v7.1.0
+
+## v61 (2015-06-30)
+
+Updated Pip and Setuptools.
+
+- Setuptools updated to v18.0.1
+- Pip updated to v7.0.3
+
+## v60 (2015-05-27)
+
+Default Python is now latest 2.7.10. Updated Pip and Distribute.
+
+- Default Python version is v2.7.10
+- Setuptools updated to v16.0
+- Pip updated to v7.0.1

Changelog.md

@@ -1,130 +0,0 @@
-## v14
-
-Features:
-
-* Full removal of Django settings injection for new apps.
-* Support for profile.d
-* Fresh app detection.
-* Update to Virtualenv v1.7.2
-* Updated to Pip v1.1 (patched)
-
-Bugfixes:
-
-* Default pip path exists action.
-
-## v13
-
-Bugfixes:
-
-* Fix pip quoting error.
-* Only talk about collectstatic in buildpack output when it's configured.
-
-## v12
-
-Bugfixes:
-
-* Catch database setting corner case.
-
-## v11
-
-Bugfixes:
-
-* Cleanup collectstatic output.
-
-
-## v10
-
-Bugfixes:
-
-* Check for collectstatic validity with --dry-run instead of --help for Django 1.4.
-
-## v9
-
-Bugfixes:
-
-* Unset PYTHONHOME in buildpack for [user_env_compile](http://devcenter.heroku.com/articles/labs-user-env-compile).
-
-## v8
-
-Features:
-
-* Disable Django collectstatic with `$DISABLE_COLLECTSTATIC` + [user_env_compile](http://devcenter.heroku.com/articles/labs-user-env-compile).
-
-Bugfixes:
-
-* Don't disbable injection for new Django apps.
-* Inform user of July 1, 2012 deprecation of Django injection.
-
-## v7
-
-Features:
-
-* Full removal of Django setting injection for new apps.
-* Automatic execution of collectstatic.
-* Suppress collectstatic errors via env SILENCE_COLLECTSTATIC.
-* Increase settings.py search depth to 3.
-* Search recursively from included requirements.txt files.
-
-
-## v6 (03/23/2012)
-
-Features:
-
-* Dist packages (setup.py) support.
-* Move new virtualenvs to `/app/.heroku/venv`.
-* Heavily improved Django app detection, accounting for `Django` in `requirements.txt`.
-* Literate [documentation](http://python-buildpack.herokuapp.com).
-* Default `$PYTHONHOME`, `$PYTHONPATH`, and `$LANG` configurations.
-* Disable Django setting injection with `$DISABLE_INJECTION` + [user_env_compile](http://devcenter.heroku.com/articles/labs-user-env-compile).
-* General code refactor and improved messaging.
-* Unit tests.
-
-Bugfixes:
-
-* Django 1.4 startproject template layout support.
-* Django `manage.py` location can now be independent from `settings.py`.
-
-## v5 (02/01/2012)
-
-Bugfixes:
-
-* Git requirements 100% work.
-
-
-## v4 (01/20/2012)
-
-Features:
-
-* Updated to virtualenv v1.7 with patched pip v1.2.
-* Actually activate created virtualenv within compile process.
-* Use distribute instead of deprecated setuptools.
-* Automatically destroy and rebuild corrupt virtualenvs.
-* Refactor django and pylibmc detection.
-
-Bugfixes:
-
-* Fixed `package==dev` in requirements with patched pip embedded within virtualenv. Patch upstreamed.
-* Minor curl/rm flag fixes (thanks, contributors!)
-
-
-## v3 (12/07/2011)
-
-Bugfixes:
-
-* Better django setup.py injection.
-
-
-## v2 (11/15/2011)
-
-Features:
-
-* Support for pylibmc and libmemcached +sasl.
-
-Bugfixes:
-
-* Detect when virtualenv is checked in and alert user.
-
-
-## v1 (10/01/2011)
-
-* Conception.

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

@@ -1,8 +1,10 @@
-Heroku buildpack: Python
-========================
+# Heroku buildpack: Python
+![python-banner](https://cloud.githubusercontent.com/assets/51578/8914205/ecf2047c-346b-11e5-98c5-42547f9f4410.jpg)
 
 This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [pip](http://www.pip-installer.org/).
 
+This buildpack supports running Django and Flask apps.
+
 
 Usage
 -----
@@ -17,7 +19,7 @@ Example usage:
     $ git push heroku master
     ...
     -----> Python app detected
-    -----> Installing runtime (python-2.7.8)
+    -----> Installing runtime (python-2.7.11)
     -----> Installing dependencies using pip
            Downloading/unpacking requests (from -r requirements.txt (line 1))
            Installing collected packages: requests
@@ -28,7 +30,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 buildpacks: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 +42,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.5.0
 
 Runtime options include:
 
-- python-2.7.8
-- python-3.4.2
-- pypy-2.4.0 (unsupported, experimental)
+- python-2.7.11
+- python-3.5.1
+- pypy-4.0.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

@@ -7,6 +7,8 @@
 # Fail fast and fail hard.
 set -eo pipefail
 
+[ "$BUILDPACK_XTRACE" ] && set -o xtrace
+
 # Prepend proper path for virtualenv hackery. This will be deprecated soon.
 export PATH=:/usr/local/bin:$PATH
 
@@ -17,20 +19,18 @@ BUILD_DIR=$1
 CACHE_DIR=$2
 ENV_DIR=$3
 
-
-CACHED_DIRS=".heroku"
-
 # Static configurations for virtualenv caches.
 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_VERSION="python-2.7.11"
 DEFAULT_PYTHON_STACK="cedar"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="6.0.6"
-SETUPTOOLS_VERSION="11.3.1"
+PIP_VERSION="8.0.2"
+SETUPTOOLS_VERSION="19.6"
+
+# Common Problem Warnings
+export WARNINGS_LOG=$(mktemp)
 
 # Setup bpwatch
 export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
@@ -55,36 +55,47 @@ TMP_APP_DIR=$CACHE_DIR/tmp_app_dir
 
 bpwatch start compile
 
-
-# We'll need to send these statics to other scripts we `source`.
-export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH
-
 # Syntax sugar.
 source $BIN_DIR/utils
 
+# Import collection of warnings.
+source $BIN_DIR/warnings
+
 # Directory Hacks for path consistiency.
 APP_DIR='/app'
 TMP_APP_DIR=$CACHE_DIR/tmp_app_dir
 
-# Copy Anvil app dir to temporary storage...
-bpwatch start anvil_appdir_stage
+# Skip these steps for Docker.
+if [[ ! "$DOCKER_BUILD" ]]; then
+
+  # Copy Anvil app dir to temporary storage...
+  bpwatch start anvil_appdir_stage
   if [ "$SLUG_ID" ]; then
     mkdir -p $TMP_APP_DIR
     deep-mv $APP_DIR $TMP_APP_DIR
   else
     deep-rm $APP_DIR
   fi
-bpwatch stop anvil_appdir_stage
+  bpwatch stop anvil_appdir_stage
+
+  # Copy Application code in.
+  bpwatch start appdir_stage
+    deep-cp $BUILD_DIR $APP_DIR
+  bpwatch stop appdir_stage
+fi
 
-# Copy Application code in.
-bpwatch start appdir_stage
-  deep-mv $BUILD_DIR $APP_DIR
-bpwatch stop appdir_stage
 
 # Set new context.
 ORIG_BUILD_DIR=$BUILD_DIR
 BUILD_DIR=$APP_DIR
 
+# Set up outputs under new context
+PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
+WEBCONCURRENCY_PROFILE_PATH="$BUILD_DIR/.profile.d/python.webconcurrency.sh"
+
+# We'll need to send these statics to other scripts we `source`.
+export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH
+
 # Prepend proper path buildpack use.
 export PATH=$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH
 export PYTHONUNBUFFERED=1
@@ -98,6 +109,12 @@ export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/ven
 # Switch to the repo's context.
 cd $BUILD_DIR
 
+# Warn for lack of Procfile.
+if [[ ! -f Procfile ]]; then
+  puts-warn 'Warning: Your application is missing a Procfile. This file tells Heroku how to run your application.'
+  puts-warn 'Learn more: https://devcenter.heroku.com/articles/procfile'
+fi
+
 # Experimental pre_compile hook.
 bpwatch start pre_compile
   source $BIN_DIR/steps/hooks/pre_compile
@@ -108,6 +125,7 @@ if [ ! -f requirements.txt ]; then
   echo "-e ." > requirements.txt
 fi
 
+
 # Sticky runtimes.
 if [ -f $CACHE_DIR/.heroku/python-version ]; then
   DEFAULT_PYTHON_VERSION=$(cat $CACHE_DIR/.heroku/python-version)
@@ -136,9 +154,14 @@ bpwatch stop clear_old_venvs
 
 # Restore old artifacts from the cache.
 bpwatch start restore_cache
-  for dir in $CACHED_DIRS; do
-    cp -R $CACHE_DIR/$dir . &> /dev/null || true
-  done
+    mkdir -p .heroku
+
+    cp -R $CACHE_DIR/.heroku/python .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/python-stack .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/python-version .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/vendor .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/venv .heroku/ &> /dev/null || true
+
 bpwatch stop restore_cache
 
 set +e
@@ -166,6 +189,9 @@ source $BIN_DIR/steps/pylibmc
 # Libffi support.
 source $BIN_DIR/steps/cryptography
 
+# GDAL support.
+source $BIN_DIR/steps/gdal
+
 # Install dependencies with Pip.
 source $BIN_DIR/steps/pip-install
 
@@ -197,21 +223,36 @@ bpwatch stop post_compile
 
 # Store new artifacts in cache.
 bpwatch start dump_cache
-  for dir in $CACHED_DIRS; do
-    rm -rf $CACHE_DIR/$dir
-    cp -R $dir $CACHE_DIR/
-  done
+
+  rm -rf $CACHE_DIR/.heroku/python
+  rm -rf $CACHE_DIR/.heroku/python-version
+  rm -rf $CACHE_DIR/.heroku/python-stack
+  rm -rf $CACHE_DIR/.heroku/vendor
+  rm -rf $CACHE_DIR/.heroku/venv
+
+  mkdir -p $CACHE_DIR/.heroku
+  cp -R .heroku/python $CACHE_DIR/.heroku/
+  cp -R .heroku/python-version $CACHE_DIR/.heroku/
+  cp -R .heroku/python-stack $CACHE_DIR/.heroku/ &> /dev/null || true
+  cp -R .heroku/vendor $CACHE_DIR/.heroku/ &> /dev/null || true
+  cp -R .heroku/venv $CACHE_DIR/.heroku/ &> /dev/null || true
+
 bpwatch stop dump_cache
 
 # ### Fin.
-bpwatch start appdir_commit
-  deep-mv $BUILD_DIR $ORIG_BUILD_DIR
-bpwatch stop appdir_commit
+if [[ ! "$DOCKER_BUILD" ]]; then
 
-bpwatch start anvil_appdir_commit
+  bpwatch start appdir_commit
+    deep-rm $ORIG_BUILD_DIR
+    deep-mv $BUILD_DIR $ORIG_BUILD_DIR
+  bpwatch stop appdir_commit
+
+  bpwatch start anvil_appdir_commit
   if [ "$SLUG_ID" ]; then
     deep-mv $TMP_APP_DIR $APP_DIR
   fi
 
-bpwatch stop anvil_appdir_commit
-bpwatch stop compile
+  bpwatch stop anvil_appdir_commit
+  bpwatch stop compile
+fi
+

bin/release

@@ -18,6 +18,6 @@ if [[ $MANAGE_FILE ]]; then
 cat <<EOF
 
 addons:
-  heroku-postgresql:hobby-dev
+  - heroku-postgresql
 EOF
 fi

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

@@ -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 PyOpenSSL &> /dev/null) then
+if (pip-grep -s requirements.txt bcrypt cffi cryptography pyOpenSSL PyOpenSSL requests[security] &> /dev/null) then
 
   if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
     export LIBFFI=$(pwd)/vendor

bin/steps/gdal

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# This script serves as the GDAL 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_GDAL="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/gdal.tar.gz"
+
+PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+bpwatch start gdal_install
+
+# If GDAL exists within requirements, use vendored gdal.
+if (pip-grep -s requirements.txt GDAL &> /dev/null) then
+
+  if [ -f ".heroku/vendor/bin/gdalserver" ]; then
+    export GDAL=$(pwd)/vendor
+  else
+    echo "-----> Noticed GDAL. Bootstrapping gdal."
+    mkdir -p .heroku/vendor
+    # Download and extract cryptography into target vendor directory.
+    curl $VENDORED_GDAL -s | tar zxv -C .heroku/vendor &> /dev/null
+
+    export GDAL=$(pwd)/vendor
+  fi
+fi
+
+bpwatch stop gdal_install

bin/steps/pip-install

@@ -4,7 +4,17 @@ puts-step "Installing dependencies with pip"
 [ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
 [ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
 
-/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --allow-all-external  | cleanup | indent
+set +e
+/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir | cleanup | log-output | indent
+PIP_STATUS="${PIPESTATUS[0]}"
+set -e
+
+if [[ ! $PIP_STATUS -eq 0 ]]; then
+    echo
+    show-warnings
+    exit 1
+fi
+
 
 # Smart Requirements handling
 cp requirements.txt .heroku/python/requirements-declared.txt

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 wheel > .heroku/python/requirements-stale.txt
 
   rm -fr requirements-declared.txt
 

bin/utils

@@ -11,6 +11,16 @@ indent() {
   sed "s/^/       /"
 }
 
+# Log output for warning detection
+log-output() (
+  while read LINE;
+  do
+    echo "$LINE"
+    echo "$LINE" >> "$WARNINGS_LOG"
+  done
+
+)
+
 # Clean up pip output
 cleanup() {
   sed -e 's/\.\.\.\+/.../g' | sed -e '/already satisfied/Id' | sed -e '/Overwriting/Id' | sed -e '/python executable/Id' | sed -e '/no previously-included files/Id'
@@ -36,7 +46,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 +78,7 @@ deep-rm() {
   # subshell to avoid surprising caller with shopts.
   (
     shopt -s dotglob
-    rm -rf "$1"/!(tmp|.|..)
+    rm -rf "$1"/!(.curlrc|.netrc|tmp|.|..)
   )
 }
 
@@ -91,3 +101,4 @@ sub-env() {
 
   )
 }
+

bin/warnings

@@ -0,0 +1,35 @@
+shopt -s extglob
+
+pylibmc-missing() {
+  if grep -qi 'fatal error: libmemcached/memcached.h: No such file or directory' "$WARNINGS_LOG"; then
+    puts-warn "Hello! There was a problem with your build related to libmemcache."
+    puts-warn "The Python library 'pylibmc' must be explicitly specified in 'requirements.txt' in order to build correctly."
+    puts-warn "Once you do that, everything should work as expected.   -- Much Love, Heroku."
+  fi
+}
+
+scipy-included() {
+  if grep -qi 'running setup.py install for scipy' "$WARNINGS_LOG"; then
+    puts-warn "Hello! It looks like you're trying to use scipy on Heroku."
+    puts-warn "Unfortunately, at this time, we do not directly support this library."
+    puts-warn "There is, however, a buildpack available that makes it possible to use it on Heroku."
+    puts-warn "You can learn more here:  https://devcenter.heroku.com/articles/python-c-deps"
+    puts-warn "Sorry for the inconvenience.   -- Much Love, Heroku."
+  fi
+}
+
+distribute-included() {
+  if grep -qi 'Running setup.py install for distribute' "$WARNINGS_LOG"; then
+    puts-warn "Hello! Your requirements.txt file contains the distribute package."
+    puts-warn "This library is automatically installed by Heroku and shouldn't be in"
+    puts-warn "Your requirements.txt file. This can cause unexpected behavior."
+    puts-warn "-- Much Love, Heroku."
+  fi
+}
+
+show-warnings() {
+  pylibmc-missing
+  scipy-included
+  distribute-included
+}
+

builds/libraries/vendor/gdal

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/vendor/
+
+OUT_PREFIX=$1
+
+# Use new path, containing autoconf.
+export PATH="/app/.heroku/python/bin/:$PATH"
+hash -r
+
+
+echo "Building gdal..."
+
+SOURCE_TARBALL='http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.gz'
+
+curl -L $SOURCE_TARBALL | tar zx
+
+cd gdal-1.11.0
+./configure --prefix=$OUT_PREFIX  &&
+make
+make install
+
+# Cleanup
+cd ..

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

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

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

builds/runtimes/python-2.7.10

@@ -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.10/Python-2.7.10.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.7.10 src
+cd src
+
+./configure --prefix=$OUT_PREFIX  --with-ensurepip=no
+make
+make install

builds/runtimes/python-2.7.11

@@ -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.11/Python-2.7.11.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.7.11 src
+cd src
+
+./configure --prefix=$OUT_PREFIX  --with-ensurepip=no
+make
+make install

builds/runtimes/python-2.7.11rc1

@@ -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://www.python.org/ftp/python/2.7.11/Python-2.7.11rc1.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.7.11rc1 src
+cd src
+
+./configure --prefix=$OUT_PREFIX  --with-ensurepip=no
+make
+make install

builds/runtimes/python-3.5.0

@@ -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.5.0/Python-3.5.0.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.5.0 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.5.1

@@ -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.5.1/Python-3.5.1.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.5.1 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:
@@ -41,7 +41,7 @@ class Requirements(object):
                 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': []}
@@ -55,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.
@@ -67,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
@@ -76,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)
@@ -87,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']:
@@ -106,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/python.webconcurrency.sh

@@ -12,10 +12,16 @@ case $(ulimit -u) in
   export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4}
   ;;
 
+# IX DYNO
+16384)
+  export DYNO_RAM=2560
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-8}
+  ;;
+
 # PX DYNO
 32768)
-  export DYNO_RAM=6144
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-9}
+  export DYNO_RAM=6656
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-11}
   ;;
 
 esac