support for cryptography!

commit 60a2a9d0720693b9438b0f1c75f570dc96bf3a4b
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:58:29 2014 -0400

    silent mode

commit 20368e741993a2c96739aa1de457618a5272bfe7
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:56:00 2014 -0400

    pylibmc

commit 8a512995d806ad58e4a8cab9cd712e762277dcf3
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:55:25 2014 -0400

    fix for pip-grep

commit 0b83a0ac11ee67f08dc843b01ecfe72c9b9c2938
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:50:35 2014 -0400

    cat that shit

commit 27095d320f4e6c0a6bccec945efbdb6f09598cfc
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:49:11 2014 -0400

    don't silence the output

commit db15ac279169467e1e78cfcc55cb740660d4b4c9
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:46:55 2014 -0400

    hello

commit 6b851815b07331bf185f218c40d62123df048b7b
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:41:37 2014 -0400

    cleanup

commit b2ccf76ccb244976e5ee71164cfe591925cb13a4
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:41:14 2014 -0400

    remove last debugging statement

commit fdcb7a210327f01fdc49dba00c3928cbb4778c72
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:39:10 2014 -0400

    remove debugging statements

commit dd58a898e4e5244f3b78ce0402537a1b730a3cc3
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:36:02 2014 -0400

    bp watch

commit c722f6e964b2a25f91d153c65f0c473ff22ff4c8
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:34:34 2014 -0400

    install finished

commit 81644ba1956798c06f55a8ce4c86239ca4ee8036
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Fri Aug 1 14:33:04 2014 -0400

    install started

commit 62d0e3b81a5ac25e8ceab735e25cf2bb8d161f0b
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 14:54:59 2014 -0400

    debug

commit 1775a1b206780fd99d013ca7c0cb8d8de17a8461
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 13:01:15 2014 -0400

    test0

commit 3d20cf89ae0f9436a54c456779a544a3b9d226ac
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:57:07 2014 -0400

    test2/2

commit 751d7496893bc84430a93cd479511786bce9abb9
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:50:11 2014 -0400

    silent mode

commit f927b7b3dee18c6ee58b36a3f96ad66e53b8d46d
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:44:58 2014 -0400

    pylibmc with pip-grep

commit 00dfc36701bf72191f0ad7b7d5533ba7a9ac3b10
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:41:11 2014 -0400

    no debug echo

commit 38d78d800583fc89100cadc551ce715c5800f0b8
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:40:06 2014 -0400

    source, not subenv

commit f455de19a8c1150aa2a4df164b90c2dc9a195942
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:36:35 2014 -0400

    don't print "installing dependencies with pip" twice

commit e72ed7ddbafa0722d2ac6f0cdaf4ac4d0ca0f634
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:35:47 2014 -0400

    refactor

commit 64819d9fd7ac042ef56499750b47214eb863f8d2
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:24:26 2014 -0400

    pip-grep

commit 5e075dd7dbeda9084ea7ce0151dc17924251c258
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Thu Jul 31 12:24:13 2014 -0400

    no more travis

commit bc9baba04436dc7b8aefeaee24e820a9720ee9e8
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 13:32:40 2014 -0400

    if not requirement

commit 0918d781e50e6190d1045c19c5c5a37e00d669dc
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 13:28:28 2014 -0400

    only use requirments that are truthy

commit 4f0f750407eae6bc7faea50c7b607a10a11ad1c5
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 13:25:15 2014 -0400

    new version of pip-diff

commit d13b397a21733d0a0a5e31c4995dc6a3b65cd977
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 13:12:23 2014 -0400

    ignore errors for pip-diff

commit bb09fb0d5051f69a35e086030b11fd39d1539f84
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 12:55:55 2014 -0400

    uninstall the packages

commit 29b2e1f2dbe7761e3f7f55827d0adcd0025aeb4b
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 12:47:21 2014 -0400

    maybe this one should be relative

commit 2448558624fdce634350e904eaad5fd3aa725c22
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 12:44:04 2014 -0400

    docopt

commit 47010d297330869516f6add46ace97a41cdccb8d
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 29 12:40:36 2014 -0400

    first pass at pip-pop integration

commit 59ac5912e1322be771d1969687891ebeb9f4b5f0
Author: Kenneth Reitz <me@kennethreitz.com>
Date:   Tue Jul 22 14:42:08 2014 -0400

    copy requirements

.travis.yml

@@ -1,6 +0,0 @@
-language: python
-python:
-  - 2.7
-script: make tests
-notifications:
-  email: false

LICENSE

@@ -1,6 +1,6 @@
 MIT License:
 
-Copyright (C) 2012 Heroku, Inc.
+Copyright (C) 2013 Heroku, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -1,21 +1,5 @@
+# These targets are not files
+.PHONY: tests
+
 tests:
 	./bin/test
-
-docs:
-	mkdir -p site
-	shocco -t 'Python Buildpack Compiler' ./bin/compile > site/index.html
-	shocco -t 'Django Buildpack Compiler' ./bin/steps/django > site/django.html
-	shocco -t 'Python Buildpack Detector' ./bin/detect > site/detect.html
-	shocco -t 'Pylibmc Buildpack Compiler' ./bin/steps/pylibmc > site/pylibmc.html
-	shocco -t 'Python Buildpack Changelog' ./Changelog.md > site/changelog.html
-
-site: docs
-	cd site && git add -A && git commit -m 'update' && git push heroku master
-
-pip:
-	git clone git@github.com:kennethreitz/pip.git --branch heroku --depth 1
-	rm -fr vendor/virtualenv-1.8.4/virtualenv_support/pip-1.2.1.tar.gz
-	rm -fr pip/.git
-	tar -pczf vendor/virtualenv-1.8.4/virtualenv_support/pip-1.2.1.tar.gz pip
-	rm -fr pip
-

Readme.md

@@ -1,10 +1,8 @@
 Heroku buildpack: Python
 ========================
 
-This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) for Python apps.
+This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [pip](http://www.pip-installer.org/).
-It uses [virtualenv](http://www.virtualenv.org/) and [pip](http://www.pip-installer.org/).
 
-[![Build Status](https://secure.travis-ci.org/heroku/heroku-buildpack-python.png?branch=master)](http://travis-ci.org/heroku/heroku-buildpack-python)
 
 Usage
 -----
@@ -14,36 +12,40 @@ Example usage:
     $ ls
     Procfile  requirements.txt  web.py
 
-    $ heroku create --stack cedar --buildpack git://github.com/heroku/heroku-buildpack-python.git
+    $ heroku create --buildpack git://github.com/heroku/heroku-buildpack-python.git
 
     $ git push heroku master
     ...
-    -----> Heroku receiving push
-    -----> Fetching custom build pack... done
     -----> Python app detected
-    -----> Preparing virtualenv version 1.6.4
+    -----> Installing runtime (python-2.7.8)
-           New python executable in ./bin/python
+    -----> Installing dependencies using pip
-           Installing setuptools............done.
+           Downloading/unpacking requests (from -r requirements.txt (line 1))
-           Installing pip...............done.
+           Installing collected packages: requests
-    -----> Installing dependencies using pip version 1.0.2
+           Successfully installed requests
-           Downloading/unpacking Flask==0.7.2 (from -r requirements.txt (line 1))
-           Downloading/unpacking Werkzeug>=0.6.1 (from Flask==0.7.2->-r requirements.txt (line 1))
-           Downloading/unpacking Jinja2>=2.4 (from Flask==0.7.2->-r requirements.txt (line 1))
-           Installing collected packages: Flask, Werkzeug, Jinja2
-           Successfully installed Flask Werkzeug Jinja2
            Cleaning up...
+    -----> Discovering process types
+           Procfile declares types -> (none)
 
 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
 
-The buildpack will detect your app as Python if it has the file `requirements.txt` in the root. It will detect your app as Python/Django if there is an additional `settings.py` in a project subdirectory.
+The buildpack will detect your app as Python if it has the file `requirements.txt` in the root.
 
-It will use virtualenv and pip to install your dependencies, vendoring a copy of the Python runtime into your slug.  The `bin/`, `include/` and `lib/` directories will be cached between builds to allow for faster pip install time.
+It will use Pip to install your dependencies, vendoring a copy of the Python runtime into your slug.
 
-Hacking
+Specify a Runtime
--------
+-----------------
 
-To use this buildpack, fork it on Github.  Push up changes to your fork, then create a test app with `--buildpack <your-github-url>` and push to it.
+You can also provide arbitrary releases Python with a `runtime.txt` file.
 
-To change the vendored virtualenv, unpack the desired version to the `src/` folder, and update the virtualenv() function in `bin/compile` to prepend the virtualenv module directory to the path. The virtualenv release vendors its own versions of pip and setuptools.
+    $ cat runtime.txt
+    python-3.4.1
+
+Runtime options include:
+
+- python-2.7.8
+- python-3.4.1
+- pypy-1.9 (experimental)
+
+Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well.

bin/compile

@@ -1,33 +1,8 @@
 #!/usr/bin/env bash
 
-# This script serves as the
+# Usage:
-# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
-# compiler.
 #
-# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an
+#     $ bin/compile <build-dir> <cache-dir> <env-path>
-# adapter between a Python application and Heroku's runtime.
-#
-# You can intreract with the Heroku API directly with [heroku.py](https://github.com/heroku/heroku.py/).
-#
-# See also: [Release history](/changelog.html), [Detection](/detect.html).
-#
-# ## Usage
-# Compiling an app into a slug is simple:
-#
-#     $ bin/compile <build-dir> <cache-dir>
-
-
-# ## Assumptions
-#
-# This buildpack makes the following assumptions:
-#
-# - The desired Python VM is available on the base system.
-# - Library dependencies are available on the base system.
-# - Django applications should not require any platform-specific configuration.
-
-# <hr />
-
-# ## Context
 
 # Fail fast and fail hard.
 set -eo pipefail
@@ -40,186 +15,196 @@ BIN_DIR=$(cd $(dirname $0); pwd) # absolute path
 ROOT_DIR=$(dirname $BIN_DIR)
 BUILD_DIR=$1
 CACHE_DIR=$2
+ENV_DIR=$3
 
-# The detected application type (`Python`|`Python/Django`).
-NAME=$($BIN_DIR/detect $BUILD_DIR)
 
-# Where to store the Pip download cache.
 CACHED_DIRS=".heroku"
-PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-$CACHE_DIR/pip_downloads}
 
 # Static configurations for virtualenv caches.
-LEGACY_VIRTUALENV_LOC="."
+VIRTUALENV_LOC=".heroku/venv"
-MODERN_VIRTUALENV_LOC=".heroku/venv"
+LEGACY_TRIGGER="lib/python2.7"
-LEGACY_VIRTUALENV_DIRS="bin include lib"
+PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
-LEGACY_VIRTUALENV_TRIGGER="lib/python2.7"
-PROFILE_PATH="$1/.profile.d/python.sh"
 
+DEFAULT_PYTHON_VERSION="python-2.7.8"
+DEFAULT_PYTHON_STACK="cedar"
+PYTHON_EXE="/app/.heroku/python/bin/python"
+PIP_VERSION="1.5.6"
+SETUPTOOLS_VERSION="5.4.1"
 
-# Python version. This will be used in the future to specify custom Pythons.
+# Setup bpwatch
-PYTHON_VERSION="2.7.2"
+export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
-PYTHON_EXE="python2.7"
+LOGPLEX_KEY="t.b90d9d29-5388-4908-9737-b4576af1d4ce"
+export BPWATCH_STORE_PATH=$CACHE_DIR/bpwatch.json
+BUILDPACK_VERSION=v28
+
+# Setup pip-pop (pip-diff)
+export PATH=$PATH:$ROOT_DIR/vendor/pip-pop
+
+# Support Anvil Build_IDs
+[ ! "$SLUG_ID" ] && SLUG_ID="defaultslug"
+[ ! "$REQUEST_ID" ] && REQUEST_ID=$SLUG_ID
+[ ! "$STACK" ] && STACK=$DEFAULT_PYTHON_STACK
 
 # Sanitizing environment variables.
 unset GIT_DIR PYTHONHOME PYTHONPATH LD_LIBRARY_PATH LIBRARY_PATH
 
-# We'll need to send these statics to other scripts we `source`.
+bpwatch init $LOGPLEX_KEY
-export PIP_DOWNLOAD_CACHE BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH
+bpwatch build python $BUILDPACK_VERSION $REQUEST_ID
+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
 
-# ## Build Time
+# 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
+  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
+
+# 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
+
+# Prepend proper path buildpack use.
+export PATH=$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH
+export PYTHONUNBUFFERED=1
+export LANG=en_US.UTF-8
+export C_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include
+export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include
+export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib
+export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib
+export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config
 
 # Switch to the repo's context.
 cd $BUILD_DIR
 
 # Experimental pre_compile hook.
-source $BIN_DIR/steps/hooks/pre_compile
+bpwatch start pre_compile
-
+  source $BIN_DIR/steps/hooks/pre_compile
-# ### Sanity Checks
+bpwatch stop pre_compile
-#
-# Just a little peace of mind.
 
 # If no requirements given, assume `setup.py develop`.
 if [ ! -f requirements.txt ]; then
-  puts-step "No requirements.txt provided; assuming dist package."
   echo "-e ." > requirements.txt
 fi
 
+# Sticky runtimes.
+if [ -f $CACHE_DIR/.heroku/python-version ]; then
+  DEFAULT_PYTHON_VERSION=$(cat $CACHE_DIR/.heroku/python-version)
+fi
+
+# Stack fallback for non-declared caches.
+if [ -f $CACHE_DIR/.heroku/python-stack ]; then
+  CACHED_PYTHON_STACK=$(cat $CACHE_DIR/.heroku/python-stack)
+else
+  CACHED_PYTHON_STACK=$DEFAULT_PYTHON_STACK
+fi
+
+# If no runtime given, assume default version.
+if [ ! -f runtime.txt ]; then
+  echo $DEFAULT_PYTHON_VERSION > runtime.txt
+fi
+
 # ### The Cache
 mkdir -p $CACHE_DIR
-[ ! "$(ls -A $CACHE_DIR)" ] && export FRESH_APP=1
 
-
+# Purge "old-style" virtualenvs.
-# Nice defaults.
+bpwatch start clear_old_venvs
-VIRTUALENV_LOC=$MODERN_VIRTUALENV_LOC
+  [ -d $CACHE_DIR/$LEGACY_TRIGGER ] && rm -fr $CACHE_DIR/.heroku/bin $CACHE_DIR/.heroku/lib $CACHE_DIR/.heroku/include
-VIRTUALENV_DIRS=$MODERN_VIRTUALENV_LOC
+  [ -d $CACHE_DIR/$VIRTUALENV_LOC ] && rm -fr $CACHE_DIR/.heroku/venv $CACHE_DIR/.heroku/src
-
+bpwatch stop clear_old_venvs
-# Support "old-style" virtualenvs.
-if [ -d $CACHE_DIR/$LEGACY_VIRTUALENV_TRIGGER ]; then
-  LEGACY_VIRTUALENV=true
-  VIRTUALENV_LOC=$LEGACY_VIRTUALENV_LOC
-  VIRTUALENV_DIRS=$LEGACY_VIRTUALENV_DIRS
-  CACHED_DIRS=$LEGACY_VIRTUALENV_DIRS
-
-  # Warn for a checked-in virtualenv.
-  if [ -d "lib" ] || [ -d "bin" ]; then
-    puts-warn "You have a virtualenv checked in. You should ignore the appropriate paths in your repo. See http://devcenter.heroku.com/articles/gitignore for more info.";
-  fi
-
-  # Reject a conflicting checked-in virtualenv.
-  if [ -f "lib/python2.7" ]; then
-    puts-warn "Checked-in virtualenv conflict."
-    exit 1;
-  fi
-fi
 
 # Restore old artifacts from the cache.
-for dir in $CACHED_DIRS; do
+bpwatch start restore_cache
-  cp -R $CACHE_DIR/$dir . &> /dev/null || true
+  for dir in $CACHED_DIRS; do
-done
+    cp -R $CACHE_DIR/$dir . &> /dev/null || true
+  done
+bpwatch stop restore_cache
 
 set +e
 # Create set-aside `.heroku` folder.
 mkdir .heroku &> /dev/null
-HEROKU_DIR_STATUS=$?
-
-# TODO: This is a new app, disable injection.
-# [ $HEROKU_DIR_STATUS -eq 0 ] && {
-  # TODO: touch .heroku/injection_disabled
-# }
 set -e
 
-# Buildpack profile init script
 mkdir -p $(dirname $PROFILE_PATH)
 
-# ### Virtualenv Setup
+# Install Python.
-#
+source $BIN_DIR/steps/python
 
-# Create the virtualenv. Rebuild if corrupt.
+# Uninstall removed dependencies with Pip.
-# TODO: Bootstrap a bottled Python VM...
+source $BIN_DIR/steps/pip-uninstall
 
-set +e
+# Mercurial support.
-puts-step "Preparing Python interpreter ($PYTHON_VERSION)"
+source $BIN_DIR/steps/mercurial
-puts-step "Creating Virtualenv ($(virtualenv --version))"
-
-# Try to create the virtualenv.
-OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download --prompt='(venv) ' $VIRTUALENV_LOC 2>&1)
-
-[ $? -ne 0 -o -n "$CLEAN_VIRTUALENV" ] && {
-  if [ -n "$CLEAN_VIRTUALENV" ]
-    then echo " !     CLEAN_VIRTUALENV set, rebuilding virtualenv."
-    else echo " !     Virtualenv corrupt, rebuilding."
-  fi
-  for dir in $VIRTUALENV_DIRS; do
-    rm -fr $dir &> /dev/null || true
-  done
-  OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download  --prompt='(venv) ' $VIRTUALENV_LOC )
-}
-echo "$OUT"  | cleanup | indent
-
-set -e
 
 # Pylibmc support.
-# See [`bin/steps/pylibmc`](pylibmc.html).
 source $BIN_DIR/steps/pylibmc
 
-# Activate the Virtualenv.
+# Libffi support.
-source $VIRTUALENV_LOC/bin/activate
+source $BIN_DIR/steps/cryptography
-
-# Install Mercurial if it appears to be required.
-if (grep -Fiq "hg+" requirements.txt) then
-  pip install --use-mirrors mercurial | cleanup | indent
-fi
 
 # Install dependencies with Pip.
-puts-step "Installing dependencies using pip ($(pip --version | awk '{print $2}'))"
+source $BIN_DIR/steps/pip-install
-pip install --use-mirrors -r requirements.txt --exists-action=w --src=./.heroku/src | cleanup | indent
 
-# Do additional application hackery if applications appears to be a Django app.
+# Django collectstatic support.
-# Optionally, disable all Django-specific changes with `DISABLE_INJECTION` env.
+sub-env $BIN_DIR/steps/collectstatic
-#
-# See [`bin/steps/django`](django.html).
 
-if [ "$NAME" = "Python/Django" ]; then
-  source $BIN_DIR/steps/django/init
-fi
-
-# Make Virtualenv's paths relative for portability.
-set +e
-OUT=$(virtualenv --python $PYTHON_EXE  --relocatable $VIRTUALENV_LOC)
-[ $? -ne 0 ] && {
-  puts-warn "Error making virtualenv relocatable"
-  echo "$OUT" | indent
-  exit 1
-}
-set -e
 
 # ### Finalize
 #
 
-# Store new artifacts in cache.
-for dir in $CACHED_DIRS; do
-  rm -rf $CACHE_DIR/$dir
-  cp -R $dir $CACHE_DIR/
-done
-
 # Set context environment variables.
-if [ ! -n "$LEGACY_VIRTUALENV" ]; then
+set-env PATH '$HOME/.heroku/python/bin:$PATH'
-  set-env PATH '$HOME/.heroku/venv/bin:$PATH'
+set-env PYTHONUNBUFFERED true
-  set-default-env PYTHONUNBUFFERED true
+set-env PYTHONHOME /app/.heroku/python
-  set-default-env LIBRARY_PATH /app/.heroku/vendor/lib
+set-env LIBRARY_PATH /app/.heroku/vendor/lib:/app/.heroku/python/lib
-  set-default-env LD_LIBRARY_PATH /app/.heroku/vendor/lib
+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 LANG en_US.UTF-8
-  set-default-env PYTHONHASHSEED random
+set-default-env PYTHONHASHSEED random
-  set-default-env PYTHONHOME /app/.heroku/venv/
+set-default-env PYTHONPATH /app/
-  set-default-env PYTHONPATH /app/
-fi
 
-# ### Fin.
 
 # Experimental post_compile hook.
-source $BIN_DIR/steps/hooks/post_compile
+bpwatch start post_compile
+  source $BIN_DIR/steps/hooks/post_compile
+bpwatch stop post_compile
 
-# <a href="http://github.com/heroku/heroku-buildpack-python"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://d3nwyuy0nl342s.cloudfront.net/img/7afbc8b248c68eb468279e8c17986ad46549fb71/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub"></a>
+# 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
+bpwatch stop dump_cache
+
+# ### Fin.
+bpwatch start appdir_commit
+  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

bin/detect

@@ -19,46 +19,4 @@ if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ]; then
   exit 1
 fi
 
-# If only `setup.py`, assume that the app is not Django.
+echo Python
-if [ ! -f $BUILD_DIR/requirements.txt ]; then
-  echo Python
-  exit 0
-fi
-
-# `Python/Django` if `**/settings.py` is present and `django` exists in
-# `requirements.txt`.
-#
-# Otherwise, `Python`.
-
-array=""
-list_requirements() {
-IFS_BAK=$IFS
-IFS="
-"
-    requirement_file=$1
-    reqs=$(cat $requirement_file)
-    for req in $reqs; do
-        if [[ $req == -r* ]]; then
-            new_req=$(echo $req | cut -d" " -f2)
-            if [[ $new_req == $1 ]]; then
-                continue
-            fi
-            directory=$(dirname $requirement_file)
-            if [[ ! $array == *$directory/$new_req* ]]; then
-                list_requirements "$directory/$new_req"
-            fi
-            array="$array $directory/$new_req"
-        else
-            echo $req;
-        fi
-
-    done
-IFS=$IFS_BAK
-IFS_BAK=
-}
-
-
-SETTINGS_FILE=$(find $BUILD_DIR/. -maxdepth 2 -type f -name 'settings.py' | head -1)
-
-
-[ -n "$SETTINGS_FILE" ] && ( list_requirements $BUILD_DIR/requirements.txt | grep -Fiq "django" ) && echo Python/Django || echo Python

bin/release

@@ -3,33 +3,21 @@
 
 BIN_DIR=$(cd $(dirname $0); pwd) # absolute path
 BUILD_DIR=$1
-NAME=$($BIN_DIR/detect $BUILD_DIR) || exit 1
+
+MANAGE_FILE=$(cd $BUILD_DIR && find . -maxdepth 3 -type f -name 'manage.py' | head -1)
+MANAGE_FILE=${MANAGE_FILE:2}
 
 cat <<EOF
 ---
 config_vars:
-  PATH: /app/.heroku/venv/bin:/bin:/usr/local/bin:/usr/bin
+
-  PYTHONUNBUFFERED: true
-  LIBRARY_PATH: /app/.heroku/vendor/lib
-  LD_LIBRARY_PATH: /app/.heroku/vendor/lib
-  LANG: en_US.UTF-8
-  PYTHONHASHSEED: random
-  PYTHONHOME: /app/.heroku/venv/
-  PYTHONPATH: /app/
 EOF
 
 
-[ "$NAME" = "Python/Django" ] || exit 0
+if [[ $MANAGE_FILE ]]; then
-
-MANAGE_FILE=$(cd $BUILD_DIR && find . -maxdepth 3 -type f -name 'manage.py' | head -1)
-MANAGE_FILE=${MANAGE_FILE:2}
-PROJECT=$(dirname $MANAGE_FILE)
-
 cat <<EOF
 
 addons:
-  shared-database:5mb
+  heroku-postgresql:hobby-dev
-
-default_process_types:
-  web:      python $PROJECT/manage.py runserver 0.0.0.0:\$PORT --noreload
 EOF
+fi

bin/steps/collectstatic

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+source $BIN_DIR/utils
+
+MANAGE_FILE=$(find . -maxdepth 3 -type f -name 'manage.py' | head -1)
+MANAGE_FILE=${MANAGE_FILE:-fakepath}
+
+[ -f .heroku/collectstatic_disabled ] && DISABLE_COLLECTSTATIC=1
+
+bpwatch start collectstatic
+
+if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ]; then
+    set +e
+
+    echo "-----> Preparing static assets"
+    # Check if collectstatic is configured properly.
+    python $MANAGE_FILE collectstatic --dry-run --noinput &> /dev/null && RUN_COLLECTSTATIC=true
+
+    # Compile assets if collectstatic appears to be kosher.
+    if [ "$RUN_COLLECTSTATIC" ]; then
+
+        echo "       Running collectstatic..."
+        python $MANAGE_FILE collectstatic --noinput  2>&1 | sed '/^Copying/d;/^$/d;/^ /d' | indent
+
+        [ $? -ne 0 ] && {
+            echo " !     Error running 'manage.py collectstatic'. More info:"
+            echo "       http://devcenter.heroku.com/articles/django-assets"
+        }
+    else
+        echo "       Collectstatic configuration error. To debug, run:"
+        echo "       $ heroku run python $MANAGE_FILE collectstatic --noinput"
+    fi
+    echo
+fi
+
+bpwatch stop collectstatic

bin/steps/cryptography

@@ -0,0 +1,39 @@
+#!/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="http://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
+
+whereis pkg-config
+
+# If pylibmc exists within requirements, use vendored cryptography.
+if (pip-grep -s requirements.txt cffi pylibmc) 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/django/collectstatic

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-set +e
-
-# Syntax sugar.
-indent() {
-  RE="s/^/       /"
-  [ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE"
-}
-
-
-# Check if collectstatic is configured properly.
-python $MANAGE_FILE collectstatic --dry-run --noinput &> /dev/null && RUN_COLLECTSTATIC=true
-
-# Compile assets if collectstatic appears to be kosher.
-if [ "$RUN_COLLECTSTATIC" ]; then
-
-    echo "-----> Collecting static files"
-    python $MANAGE_FILE collectstatic --noinput  2>&1 | sed '/^Copying/d;/^$/d;/^ /d' | indent
-
-    [ $? -ne 0 ] && {
-        echo " !     Error running manage.py collectstatic. More info:"
-        echo "       http://devcenter.heroku.com/articles/django-assets"
-    }
-fi
-
-echo
-

bin/steps/django/init

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-SETTINGS_FILE=$(find . -maxdepth 3 -type f -name 'settings.py' | head -1)
-PROJECT=$(dirname $SETTINGS_FILE)
-MANAGE_FILE=$(find . -maxdepth 3 -type f -name 'manage.py' | head -1)
-MANAGE_FILE=${MANAGE_FILE:2}
-
-if [ "$FRESH_APP" ]; then
-    # Legacy Django injection for existing applications.
-    touch .heroku/injection_disabled
-fi
-
-# Disable injection for new applications.
-if [ -f .heroku/injection_disabled ]; then
-  DISABLE_INJECTION=1
-fi
-
-if [ -f .heroku/collectstatic_disabled ]; then
-  DISABLE_COLLECTSTATIC=1
-fi
-
-export SETTINGS_FILE MANAGE_FILE PROJECT DISABLE_INJECTION
-
-if [ ! "$DISABLE_INJECTION" ]; then
-    # Legacy Django injection for existing applications.
-    source $BIN_DIR/steps/django/injection
-fi
-
-if [ ! "$DISABLE_COLLECTSTATIC" ]; then
-    source $BIN_DIR/steps/django/collectstatic
-fi
-

bin/steps/django/injection

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-# This script serves as the Django injection 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`](/).
-
-# ## Sanity Checks
-#
-
-# Syntax sugar.
-indent() {
-  RE="s/^/       /"
-  [ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE"
-}
-
-echo "-----> Injecting legacy Django settings..."
-echo " !     WARNING: Settings injection will be fully deprecated on January 1, 2013. More info:"
-echo " !     https://devcenter.heroku.com/articles/django-injection "
-
-
-echo "-----> Installing dj-database-url..."
-pip install --use-mirrors 'dj-database-url>=0.2.0' | indent
-
-SETTINGS_FILE=$(find . -maxdepth 2 -type f -name 'settings.py' | head -1)
-PROJECT=$(dirname $SETTINGS_FILE)
-
-echo "Injecting code into $SETTINGS_FILE to read from DATABASE_URL" | indent
-
-cat >>$SETTINGS_FILE <<EOF
-
-import dj_database_url
-
-if 'DATABASES' not in locals():
-    DATABASES = {}
-
-if not 'default' in DATABASES:
-    DATABASES['default'] = {}
-
-DATABASES['default'].update(dj_database_url.config(default='postgres://'))
-
-EOF
-

bin/steps/hooks/post_compile

@@ -3,5 +3,5 @@
 if [ -f bin/post_compile ]; then
     echo "-----> Running post-compile hook"
     chmod +x bin/post_compile
-    bin/post_compile
+    sub-env bin/post_compile
 fi

bin/steps/hooks/pre_compile

@@ -3,5 +3,5 @@
 if [ -f bin/pre_compile ]; then
     echo "-----> Running pre-compile hook"
     chmod +x bin/pre_compile
-    bin/pre_compile
+    sub-env bin/pre_compile
 fi

bin/steps/mercurial

@@ -0,0 +1,6 @@
+# Install Mercurial if it appears to be required.
+if (grep -Fiq "hg+" requirements.txt) then
+  bpwatch start mercurial_install
+    /app/.heroku/python/bin/pip install  mercurial | cleanup | indent
+  bpwatch stop mercurial_install
+fi

bin/steps/pip-install

@@ -0,0 +1,16 @@
+# Install dependencies with Pip.
+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
+
+# Smart Requirements handling
+cp requirements.txt .heroku/python/requirements-declared.txt
+/app/.heroku/python/bin/pip freeze > .heroku/python/requirements-installed.txt
+
+[ ! "$FRESH_PYTHON" ] && bpwatch stop pip_install
+[ "$FRESH_PYTHON" ] && bpwatch stop pip_install_first
+
+echo

bin/steps/pip-uninstall

@@ -0,0 +1,18 @@
+set +e
+# Install dependencies with Pip.
+bpwatch start pip_uninstall
+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
+
+  rm -fr requirements-declared.txt
+
+  if [[ -s .heroku/python/requirements-stale.txt ]]; then
+    puts-step "Uninstalling stale dependencies"
+    /app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w | cleanup | indent
+  fi
+fi
+bpwatch stop pip_uninstall
+set -e

bin/steps/pylibmc

@@ -1,35 +1,36 @@
 #!/usr/bin/env bash
 
 # This script serves as the Pylibmc build step of the
-# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python) 
+# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
-# compiler. 
+# compiler.
-# 
+#
-# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an 
+# 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 libmemcached binary.
-VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz"
+VENDORED_MEMCACHED="http://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 (grep -Fiq "pylibmc" requirements.txt) then
+if (pip-grep -s requirements.txt pylibmc) then
-  echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
-  cd .heroku
 
-  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
+    curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
-    tar -zxvf tmp-libmemcached.tar.gz > /dev/null
+
-    rm tmp-libmemcached.tar.gz
     export LIBMEMCACHED=$(pwd)/vendor
   fi
-
-  export LIBMEMCACHED=$(pwd)/vendor
-  cd ..
 fi
 
-
+bpwatch stop pylibmc_install
-

bin/steps/python

@@ -0,0 +1,79 @@
+set +e
+PYTHON_VERSION=$(cat runtime.txt)
+
+# Install Python.
+if [ -f .heroku/python-version ]; then
+  if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then
+    bpwatch start uninstall_python
+      puts-step "Found runtime $(cat .heroku/python-version), removing"
+      rm -fr .heroku/python
+    bpwatch stop uninstall_python
+  else
+    SKIP_INSTALL=1
+  fi
+fi
+
+if [ ! $STACK = $CACHED_PYTHON_STACK ]; then
+  bpwatch start uninstall_python
+    puts-step "Stack changed, re-installing runtime"
+    rm -fr .heroku/python
+    unset SKIP_INSTALL
+  bpwatch stop uninstall_python
+fi
+
+
+if [ ! "$SKIP_INSTALL" ]; then
+  bpwatch start install_python
+    puts-step "Installing runtime ($PYTHON_VERSION)"
+
+    # 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
+    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"
+      exit 1
+    fi
+
+  bpwatch stop install_python
+
+  # Record for future reference.
+  echo $PYTHON_VERSION > .heroku/python-version
+  echo $STACK > .heroku/python-stack
+  FRESH_PYTHON=true
+
+  hash -r
+fi
+
+# If Pip isn't up to date:
+if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
+  WORKING_DIR=$(pwd)
+
+  bpwatch start prepare_environment
+
+  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/
+    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/
+    python setup.py install &> /dev/null
+    cd $WORKING_DIR
+
+  bpwatch stop install_pip
+  bpwatch stop prepare_environment
+fi
+
+set -e
+hash -r

bin/test

@@ -2,7 +2,7 @@
 
 #
 # Create a Heroku app with the following buildpack:
-# https://github.com/ddollar/buildpack-tet
+# https://github.com/ddollar/buildpack-test
 #
 # Push this Python buildpack to that Heroku app to
 # run the tests.
@@ -20,15 +20,27 @@ testDetectWithEmptyReqs() {
   assertCapturedSuccess
 }
 
+testDetectDjango16() {
+  detect "django-1.6-skeleton"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectDjango15() {
+  detect "django-1.5-skeleton"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
 testDetectDjango14() {
   detect "django-1.4-skeleton"
-  assertCapturedEquals "Python/Django"
+  assertCapturedEquals "Python"
   assertCapturedSuccess
 }
 
 testDetectDjango13() {
   detect "django-1.3-skeleton"
-  assertCapturedEquals "Python/Django"
+  assertCapturedEquals "Python"
   assertCapturedSuccess
 }
 
@@ -56,6 +68,23 @@ testDetectNotPython() {
   assertEquals "1" "${RETURN}"
 }
 
+testDetectSimpleRuntimePypy2() {
+  detect "simple-runtime-pypy2"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectSimpleRuntimePython2() {
+  detect "simple-runtime-python2"
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
+
+testDetectSimpleRuntimePython3() {
+  detect "simple-runtime"  # should probably be renamed simple-runtime-python3
+  assertCapturedEquals "Python"
+  assertCapturedSuccess
+}
 
 ## utils ########################################
 

bin/utils

@@ -1,35 +1,93 @@
+shopt -s extglob
+
+if [ $(uname) == Darwin ]; then
+    sed() { command sed -l "$@"; }
+else
+    sed() { command sed -u "$@"; }
+fi
+
 # Syntax sugar.
 indent() {
-  RE="s/^/       /"
+  sed "s/^/       /"
-  [ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE"
 }
 
 # 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'
+  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'
-}
-
-# Virtualenv wrapper.
-function virtualenv (){
-  python "$ROOT_DIR/vendor/virtualenv-1.8.4/virtualenv.py" "$@"
 }
 
 # Buildpack Steps.
-function puts-step (){
+puts-step() {
   echo "-----> $@"
 }
 
 # Buildpack Warnings.
-function puts-warn (){
+puts-warn() {
   echo " !     $@"
 }
 
 # Usage: $ set-env key value
-function set-env (){
+set-env() {
   echo "export $1=$2" >> $PROFILE_PATH
 }
 
 # Usage: $ set-default-env key value
-function set-default-env (){
+set-default-env() {
   echo "export $1=\${$1:-$2}" >> $PROFILE_PATH
 }
+
+# Usage: $ set-default-env key value
+un-set-env() {
+  echo "unset $1" >> $PROFILE_PATH
+}
+
+# Does some serious copying.
+deep-cp() {
+  declare source="$1" target="$2"
+
+  mkdir -p "$target"
+
+  # cp doesn't like being called without source params,
+  # so make sure they expand to something first.
+  # subshell to avoid surprising caller with shopts.
+  (
+    shopt -s nullglob dotglob
+    set -- "$source"/!(tmp|.|..)
+    [[ $# == 0 ]] || cp -a "$@" "$target"
+  )
+}
+
+# Does some serious moving.
+deep-mv() {
+  deep-cp "$1" "$2"
+  deep-rm "$1"
+}
+
+# Does some serious deleting.
+deep-rm() {
+  # subshell to avoid surprising caller with shopts.
+  (
+    shopt -s dotglob
+    rm -rf "$1"/!(tmp|.|..)
+  )
+}
+
+
+sub-env() {
+
+  WHITELIST=${2:-''}
+  BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'}
+
+  (
+    if [ -d "$ENV_DIR" ]; then
+      for e in $(ls $ENV_DIR); do
+        echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" &&
+        export "$e=$(cat $ENV_DIR/$e)"
+        :
+      done
+    fi
+
+    $1
+
+  )
+}

builds/README.md

@@ -0,0 +1,31 @@
+# Python Buildpack Binaries
+
+
+To get started with it, create an app on Heroku inside a clone of this repository, and set your S3 config vars:
+
+    $ heroku create --buildpack https://github.com/heroku/heroku-buildpack-python#not-heroku
+    $ heroku config:set WORKSPACE_DIR=builds
+    $ heroku config:set AWS_ACCESS_KEY_ID=<your_aws_key>
+    $ heroku config:set AWS_SECRET_ACCESS_KEY=<your_aws_secret>
+    $ heroku config:set S3_BUCKET=<your_s3_bucket_name>
+
+
+Then, shell into an instance and run a build by giving the name of the formula inside `builds`:
+
+    $ heroku run bash
+    Running `bash` attached to terminal... up, run.6880
+    ~ $ bob build runtimes/python-2.7.6
+
+    Fetching dependencies... found 2:
+      - libraries/sqlite
+
+    Building formula runtimes/python-2.7.6:
+        === Building Python 2.7.6
+        Fetching Python v2.7.6 source...
+        Compiling...
+
+If this works, run `bob deploy` instead of `bob build` to have the result uploaded to S3 for you.
+
+To speed things up drastically, it'll usually be a good idea to `heroku run bash --size PX` instead.
+
+Enjoy :)

builds/libraries/autoconf

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+OUT_PREFIX=$1
+
+echo "Building autoconf..."
+
+
+SOURCE_TARBALL='http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.gz'
+curl -L $SOURCE_TARBALL | tar xz
+
+cd autoconf-2.68
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/libraries/sqlite

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+OUT_PREFIX=$1
+
+echo "Building SQLite..."
+
+
+SOURCE_TARBALL='http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'
+
+curl $SOURCE_TARBALL | tar xz
+# jx
+mv sqlite-autoconf-3070900 sqlite
+
+cd sqlite
+./configure --prefix=$OUT_PREFIX
+make
+make install
+
+# Cleanup
+cd ..
+rm -fr sqlite

builds/libraries/vendor/libffi

@@ -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 libffi..."
+
+SOURCE_TARBALL='http://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/vendor/libmemcache

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/vendor/
+
+OUT_PREFIX=$1
+
+# fail hard
+set -o pipefail
+# fail harder
+set -eux
+
+DEFAULT_VERSION="1.0.18"
+dep_version=${VERSION:-$DEFAULT_VERSION}
+dep_dirname=libmemcached-${dep_version}
+dep_archive_name=${dep_dirname}.tar.gz
+dep_url=https://launchpad.net/libmemcached/1.0/${dep_version}/+download/${dep_archive_name}
+
+# SASL Support.
+echo "-----> Building cyrus-sasl 2.1.26..."
+
+curl -LO ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+# FTP doesn't play well with piping into tar xz
+tar xzf cyrus-sasl-2.1.26.tar.gz
+
+pushd cyrus-sasl-2.1.26
+./configure --prefix=${OUT_PREFIX}
+make -s -j 9
+make install -s
+popd
+
+echo "-----> Building libmemcached ${dep_version}..."
+
+curl -L ${dep_url} | tar xz
+pushd ${dep_dirname}
+CPPFLAGS=-I${OUT_PREFIX}/include LDFLAGS=-L${OUT_PREFIX}/lib ./configure --prefix=${OUT_PREFIX} --without-memcached
+make -s -j 9
+make install -s
+popd
+
+echo "-----> Done."

builds/runtimes/pypy-1.7

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building PyPy..."
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-1.7/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-1.8

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building PyPy..."
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-1.8/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-1.9

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+echo "Building PyPy..."
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy-1.9/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

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

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

builds/runtimes/pypy-2.0.2

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

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

builds/runtimes/pypy-2.2

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

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

builds/runtimes/pypy-2.3

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

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

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

builds/runtimes/python-2.4.4

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.4 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.4.5

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.4 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.4.6

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.4 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.5.0

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.5 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://python.org/ftp/python/2.5/Python-2.5.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.5 src
+cd src
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.5.1

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.5 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.5.2

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.5 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.5.3

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.5 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.5.4

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.5 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.5.5

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.5.6

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.5 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.6.0

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+# NOTICE: This formula only works for the cedar stack, not cedar-14.
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.1

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+# NOTICE: This formula only works for the cedar stack, not cedar-14.
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.2

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.3

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.4

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.5

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.6

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.7

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.8

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.6.9

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+# Build Deps: libraries/sqlite
+
+OUT_PREFIX=$1
+
+# Protect 2.6 builds from parent Python (causes segfault during build).
+unset LANG PYTHONHOME PYTHONPATH
+
+echo "Building Python..."
+SOURCE_TARBALL='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.0

@@ -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='http://python.org/ftp/python/2.7/Python-2.7.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.7 src
+cd src
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.1

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.2

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.3

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.4

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.5

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.6

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.7

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX
+make
+make install

builds/runtimes/python-2.7.7-shared

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install

builds/runtimes/python-2.7.8

@@ -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='http://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
+make
+make install

builds/runtimes/python-2.7.8-shared

@@ -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='http://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
+make
+make install

builds/runtimes/python-3.1.0

@@ -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='http://python.org/ftp/python/3.1/Python-3.1.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.1 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.1.1

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX  --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.1.2

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.1.3

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.1.4

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.1.5

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.2.0

@@ -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='http://python.org/ftp/python/3.2/Python-3.2.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.2 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.2.1

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.2.2

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.2.3

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.2.4

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.2.5

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.3.0

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.3.1

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.3.2

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.3.3

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.3.4

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.3.5

@@ -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='http://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
+
+./configure --prefix=$OUT_PREFIX --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.4.0

@@ -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='http://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
+
+./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.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='http://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
+
+./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
+make
+make install
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
+

requirements.txt

@@ -0,0 +1 @@
+bob-builder==0.0.5

test/distutils/envoy.py

@@ -1,210 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-envoy.core
-~~~~~~~~~~
-
-This module provides envoy awesomeness.
-
-Copyright 2012, Kenneth Reitz.
-MIT Licensed.
-
-"""
-
-import os
-import shlex
-import subprocess
-import threading
-
-
-__version__ = '0.0.2'
-__license__ = 'MIT'
-__author__ = 'Kenneth Reitz'
-
-
-class Command(object):
-    def __init__(self, cmd):
-        self.cmd = cmd
-        self.process = None
-        self.out = None
-        self.err = None
-        self.returncode = None
-        self.data = None
-
-    def run(self, data, timeout, env):
-        self.data = data
-        environ = dict(os.environ).update(env or {})
-
-        def target():
-
-            self.process = subprocess.Popen(self.cmd,
-                universal_newlines=True,
-                shell=False,
-                env=environ,
-                stdin=subprocess.PIPE,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                bufsize=0,
-            )
-
-            self.out, self.err = self.process.communicate(self.data)
-
-        thread = threading.Thread(target=target)
-        thread.start()
-
-        thread.join(timeout)
-        if thread.is_alive():
-            self.process.terminate()
-            thread.join()
-        self.returncode = self.process.returncode
-        return self.out, self.err
-
-
-class ConnectedCommand(object):
-    def __init__(self,
-        process=None,
-        std_in=None,
-        std_out=None,
-        std_err=None):
-
-        self._process = process
-        self.std_in = std_in
-        self.std_out = std_out
-        self.std_err = std_out
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.kill()
-
-    @property
-    def status_code(self):
-        """The status code of the process.
-        If the code is None, assume that it's still running.
-        """
-        if self._status_code is not None:
-            return self._status_code
-
-        # investigate
-        return None
-
-    @property
-    def pid(self):
-        """The process' PID."""
-        return self._process.pid
-
-    def kill(self):
-        """Kills the process."""
-        return self._process.kill()
-
-    def expect(self, bytes, stream=None):
-        """Block until given bytes appear in the stream."""
-        if stream is None:
-            stream = self.std_out
-        pass
-
-    def send(self, end='\n'):
-        """Sends a line to std_in."""
-        #TODO: Y U LINE BUFFER
-        pass
-
-    def block(self):
-        """Blocks until command finishes. Returns Response instance."""
-        self._status_code = self._process.wait()
-
-
-
-class Response(object):
-    """A command's response"""
-
-    def __init__(self, process=None):
-        super(Response, self).__init__()
-
-        self._process = process
-        self.command = None
-        self.std_err = None
-        self.std_out = None
-        self.status_code = None
-        self.history = []
-
-
-    def __repr__(self):
-        if len(self.command):
-            return '<Response [{0}]>'.format(self.command[0])
-        else:
-            return '<Response>'
-
-
-def expand_args(command):
-    """Parses command strings and returns a Popen-ready list."""
-
-    # Prepare arguments.
-    if isinstance(command, basestring):
-        splitter = shlex.shlex(command, posix=True)
-        splitter.whitespace = '|'
-        splitter.whitespace_split = True
-        command = []
-
-        while True:
-            token = splitter.get_token()
-            if token:
-                command.append(token)
-            else:
-                break
-
-        command = map(shlex.split, command)
-
-    return command
-
-
-def run(command, data=None, timeout=None, env=None):
-    """Executes a given commmand and returns Response.
-
-    Blocks until process is complete, or timeout is reached.
-    """
-
-    command = expand_args(command)
-
-    history = []
-    for c in command:
-
-        if len(history):
-            # due to broken pipe problems pass only first 10MB
-            data = history[-1].std_out[0:10*1024]
-
-        cmd = Command(c)
-        out, err = cmd.run(data, timeout, env)
-
-        r = Response(process=cmd)
-
-        r.command = c
-        r.std_out = out
-        r.std_err = err
-        r.status_code = cmd.returncode
-
-        history.append(r)
-
-    r = history.pop()
-    r.history = history
-
-    return r
-
-
-def connect(command, data=None, env=None):
-    """Spawns a new process from the given command."""
-
-    # TODO: support piped commands
-    command_str = expand_args(command).pop()
-    environ = dict(os.environ).update(env or {})
-
-    process = subprocess.Popen(command_str,
-        universal_newlines=True,
-        shell=False,
-        env=environ,
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        bufsize=0,
-    )
-
-    return ConnectedCommand(process=process)

test/distutils/setup.py

@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import sys
-import envoy
-
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-
-
-if sys.argv[-1] == "publish":
-    os.system("python setup.py sdist upload")
-    sys.exit()
-
-required = []
-
-setup(
-    name='envoy',
-    version=envoy.__version__,
-    description='Simple API for running external processes.',
-    author='Kenneth Reitz',
-    author_email='me@kennethreitz.com',
-    url='https://github.com/kennethreitz/envoy',
-    py_modules= ['envoy'],
-    install_requires=required,
-    license='MIT',
-    classifiers=(
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        # 'Programming Language :: Python :: 3.0',
-        # 'Programming Language :: Python :: 3.1',
-    ),
-)

test/django-1.3-skeleton/haystack/manage.py

@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-from django.core.management import execute_manager
-import imp
-try:
-    imp.find_module('settings') # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
-    sys.exit(1)
-
-import settings
-
-if __name__ == "__main__":
-    execute_manager(settings)

test/django-1.3-skeleton/haystack/settings.py

@@ -1,145 +0,0 @@
-# Django settings for haystack project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': '',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/static/admin/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '@$87s&royz$nvav^3*$4u6^htybq*o=ge504rqp7r2)@ec*g(3'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-)
-
-ROOT_URLCONF = 'haystack.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}

test/django-1.3-skeleton/haystack/urls.py

@@ -1,17 +0,0 @@
-from django.conf.urls.defaults import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'haystack.views.home', name='home'),
-    # url(r'^haystack/', include('haystack.foo.urls')),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
-)

test/django-1.3-skeleton/requirements.txt

@@ -1 +0,0 @@
-django==1.3

test/django-1.4-skeleton/haystack/settings.py

@@ -1,154 +0,0 @@
-# Django settings for haystack project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': '',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
-# If you set this to False, Django will not use timezone-aware datetimes.
-USE_TZ = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '633$+yuh67kvt_v8gpi9zmkvqb*m5nts6&a=q^dwhi+e#^j_ki'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-ROOT_URLCONF = 'haystack.urls'
-
-# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'haystack.wsgi.application'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error when DEBUG=False.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}