Fix egg-links

commit cb2c57dcffe856ad547ad8fbd1907815713dc4a7
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:44:39 2017 -0500

    no files were found

commit 38f861f6c6dbb2825c6551f220e610bea619c27f
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:37:35 2017 -0500

    uninstall

commit db1db5d2a0ad364d646d378ccff62b9aa0257efd
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:36:41 2017 -0500

    pip cleanup

commit 2e16f233849f683ad9c9d00bad51c2dd5da11c18
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:35:13 2017 -0500

    uninstall

commit 078e43d2926b77a40f21026969ee930aa7ad0fee
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:31:39 2017 -0500

    fix

commit eff318eaf37161f0c496e130688b27d596b9cd7a
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:30:09 2017 -0500

    wfwef

commit d8955b452190b1b6a40049c94df564144c4607dc
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:28:30 2017 -0500

    oops

commit 0e83a0ae238bdea06ce0d184c8139b598f71745e
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:24:28 2017 -0500

    find

commit b9cb901ecb9d9075020f5c63e5faee04aade1ad7
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:23:04 2017 -0500

    don't

commit 3fd1a448e244a7c3f877ae75cd8672ef42a3f550
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:22:29 2017 -0500

    output

commit 884c6a40ee14365fccd4c9a34fb7733a833303a4
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:17:47 2017 -0500

    delete egg links

commit 9a16a8676abbd34b9ae0de3de4d52b4d358b2e35
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 11:14:18 2017 -0500

    remove egg-links

commit d45d9e977adc8ad7c5c18a27f1dfb20eb286bb5d
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 10:35:24 2017 -0500

    no echo

commit 5cfb64387db1c69fff57ac9afa0c996a34a4362d
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 10:33:58 2017 -0500

    debug

commit ac143097e9ee0a23464d16e2c6d414437046132e
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 10:26:27 2017 -0500

    no print 0

commit 72adfe2e4abd975f5df5350f06f93d1309ff4ed1
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 10:25:27 2017 -0500

    cat other one

commit e51e83ca3ec9a6710add90424f80f9bc7c3d5bf3
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 10:23:52 2017 -0500

    echo

commit def0231dd068fe4a854074bf42409ef373ac0977
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Mon Jan 2 10:20:31 2017 -0500

    cat the files

.travis.yml

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

CHANGELOG.md

@@ -0,0 +1,189 @@
+# Python Buildpack Changelog
+
+## 96
+
+Bugfix.
+
+## 95
+
+Improved output support. 
+
+## v94
+
+Improved support for PyPy.
+
+## v93
+
+Improved support for PyPy.
+
+## v92
+
+Improved cache functionality and fix egg-links regression. 
+
+## v91
+
+Bugfix, rolled back to v88.
+
+## v90
+
+Bugfix.
+
+## v89
+
+Improved cache functionality and fix egg-links regression. 
+
+## v88
+
+Fixed bug with editable pip installations. 
+
+## v87
+
+Updated default Python 2.7.13.
+
+- Python 2.7.13 uses UCS-4 build, more compatibile with linux wheels.
+- Updated setuptools to v32.1.0.
+
+## v86
+
+Refactor and multi-buildpack compatibility.
+
+## v85
+
+Packaging fix. 
+
+## v84
+
+Updated pip and setuptools.
+
+- Updated pip to v9.0.1.
+- Updated setuptools to v28.8.0.
+
+## v83
+
+Support for Heroku CI.
+
+- Cffi support for argon2
+
+## v82 (2016-08-22)
+
+Update to library detection mechnisms (pip-pop).
+
+- Updated setuptools to v25.5.0
+
+## v81 (2016-06-28)
+
+Updated default Python to 2.7.11.
+
+- Updated pip to v8.1.2.
+- Updated setuptools to v23.1.0.
+
+## v80 (2016-04-05)
+
+Improved pip-pop compatibility with latest pip releases.
+
+## v79 (2016-03-22)
+
+Compatibility improvements with heroku-apt-buildpack.
+
+## v78 (2016-03-18)
+
+Added automatic configuration of Gunicorn's `FORWARDED_ALLOW_IPS` setting.
+
+Improved detection of libffi dependency when using bcrypt via `Django[bcrypt]`.
+
+Improved GDAL support.
+
+- GDAL dependency detection now checks for pygdal and is case-insensitive.
+- The vendored GDAL library has been updated to 1.11.1.
+- GDAL bootstrapping now also installs the GEOS and Proj.4 libraries.
+
+Updated pip to 8.1.1 and setuptools to 20.3.
+
+## v77 (2016-02-10)
+
+Improvements to warnings and minor bugfix.
+
+## v76 (2016-02-08)
+
+Improved Django collectstatic support.
+
+- `$ python manage.py collectstatic` will only be run if `Django` is present in `requirements.txt`.
+- If collectstatic fails, the build fails. Full traceback is provided.
+- `$DISABLE_COLLECTSTATIC`: skip collectstatic step completely (not new).
+- `$DEBUG_COLLECTSTATIC`: echo environment variables upon collectstatic failure.
+- Updated build output style.
+- New warning for outdated Python (via pip `InsecurePlatform` warning).
+
+## 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.

Dockerfile

@@ -0,0 +1,11 @@
+FROM heroku/heroku:16-build
+
+WORKDIR /app
+ENV WORKSPACE_DIR=/app/builds
+
+RUN apt-get update && apt-get install -y python-pip
+
+# Install bob-builder application
+RUN pip install bob-builder==0.0.5
+
+COPY . /app

LICENSE

@@ -1,6 +1,6 @@
 MIT License:
 
-Copyright (C) 2013 Heroku, Inc.
+Copyright (C) 2016 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

@@ -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

@@ -0,0 +1,54 @@
+![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
+
+# Heroku Buildpack: Python
+
+This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [pip](https://pip.pypa.io/) and other excellent software.
+
+Recommended web frameworks include **Django** and **Flask**. The recommended webserver is **Gunicorn**. There are no restrictions around what software can be used (as long as it's pip-installable). Web processes must bind to `$PORT`, and only the HTTP protocol is permitted for incoming connections.
+
+Some Python packages with obscure C dependencies (e.g. scipy) are [not compatible](https://devcenter.heroku.com/articles/python-c-deps). 
+
+See it in Action
+----------------
+
+Deploying a Python application couldn't be easier:
+
+    $ ls
+    Procfile  requirements.txt  web.py
+
+    $ heroku create --buildpack heroku/python
+
+    $ git push heroku master
+    ...
+    -----> Python app detected
+    -----> Installing python-2.7.13
+         $ pip install -r requirements.txt
+           Collecting requests (from -r requirements.txt (line 1))
+             Downloading requests-2.12.4-py2.py3-none-any.whl (576KB)
+           Installing collected packages: requests
+           Successfully installed requests-2.12.4
+           
+    -----> Discovering process types
+           Procfile declares types -> (none)
+
+A `requirements.txt` file must be present at the root of your application's repository.
+
+You can also specify the latest production release of this buildpack for upcoming builds of an existing application:
+
+    $ heroku buildpacks:set heroku/python
+
+
+Specify a Python Runtime
+------------------------
+
+Specific versions of the Python runtime can be specified with a `runtime.txt` file:
+
+    $ cat runtime.txt
+    python-3.6.0
+
+Runtime options include:
+
+- `python-2.7.13`
+- `python-3.6.0`
+- `pypy-5.6.0` (unsupported, experimental)
+- `pypy3-5.5.0` (unsupported, experimental)

Readme.md

@@ -1,54 +0,0 @@
-Heroku buildpack: Python
-========================
-
-This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [pip](http://www.pip-installer.org/).
-
-
-Usage
------
-
-Example usage:
-
-    $ ls
-    Procfile  requirements.txt  web.py
-
-    $ heroku create --buildpack git://github.com/heroku/heroku-buildpack-python.git
-
-    $ git push heroku master
-    ...
-    -----> Python app detected
-    -----> No runtime.txt provided; assuming python-2.7.6.
-    -----> Preparing Python runtime (python-2.7.6)
-    -----> Installing Setuptools (3.6)
-    -----> Installing Pip (1.5.6)
-    -----> Installing dependencies using Pip (1.5.6)
-           Downloading/unpacking requests (from -r requirements.txt (line 1))
-           Installing collected packages: requests
-           Successfully installed requests
-           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 use Pip to install your dependencies, vendoring a copy of the Python runtime into your slug.
-
-Specify a Runtime
------------------
-
-You can also provide arbitrary releases Python with a `runtime.txt` file.
-
-    $ cat runtime.txt
-    python-3.4.0
-
-Runtime options include:
-
-- python-2.7.6
-- python-3.4.0
-- pypy-1.9 (experimental)
-
-Other [unsupported runtimes](https://github.com/kennethreitz/python-versions/tree/master/formula) are available as well.

bin/compile

@@ -1,5 +1,13 @@
 #!/usr/bin/env bash
 
+# The Heroku Python Buildpack. This script accepts parameters for a build
+# directory, a cache directory, and a directory for app environment variables.
+
+# Warning: there are a few hacks in this script to accommodate excellent builds
+# on Heroku. No guarantee for external compatibility is made. However,
+# everything should work fine outside of the Heroku environment, if the
+# environment is setup correctly.
+
 # Usage:
 #
 #     $ bin/compile <build-dir> <cache-dir> <env-path>
@@ -7,6 +15,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,104 +27,110 @@ 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"
 
-DEFAULT_PYTHON_VERSION="python-2.7.6"
+DEFAULT_PYTHON_VERSION="python-2.7.13"
+DEFAULT_PYTHON_STACK="cedar-14"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="1.5.6"
+PIP_VERSION="9.0.1"
-SETUPTOOLS_VERSION="3.6"
+SETUPTOOLS_VERSION="32.1.0"
+
+# Common Problem Warnings
+export WARNINGS_LOG=$(mktemp)
+export RECOMMENDED_PYTHON_VERSION=$DEFAULT_PYTHON_VERSION
 
 # Setup bpwatch
 export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
-LOGPLEX_KEY="t.b396af7f-ad75-4643-8b9e-ebb288acc624"
+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
+unset GIT_DIR PYTHONHOME PYTHONPATH
+unset RECEIVE_DATA RUN_KEY BUILD_INFO DEPLOY LOG_TOKEN DYNO
+unset CYTOKINE_LOG_FILE GEM_PATH
 
+# Setup buildpack instrumentation.
 bpwatch init $LOGPLEX_KEY
 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
 
-# Directory Hacks for path consistiency.
+# Import collection of warnings.
-APP_DIR='/app'
+source $BIN_DIR/warnings
-TMP_APP_DIR=$CACHE_DIR/tmp_app_dir
 
-# Copy Anvil app dir to temporary storage...
+# we need to put a bunch of symlinks in there later
-bpwatch start anvil_appdir_stage
+mkdir -p /app/.heroku
-  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.
+# Set up outputs under new context
-bpwatch start appdir_stage
+PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
-  deep-mv $BUILD_DIR $APP_DIR
+EXPORT_PATH="$BIN_DIR/../export"
-bpwatch stop appdir_stage
+GUNICORN_PROFILE_PATH="$BUILD_DIR/.profile.d/python.gunicorn.sh"
 
-# Set new context.
+# We'll need to send these statics to other scripts we `source`.
-ORIG_BUILD_DIR=$BUILD_DIR
+export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH EXPORT_PATH
-BUILD_DIR=$APP_DIR
 
-# Prepend proper path buildpack use.
+# Prepend proper environment variables for Python use.
-export PATH=$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH
+export PATH=/app/.heroku/python/bin:/app/.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
+export C_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$C_INCLUDE_PATH
-export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include
+export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$CPLUS_INCLUDE_PATH
-export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib
+export LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH
-export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib
+export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH
-export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/vendor/lib/pkg-config
+export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH
 
 # 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
 bpwatch stop pre_compile
 
-# If no requirements given, assume `setup.py develop`.
+# If no requirements.txt file given, assume `setup.py develop` is intended.
 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=$STACK
+fi
+
 # If no runtime given, assume default version.
 if [ ! -f runtime.txt ]; then
-  puts-step "No runtime.txt provided; assuming $DEFAULT_PYTHON_VERSION."
   echo $DEFAULT_PYTHON_VERSION > runtime.txt
 fi
 
-# ### The Cache
+# Prepare the cache.
 mkdir -p $CACHE_DIR
 
 # Purge "old-style" virtualenvs.
@@ -125,153 +141,114 @@ bpwatch stop clear_old_venvs
 
 # Restore old artifacts from the cache.
 bpwatch start restore_cache
-  for dir in $CACHED_DIRS; do
+    mkdir -p .heroku
-    cp -R $CACHE_DIR/$dir . &> /dev/null || true
+
-  done
+    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
+    if [[ -d $CACHE_DIR/.heroku/src ]]; then
+      cp -R $CACHE_DIR/.heroku/src .heroku/ &> /dev/null || true
+    fi
+
 bpwatch stop restore_cache
 
-set +e
-# Create set-aside `.heroku` folder.
-mkdir .heroku &> /dev/null
-set -e
-
 mkdir -p $(dirname $PROFILE_PATH)
+mkdir -p /app/.heroku/src
 
-set +e
+if [[ $BUILD_DIR != '/app' ]]; then
-PYTHON_VERSION=$(cat runtime.txt)
+    # python expects to reside in /app, so set up symlinks
+    # we will not remove these later so subsequent buildpacks can still invoke it
+    ln -nsf $BUILD_DIR/.heroku/python /app/.heroku/python
+    ln -nsf $BUILD_DIR/.heroku/vendor /app/.heroku/vendor
+    ln -nsf $BUILD_DIR/.heroku/venv /app/.heroku/venv
+    # Note: .heroku/src is copied in later.
+fi
 
 # Install Python.
-if [ -f .heroku/python-version ]; then
+source $BIN_DIR/steps/python
-  if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then
-    bpwatch start uninstall_python
-      puts-step "Found $(cat .heroku/python-version), removing."
-      rm -fr .heroku/python
-    bpwatch stop uninstall_python
-  else
-    SKIP_INSTALL=1
-  fi
-fi
 
+# Sanity check for setuptools/distribute.
+source $BIN_DIR/steps/setuptools
 
-if [ ! "$SKIP_INSTALL" ]; then
+# Uninstall removed dependencies with Pip.
-  bpwatch start install_python
+source $BIN_DIR/steps/pip-uninstall
-    puts-step "Preparing Python runtime ($PYTHON_VERSION)"
-    curl http://envy-versions.s3.amazonaws.com/$PYTHON_VERSION.tar.bz2 -s | tar jx &> /dev/null
-    if [[ $? != 0 ]] ; then
-      puts-warn "Requested runtime ($PYTHON_VERSION) was not found."
-      puts-warn "Aborting.  More info: https://devcenter.heroku.com/articles/python-support"
-      exit 1
-    fi
-    mv python .heroku/python
-  bpwatch stop install_python
 
-  # Record for future reference.
+# Mercurial support.
-  echo $PYTHON_VERSION > .heroku/python-version
+source $BIN_DIR/steps/mercurial
-  FRESH_PYTHON=true
-
-  hash -r
-else
-  puts-step "Using Python runtime ($PYTHON_VERSION)"
-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
 
 # Pylibmc support.
-# See [`bin/steps/pylibmc`](pylibmc.html).
+source $BIN_DIR/steps/pylibmc
-bpwatch start pylibmc_install
-  source $BIN_DIR/steps/pylibmc
-bpwatch stop pylibmc_install
 
-# Install Mercurial if it appears to be required.
+# Libffi support.
-if (grep -Fiq "hg+" requirements.txt) then
+source $BIN_DIR/steps/cryptography
-  bpwatch start mercurial_install
-    /app/.heroku/python/bin/pip install  mercurial | cleanup | indent
-  bpwatch stop mercurial_install
-fi
 
-# Install dependencies with Pip.
+# Support for Geo libraries.
-puts-step "Installing dependencies using Pip ($PIP_VERSION)"
+sub-env $BIN_DIR/steps/geo-libs
 
+# GDAL support.
+source $BIN_DIR/steps/gdal
 
-[ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
+# Install dependencies with Pip (where the magic happens).
-[ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
+source $BIN_DIR/steps/pip-install
 
-/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --allow-all-external  | cleanup | indent
+# Support for pip install -e.
-
+rm -fr $BUILD_DIR/.heroku/src
-[ ! "$FRESH_PYTHON" ] && bpwatch stop pip_install
+deep-cp /app/.heroku/src $BUILD_DIR/.heroku/src
-[ "$FRESH_PYTHON" ] && bpwatch stop pip_install_first
 
 # Django collectstatic support.
-bpwatch start collectstatic
+sub-env $BIN_DIR/steps/collectstatic
-  sub-env $BIN_DIR/steps/collectstatic
-bpwatch stop collectstatic
 
-# ### Finalize
+# Create .profile script for application runtime environment variables.
-#
-
-# Set context environment variables.
 set-env PATH '$HOME/.heroku/python/bin:$PATH'
 set-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:$LIBRARY_PATH'
-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 PYTHONHASHSEED random
 set-default-env PYTHONPATH /app/
 
+# Install sane-default script for $WEB_CONCURRENCY and $FORWARDED_ALLOW_IPS.
+cp $ROOT_DIR/vendor/python.gunicorn.sh $GUNICORN_PROFILE_PATH
 
 # Experimental post_compile hook.
 bpwatch start post_compile
   source $BIN_DIR/steps/hooks/post_compile
 bpwatch stop post_compile
 
+set +e
+# rewrite build dir in egg links to /app so things are found at runtime
+find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#$(pwd)#/app#" &> /dev/null
+set -e
+
+set +e
+# Support for PyPy
+find .heroku/python/lib-python/*/site-packages/  -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#$(pwd)#/app#" &> /dev/null
+set -e
+
 # 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.
+  rm -rf $CACHE_DIR/.heroku/python
-bpwatch start appdir_commit
+  rm -rf $CACHE_DIR/.heroku/python-version
-  deep-mv $BUILD_DIR $ORIG_BUILD_DIR
+  rm -rf $CACHE_DIR/.heroku/python-stack
-bpwatch stop appdir_commit
+  rm -rf $CACHE_DIR/.heroku/vendor
+  rm -rf $CACHE_DIR/.heroku/venv
+  rm -rf $CACHE_DIR/.heroku/src
 
-bpwatch start anvil_appdir_commit
+  mkdir -p $CACHE_DIR/.heroku
-  if [ "$SLUG_ID" ]; then
+  cp -R .heroku/python $CACHE_DIR/.heroku/
-    deep-mv $TMP_APP_DIR $APP_DIR
+  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
+  if [[ -d .heroku/src ]]; then
+    cp -R .heroku/src $CACHE_DIR/.heroku/ &> /dev/null || true
   fi
 
-bpwatch stop anvil_appdir_commit
+bpwatch stop dump_cache
+
+# Fin.
 bpwatch stop compile

bin/detect

@@ -4,7 +4,7 @@
 # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
 # detector.
 #
-# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an
+# A [buildpack](https://devcenter.heroku.com/articles/buildpacks) is an
 # adapter between a Python application and Heroku's runtime.
 
 # ## Usage

bin/release

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

bin/steps/collectstatic

@@ -1,36 +1,67 @@
 #!/usr/bin/env bash
 
+# Django Collectstatic runner. If you have Django installed, collectstatic will
+# automatically be executed as part of the build process. If collectstatic
+# fails, your build fails.
+
+# This functionality will only activate if Django is in requirements.txt.
+
+# Runtime arguments:
+#   - $DISABLE_COLLECTSTATIC: disables this functionality.
+#   - $DEBUG_COLLECTSTATIC: upon failure, print out environment variables.
+
 source $BIN_DIR/utils
 
-MANAGE_FILE=$(find . -maxdepth 3 -type f -name 'manage.py' | head -1)
+# Location of 'manage.py', if it exists.
+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}
 
+# Legacy file-based support for $DISABLE_COLLECTSTATIC
 [ -f .heroku/collectstatic_disabled ] && DISABLE_COLLECTSTATIC=1
 
-if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ]; then
+# Ensure that Django is explicitly specified in requirements.txt
+pip-grep -s requirements.txt django Django && DJANGO_INSTALLED=1
+
+bpwatch start collectstatic  # metrics collection
+
+if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALLED" ]; then
     set +e
 
-    echo "-----> Preparing static assets"
+    puts-cmd "python $MANAGE_FILE collectstatic --noinput"
-    # 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.
+    # Run collectstatic, cleanup some of the noisy output.
-    if [ "$RUN_COLLECTSTATIC" ]; then
+    python $MANAGE_FILE collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
+    COLLECTSTATIC_STATUS="${PIPESTATUS[0]}"
 
-        echo "       Running collectstatic..."
+    set -e
-        python $MANAGE_FILE collectstatic --noinput  2>&1 | sed '/^Copying/d;/^$/d;/^ /d' | indent
 
-        [ $? -ne 0 ] && {
+    # Display a warning if collectstatic failed.
-            echo " !     Error running 'manage.py collectstatic'. More info:"
+    [ $COLLECTSTATIC_STATUS -ne 0 ] && {
-            echo "       http://devcenter.heroku.com/articles/django-assets"
+
-        }
+        echo
-    else
+        echo " !     Error while running '$ python $MANAGE_FILE collectstatic --noinput'."
-        echo "       Collectstatic configuration error. To debug, run:"
+        echo "       See traceback above for details."
-        echo "       $ heroku run python $MANAGE_FILE collectstatic --noinput"
+        echo
-    fi
+        echo "       You may need to update application code to resolve this error."
+        echo "       Or, you can disable collectstatic for this application:"
+        echo
+        echo "          $ heroku config:set DISABLE_COLLECTSTATIC=1"
+        echo
+        echo "       https://devcenter.heroku.com/articles/django-assets"
+
+        # Additionally, dump out the environment, if debug mode is on.
+        if [ "$DEBUG_COLLECTSTATIC" ]; then
+            echo
+            echo "****** Collectstatic environment variables:"
+            echo
+            env | indent
+        fi
+
+        # Abort the build.
+        exit 1
+    }
 
     echo
-
-
 fi
 
+bpwatch stop collectstatic  # metrics collection

bin/steps/cryptography

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# This script serves as the Cryptography build step of the
+# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
+# compiler.
+#
+# A [buildpack](https://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 libffi binary.
+VENDORED_LIBFFI="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libffi.tar.gz"
+
+PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+bpwatch start libffi_install
+
+# If a package using cffi exists within requirements, use vendored libffi.
+if (pip-grep -s requirements.txt argon2-cffi bcrypt cffi cryptography django[argon2] Django[argon2] django[bcrypt] Django[bcrypt] PyNaCl pyOpenSSL PyOpenSSL requests[security] misaka &> /dev/null) then
+
+  if [ ! -d ".heroku/vendor/lib/libffi-3.1" ]; then
+    echo "-----> Noticed cffi. Bootstrapping libffi."
+    mkdir -p .heroku/vendor
+    # Download and extract libffi into target vendor directory.
+    curl $VENDORED_LIBFFI -s | tar zxv -C .heroku/vendor &> /dev/null
+  fi
+
+  export LIBFFI=$(pwd)/vendor
+fi
+
+bpwatch stop libffi_install

bin/steps/gdal

@@ -0,0 +1,35 @@
+#!/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](https://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 gdal pygdal &> /dev/null) then
+
+  if [ ! -f ".heroku/vendor/bin/gdalserver" ]; then
+    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
+  fi
+
+  export GDAL=$(pwd)/vendor
+fi
+
+bpwatch stop gdal_install

bin/steps/geo-libs

@@ -0,0 +1,39 @@
+#!/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](https://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"
+VENDORED_GEOS="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/geos.tar.gz"
+VENDORED_PROJ="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/proj.tar.gz"
+
+PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+bpwatch start geo_libs_install
+
+# If GDAL exists within requirements, use vendored gdal.
+if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
+
+  if [ ! -f ".heroku/vendor/bin/proj" ]; then
+    echo "-----> Bootstrapping gdal, geos, proj."
+    mkdir -p .heroku/vendor
+    # Download and extract cryptography into target vendor directory.
+    curl $VENDORED_GDAL -s | tar zxv -C .heroku/vendor &> /dev/null
+    curl $VENDORED_GEOS -s | tar zxv -C .heroku/vendor &> /dev/null
+    curl $VENDORED_PROJ -s | tar zxv -C .heroku/vendor &> /dev/null
+  fi
+
+  export GDAL=$(pwd)/vendor
+fi
+
+bpwatch stop geo_libs_install

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,38 @@
+# Install dependencies with Pip.
+puts-cmd "pip install -r requirements.txt"
+
+set +e
+# delete any existing egg links, to uninstall exisisting installations.
+find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -delete 2> /dev/null
+find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" &> /dev/null
+set -e
+
+set +e
+# Support for the above, for PyPy.
+find .heroku/python/lib-python/*/site-packages/ -name "*.egg-link" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#$(pwd)/#" &> /dev/null
+find .heroku/python/lib-python/*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" &> /dev/null
+set -e
+
+[ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
+[ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
+
+set +e
+/app/.heroku/python/bin/pip install -r $BUILD_DIR/requirements.txt --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee $WARNINGS_LOG | cleanup | indent
+PIP_STATUS="${PIPESTATUS[0]}"
+set -e
+
+show-warnings
+
+if [[ ! $PIP_STATUS -eq 0 ]]; then
+    exit 1
+fi
+
+
+# Smart Requirements handling
+cp requirements.txt .heroku/python/requirements-declared.txt
+/app/.heroku/python/bin/pip freeze --disable-pip-version-check > .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 --exclude setuptools pip wheel > .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

@@ -4,35 +4,31 @@
 # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
 # compiler.
 #
-# A [buildpack](http://devcenter.heroku.com/articles/buildpacks) is an
+# A [buildpack](https://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="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
 
 # Syntax sugar.
 source $BIN_DIR/utils
 
-# If pylibmc exists within requirements, use vendored libmemcached.
-if (grep -Eiq "^\s*pylibmc" requirements.txt) then
-  echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
-  cd .heroku
 
-  if [ -d "vendor/lib/sasl2" ]; then
+bpwatch start pylibmc_install
-    export LIBMEMCACHED=$(pwd)/vendor
+
-  else
+# If pylibmc exists within requirements, use vendored libmemcached.
+if (pip-grep -s requirements.txt pylibmc &> /dev/null) then
+
+  if [ ! -d ".heroku/vendor/lib/sasl2" ]; then
+    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,78 @@
+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 $(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
+    rm -fr .heroku/python .heroku/python-stack .heroku/vendor
+    unset SKIP_INSTALL
+  bpwatch stop uninstall_python
+fi
+
+
+if [ ! "$SKIP_INSTALL" ]; then
+  bpwatch start install_python
+    puts-step "Installing $PYTHON_VERSION"
+
+    # Prepare destination directory.
+    mkdir -p .heroku/python
+
+    curl https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
+    if [[ $? != 0 ]] ; then
+      puts-warn "Requested runtime ($PYTHON_VERSION) is not available for this stack ($STACK)."
+      puts-warn "Aborting.  More info: https://devcenter.heroku.com/articles/python-support"
+      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
+
+  TMPTARDIR=$(mktemp -d)
+  trap "rm -rf $TMPTARDIR" RETURN
+
+  bpwatch start install_setuptools
+    # Prepare it for the real world
+    # puts-step "Installing Setuptools ($SETUPTOOLS_VERSION)"
+    tar zxf $ROOT_DIR/vendor/setuptools-$SETUPTOOLS_VERSION.tar.gz -C $TMPTARDIR
+    cd $TMPTARDIR/setuptools-$SETUPTOOLS_VERSION/
+    python setup.py install &> /dev/null
+    cd $WORKING_DIR
+  bpwatch stop install_setuptoools
+
+  bpwatch start install_pip
+    # puts-step "Installing Pip ($PIP_VERSION)"
+    tar zxf $ROOT_DIR/vendor/pip-$PIP_VERSION.tar.gz -C $TMPTARDIR
+    cd $TMPTARDIR/pip-$PIP_VERSION/
+    python setup.py install &> /dev/null
+    cd $WORKING_DIR
+
+  bpwatch stop install_pip
+  bpwatch stop prepare_environment
+fi
+
+set -e
+hash -r

bin/steps/setuptools

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

bin/test

@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Create a Heroku app with the following buildpack:
-# https://github.com/ddollar/buildpack-test
-#
-# Push this Python buildpack to that Heroku app to
-# run the tests.
-#
-
-testDetectWithReqs() {
-  detect "simple-requirements"
-  assertCapturedEquals "Python"
-  assertCapturedSuccess
-}
-
-testDetectWithEmptyReqs() {
-  detect "empty-requirements"
-  assertCapturedEquals "Python"
-  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"
-  assertCapturedSuccess
-}
-
-testDetectDjango13() {
-  detect "django-1.3-skeleton"
-  assertCapturedEquals "Python"
-  assertCapturedSuccess
-}
-
-testDetectNotDjangoWithSettings() {
-  detect "not-django"
-  assertCapturedEquals "Python"
-  assertCapturedSuccess
-}
-
-testDetectWithSetupPy() {
-  detect "distutils"
-  assertCapturedEquals "Python"
-  assertCapturedSuccess
-}
-
-testDetectWithSetupRequires() {
-  detect "no-requirements"
-  assertCapturedEquals "Python"
-  assertCapturedSuccess
-}
-
-testDetectNotPython() {
-  detect "not-python"
-  assertNotCaptured "Python"
-  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 ########################################
-
-pushd $(dirname 0) >/dev/null
-BASE=$(pwd)
-popd >/dev/null
-
-source ${BASE}/vendor/test-utils
-
-detect() {
-  capture ${BASE}/bin/detect ${BASE}/test/$1
-}
-
-compile() {
-  capture ${BASE}/bin/compile ${BASE}/test/$1
-}
-
-source ${BASE}/vendor/shunit2
-

bin/test-compile

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Syntax sugar.
+BIN_DIR=$(cd $(dirname $0); pwd) # absolute path
+source $BIN_DIR/utils
+
+DISABLE_COLLECTSTATIC=1 "$(dirname ${0:-})/compile" "$1" "$2" "$3"
+
+if [[ -f "$1/requirements-test.txt" ]]; then
+    /app/.heroku/python/bin/pip install -r "$1/requirements-test.txt" --exists-action=w --src=./.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | cleanup | indent
+fi

bin/utils

@@ -13,7 +13,12 @@ indent() {
 
 # 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 '/No files were found to uninstall/Id' | sed -e '/Overwriting/Id' | sed -e '/python executable/Id' | sed -e '/no previously-included files/Id'
+}
+
+# Buildpack Indented line.
+puts-line() {
+  echo "       $@"
 }
 
 # Buildpack Steps.
@@ -26,17 +31,24 @@ puts-warn() {
   echo " !     $@"
 }
 
+# Buildpack Commands.
+puts-cmd() {
+  echo "     $ $@"
+}
+
 # Usage: $ set-env key value
 set-env() {
   echo "export $1=$2" >> $PROFILE_PATH
+  echo "export $1=$2" >> $EXPORT_PATH
 }
 
 # Usage: $ set-default-env key value
 set-default-env() {
   echo "export $1=\${$1:-$2}" >> $PROFILE_PATH
+  echo "export $1=\${$1:-$2}" >> $EXPORT_PATH
 }
 
-# Usage: $ set-default-env key value
+# Usage: $ un-set-env key
 un-set-env() {
   echo "unset $1" >> $PROFILE_PATH
 }
@@ -68,7 +80,7 @@ deep-rm() {
   # subshell to avoid surprising caller with shopts.
   (
     shopt -s dotglob
-    rm -rf "$1"/!(tmp|.|..)
+    rm -rf "$1"/!(.curlrc|.netrc|tmp|.|..)
   )
 }
 
@@ -76,7 +88,11 @@ deep-rm() {
 sub-env() {
 
   WHITELIST=${2:-''}
-  BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|PYTHONPATH|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'}
+  BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'}
+
+  # Python-specific variables.
+  export PYHONHOME=$BUILD_DIR/.heroku/python
+  export PYTHONPATH=$BUILD_DIR/
 
   (
     if [ -d "$ENV_DIR" ]; then
@@ -91,3 +107,4 @@ sub-env() {
 
   )
 }
+

bin/warnings

@@ -0,0 +1,49 @@
+shopt -s extglob
+
+old-platform() {
+  if grep -qi 'InsecurePlatformWarning' "$WARNINGS_LOG"; then
+    echo
+    puts-warn "Hello! It looks like your application is using an outdated version of Python."
+    puts-warn "This caused the security warning you saw above during the 'pip install' step."
+    puts-warn "We recommend '$RECOMMENDED_PYTHON_VERSION', which you can specify in a 'runtime.txt' file."
+    puts-warn "  -- Much Love, Heroku."
+  fi
+}
+
+pylibmc-missing() {
+  if grep -qi 'fatal error: libmemcached/memcached.h: No such file or directory' "$WARNINGS_LOG"; then
+    echo
+    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
+    echo
+    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
+    echo
+    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() {
+  old-platform
+  pylibmc-missing
+  scipy-included
+  distribute-included
+}
+

builds/libraries/sqlite

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

builds/libraries/vendor/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.1/gdal-1.11.1.tar.gz'
+
+curl -L $SOURCE_TARBALL | tar zx
+
+cd gdal-1.11.1
+./configure --prefix=$OUT_PREFIX  &&
+make
+make install
+
+# Cleanup
+cd ..

builds/libraries/vendor/geos

@@ -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 geos..."
+
+SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.2.tar.bz2'
+
+curl -L $SOURCE_TARBALL | tar xj
+
+cd geos-3.4.2
+./configure --prefix=$OUT_PREFIX  &&
+make
+make install
+
+# Cleanup
+cd ..

builds/libraries/vendor/libffi

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/vendor/
+
+OUT_PREFIX=$1
+
+# Skip the build for heroku-16.
+if [[ $S3_PREFIX == "heroku-16" ]]; then
+    exit 0
+fi
+
+# Use new path, containing autoconf.
+export PATH="/app/.heroku/python/bin/:$PATH"
+hash -r
+
+
+echo "Building libffi..."
+
+SOURCE_TARBALL='ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz'
+
+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,45 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/vendor/
+
+OUT_PREFIX=$1
+
+# Skip the build for heroku-16.
+if [[ $S3_PREFIX == "heroku-16" ]]; then
+    exit 0
+fi
+
+# 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} --with-plugindir=${OUT_PREFIX}lib/sasl2 --with-configdir=${OUT_PREFIX}lib/sasl2
+
+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/libraries/vendor/proj

@@ -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/proj/proj-4.8.0.tar.gz'
+
+curl -L $SOURCE_TARBALL | tar zx
+
+cd proj-4.8.0
+./configure --prefix=$OUT_PREFIX  &&
+make
+make install
+
+# Cleanup
+cd ..

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

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

builds/runtimes/pypy3-2.4.0

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

builds/runtimes/pypy3-5.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/pypy3.3-v5.5.0-alpha-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy3-v5.5.0-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy3 $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.12

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

builds/runtimes/python-2.7.13

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

builds/runtimes/python-2.7.9

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

builds/runtimes/python-3.5.2

@@ -5,13 +5,14 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/3.4.0/Python-3.4.0.tgz'
+SOURCE_TARBALL='https://python.org/ftp/python/3.5.2/Python-3.5.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.4.0 src
+mv Python-3.5.2 src
 cd src
 
 ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
 make
 make install
 
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
+# ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
+

builds/runtimes/python-3.6.0

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

requirements.txt

@@ -1 +1 @@
-bob-builder==0.0.5
+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 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,
-        },
-    }
-}

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

@@ -1,17 +0,0 @@
-from django.conf.urls 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.4-skeleton/haystack/wsgi.py

@@ -1,28 +0,0 @@
-"""
-WSGI config for haystack project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
-import os
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
-
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)

test/django-1.4-skeleton/manage.py

@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)

test/django-1.4-skeleton/requirements.txt

@@ -1 +0,0 @@
-Django==1.4

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

@@ -1,156 +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.
-        # The following settings are not used with sqlite3:
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',                      # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
-        'PORT': '',                      # Set to empty string for default.
-    }
-}
-
-# Hosts/domain names that are valid for this site; required if DEBUG is False
-# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = []
-
-# 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.
-# In a Windows environment this must be set to 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: "/var/www/example.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://example.com/media/", "http://media.example.com/"
-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: "/var/www/example.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://example.com/static/", "http://static.example.com/"
-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 = '@w-1$9#jh05!qvbh#1k)c4=w9llcq116f$5(4&s_c)n4@%n=pc'
-
-# 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,
-        },
-    }
-}

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

@@ -1,17 +0,0 @@
-from django.conf.urls 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.5-skeleton/haystack/wsgi.py

@@ -1,32 +0,0 @@
-"""
-WSGI config for haystack project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
-import os
-
-# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
-# if running multiple sites in the same mod_wsgi process. To fix this, use
-# mod_wsgi daemon mode with each site in its own daemon process, or use
-# os.environ["DJANGO_SETTINGS_MODULE"] = "haystack.settings"
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
-
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)

test/django-1.5-skeleton/manage.py

@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)

test/django-1.5-skeleton/requirements.txt

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

test/django-1.6-skeleton/haystack/__init__.py

@@ -1 +0,0 @@
- 

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

@@ -1,156 +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.
-        # The following settings are not used with sqlite3:
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
-        'PORT': '', # Set to empty string for default.
-    }
-}
-
-# Hosts/domain names that are valid for this site; required if DEBUG is False
-# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = []
-
-# 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.
-# In a Windows environment this must be set to 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: "/var/www/example.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://example.com/media/", "http://media.example.com/"
-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: "/var/www/example.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://example.com/static/", "http://static.example.com/"
-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 = '@w-1$9#jh05!qvbh#1k)c4=w9llcq116f$5(4&s_c)n4@%n=pc'
-
-# 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,
-        },
-    }
-}

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

@@ -1,17 +0,0 @@
-from django.conf.urls 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.6-skeleton/haystack/wsgi.py

@@ -1,32 +0,0 @@
-"""
-WSGI config for haystack project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
-import os
-
-# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
-# if running multiple sites in the same mod_wsgi process. To fix this, use
-# mod_wsgi daemon mode with each site in its own daemon process, or use
-# os.environ["DJANGO_SETTINGS_MODULE"] = "haystack.settings"
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
-
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)

test/django-1.6-skeleton/manage.py

@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "haystack.settings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)

test/django-1.6-skeleton/requirements.txt

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

test/no-requirements/setup.py

@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-required = ['httpbin']
-
-setup(
-    name='haystack',
-    version='0.0.1',
-    description='Simple API for running external processes.',
-    author='Kenneth Reitz',
-    author_email='me@kennethreitz.com',
-    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/not-django/requirements.txt

@@ -1 +0,0 @@
-flask==0.8

test/pylibmc/requirements.txt

@@ -1,2 +0,0 @@
-pylibmc
-psycopg2

test/simple-requirements/requirements.txt

@@ -1,2 +0,0 @@
-requests
-distribute==0.6.49

test/simple-runtime-pypy2/requirements.txt

@@ -1 +0,0 @@
-requests==2.2.1

test/simple-runtime-pypy2/runtime.txt

@@ -1 +0,0 @@
-pypy-2.3

test/simple-runtime-python2/requirements.txt

@@ -1 +0,0 @@
-requests==2.2.1

test/simple-runtime-python2/runtime.txt

@@ -1 +0,0 @@
-python-2.7.6

test/simple-runtime/requirements.txt

@@ -1 +0,0 @@
-requests==2.2.1

test/simple-runtime/runtime.txt

@@ -1 +0,0 @@
-python-3.4.0

vendor/bpwatch/bpwatch

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 
 
 import os

vendor/pip-pop/docopt.py

@@ -0,0 +1,581 @@
+"""Pythonic command-line interface parser that will make you smile.
+
+ * http://docopt.org
+ * Repository and issue-tracker: https://github.com/docopt/docopt
+ * Licensed under terms of MIT license (see LICENSE-MIT)
+ * Copyright (c) 2013 Vladimir Keleshev, vladimir@keleshev.com
+
+"""
+import sys
+import re
+
+
+__all__ = ['docopt']
+__version__ = '0.6.1'
+
+
+class DocoptLanguageError(Exception):
+
+    """Error in construction of usage-message by developer."""
+
+
+class DocoptExit(SystemExit):
+
+    """Exit in case user invoked program with incorrect arguments."""
+
+    usage = ''
+
+    def __init__(self, message=''):
+        SystemExit.__init__(self, (message + '\n' + self.usage).strip())
+
+
+class Pattern(object):
+
+    def __eq__(self, other):
+        return repr(self) == repr(other)
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def fix(self):
+        self.fix_identities()
+        self.fix_repeating_arguments()
+        return self
+
+    def fix_identities(self, uniq=None):
+        """Make pattern-tree tips point to same object if they are equal."""
+        if not hasattr(self, 'children'):
+            return self
+        uniq = list(set(self.flat())) if uniq is None else uniq
+        for i, child in enumerate(self.children):
+            if not hasattr(child, 'children'):
+                assert child in uniq
+                self.children[i] = uniq[uniq.index(child)]
+            else:
+                child.fix_identities(uniq)
+
+    def fix_repeating_arguments(self):
+        """Fix elements that should accumulate/increment values."""
+        either = [list(child.children) for child in transform(self).children]
+        for case in either:
+            for e in [child for child in case if case.count(child) > 1]:
+                if type(e) is Argument or type(e) is Option and e.argcount:
+                    if e.value is None:
+                        e.value = []
+                    elif type(e.value) is not list:
+                        e.value = e.value.split()
+                if type(e) is Command or type(e) is Option and e.argcount == 0:
+                    e.value = 0
+        return self
+
+
+def transform(pattern):
+    """Expand pattern into an (almost) equivalent one, but with single Either.
+
+    Example: ((-a | -b) (-c | -d)) => (-a -c | -a -d | -b -c | -b -d)
+    Quirks: [-a] => (-a), (-a...) => (-a -a)
+
+    """
+    result = []
+    groups = [[pattern]]
+    while groups:
+        children = groups.pop(0)
+        parents = [Required, Optional, OptionsShortcut, Either, OneOrMore]
+        if any(t in map(type, children) for t in parents):
+            child = [c for c in children if type(c) in parents][0]
+            children.remove(child)
+            if type(child) is Either:
+                for c in child.children:
+                    groups.append([c] + children)
+            elif type(child) is OneOrMore:
+                groups.append(child.children * 2 + children)
+            else:
+                groups.append(child.children + children)
+        else:
+            result.append(children)
+    return Either(*[Required(*e) for e in result])
+
+
+class LeafPattern(Pattern):
+
+    """Leaf/terminal node of a pattern tree."""
+
+    def __init__(self, name, value=None):
+        self.name, self.value = name, value
+
+    def __repr__(self):
+        return '%s(%r, %r)' % (self.__class__.__name__, self.name, self.value)
+
+    def flat(self, *types):
+        return [self] if not types or type(self) in types else []
+
+    def match(self, left, collected=None):
+        collected = [] if collected is None else collected
+        pos, match = self.single_match(left)
+        if match is None:
+            return False, left, collected
+        left_ = left[:pos] + left[pos + 1:]
+        same_name = [a for a in collected if a.name == self.name]
+        if type(self.value) in (int, list):
+            if type(self.value) is int:
+                increment = 1
+            else:
+                increment = ([match.value] if type(match.value) is str
+                             else match.value)
+            if not same_name:
+                match.value = increment
+                return True, left_, collected + [match]
+            same_name[0].value += increment
+            return True, left_, collected
+        return True, left_, collected + [match]
+
+
+class BranchPattern(Pattern):
+
+    """Branch/inner node of a pattern tree."""
+
+    def __init__(self, *children):
+        self.children = list(children)
+
+    def __repr__(self):
+        return '%s(%s)' % (self.__class__.__name__,
+                           ', '.join(repr(a) for a in self.children))
+
+    def flat(self, *types):
+        if type(self) in types:
+            return [self]
+        return sum([child.flat(*types) for child in self.children], [])
+
+
+class Argument(LeafPattern):
+
+    def single_match(self, left):
+        for n, pattern in enumerate(left):
+            if type(pattern) is Argument:
+                return n, Argument(self.name, pattern.value)
+        return None, None
+
+    @classmethod
+    def parse(class_, source):
+        name = re.findall('(<\S*?>)', source)[0]
+        value = re.findall('\[default: (.*)\]', source, flags=re.I)
+        return class_(name, value[0] if value else None)
+
+
+class Command(Argument):
+
+    def __init__(self, name, value=False):
+        self.name, self.value = name, value
+
+    def single_match(self, left):
+        for n, pattern in enumerate(left):
+            if type(pattern) is Argument:
+                if pattern.value == self.name:
+                    return n, Command(self.name, True)
+                else:
+                    break
+        return None, None
+
+
+class Option(LeafPattern):
+
+    def __init__(self, short=None, long=None, argcount=0, value=False):
+        assert argcount in (0, 1)
+        self.short, self.long, self.argcount = short, long, argcount
+        self.value = None if value is False and argcount else value
+
+    @classmethod
+    def parse(class_, option_description):
+        short, long, argcount, value = None, None, 0, False
+        options, _, description = option_description.strip().partition('  ')
+        options = options.replace(',', ' ').replace('=', ' ')
+        for s in options.split():
+            if s.startswith('--'):
+                long = s
+            elif s.startswith('-'):
+                short = s
+            else:
+                argcount = 1
+        if argcount:
+            matched = re.findall('\[default: (.*)\]', description, flags=re.I)
+            value = matched[0] if matched else None
+        return class_(short, long, argcount, value)
+
+    def single_match(self, left):
+        for n, pattern in enumerate(left):
+            if self.name == pattern.name:
+                return n, pattern
+        return None, None
+
+    @property
+    def name(self):
+        return self.long or self.short
+
+    def __repr__(self):
+        return 'Option(%r, %r, %r, %r)' % (self.short, self.long,
+                                           self.argcount, self.value)
+
+
+class Required(BranchPattern):
+
+    def match(self, left, collected=None):
+        collected = [] if collected is None else collected
+        l = left
+        c = collected
+        for pattern in self.children:
+            matched, l, c = pattern.match(l, c)
+            if not matched:
+                return False, left, collected
+        return True, l, c
+
+
+class Optional(BranchPattern):
+
+    def match(self, left, collected=None):
+        collected = [] if collected is None else collected
+        for pattern in self.children:
+            m, left, collected = pattern.match(left, collected)
+        return True, left, collected
+
+
+class OptionsShortcut(Optional):
+
+    """Marker/placeholder for [options] shortcut."""
+
+
+class OneOrMore(BranchPattern):
+
+    def match(self, left, collected=None):
+        assert len(self.children) == 1
+        collected = [] if collected is None else collected
+        l = left
+        c = collected
+        l_ = None
+        matched = True
+        times = 0
+        while matched:
+            # could it be that something didn't match but changed l or c?
+            matched, l, c = self.children[0].match(l, c)
+            times += 1 if matched else 0
+            if l_ == l:
+                break
+            l_ = l
+        if times >= 1:
+            return True, l, c
+        return False, left, collected
+
+
+class Either(BranchPattern):
+
+    def match(self, left, collected=None):
+        collected = [] if collected is None else collected
+        outcomes = []
+        for pattern in self.children:
+            matched, _, _ = outcome = pattern.match(left, collected)
+            if matched:
+                outcomes.append(outcome)
+        if outcomes:
+            return min(outcomes, key=lambda outcome: len(outcome[1]))
+        return False, left, collected
+
+
+class Tokens(list):
+
+    def __init__(self, source, error=DocoptExit):
+        self += source.split() if hasattr(source, 'split') else source
+        self.error = error
+
+    @staticmethod
+    def from_pattern(source):
+        source = re.sub(r'([\[\]\(\)\|]|\.\.\.)', r' \1 ', source)
+        source = [s for s in re.split('\s+|(\S*<.*?>)', source) if s]
+        return Tokens(source, error=DocoptLanguageError)
+
+    def move(self):
+        return self.pop(0) if len(self) else None
+
+    def current(self):
+        return self[0] if len(self) else None
+
+
+def parse_long(tokens, options):
+    """long ::= '--' chars [ ( ' ' | '=' ) chars ] ;"""
+    long, eq, value = tokens.move().partition('=')
+    assert long.startswith('--')
+    value = None if eq == value == '' else value
+    similar = [o for o in options if o.long == long]
+    if tokens.error is DocoptExit and similar == []:  # if no exact match
+        similar = [o for o in options if o.long and o.long.startswith(long)]
+    if len(similar) > 1:  # might be simply specified ambiguously 2+ times?
+        raise tokens.error('%s is not a unique prefix: %s?' %
+                           (long, ', '.join(o.long for o in similar)))
+    elif len(similar) < 1:
+        argcount = 1 if eq == '=' else 0
+        o = Option(None, long, argcount)
+        options.append(o)
+        if tokens.error is DocoptExit:
+            o = Option(None, long, argcount, value if argcount else True)
+    else:
+        o = Option(similar[0].short, similar[0].long,
+                   similar[0].argcount, similar[0].value)
+        if o.argcount == 0:
+            if value is not None:
+                raise tokens.error('%s must not have an argument' % o.long)
+        else:
+            if value is None:
+                if tokens.current() in [None, '--']:
+                    raise tokens.error('%s requires argument' % o.long)
+                value = tokens.move()
+        if tokens.error is DocoptExit:
+            o.value = value if value is not None else True
+    return [o]
+
+
+def parse_shorts(tokens, options):
+    """shorts ::= '-' ( chars )* [ [ ' ' ] chars ] ;"""
+    token = tokens.move()
+    assert token.startswith('-') and not token.startswith('--')
+    left = token.lstrip('-')
+    parsed = []
+    while left != '':
+        short, left = '-' + left[0], left[1:]
+        similar = [o for o in options if o.short == short]
+        if len(similar) > 1:
+            raise tokens.error('%s is specified ambiguously %d times' %
+                               (short, len(similar)))
+        elif len(similar) < 1:
+            o = Option(short, None, 0)
+            options.append(o)
+            if tokens.error is DocoptExit:
+                o = Option(short, None, 0, True)
+        else:  # why copying is necessary here?
+            o = Option(short, similar[0].long,
+                       similar[0].argcount, similar[0].value)
+            value = None
+            if o.argcount != 0:
+                if left == '':
+                    if tokens.current() in [None, '--']:
+                        raise tokens.error('%s requires argument' % short)
+                    value = tokens.move()
+                else:
+                    value = left
+                    left = ''
+            if tokens.error is DocoptExit:
+                o.value = value if value is not None else True
+        parsed.append(o)
+    return parsed
+
+
+def parse_pattern(source, options):
+    tokens = Tokens.from_pattern(source)
+    result = parse_expr(tokens, options)
+    if tokens.current() is not None:
+        raise tokens.error('unexpected ending: %r' % ' '.join(tokens))
+    return Required(*result)
+
+
+def parse_expr(tokens, options):
+    """expr ::= seq ( '|' seq )* ;"""
+    seq = parse_seq(tokens, options)
+    if tokens.current() != '|':
+        return seq
+    result = [Required(*seq)] if len(seq) > 1 else seq
+    while tokens.current() == '|':
+        tokens.move()
+        seq = parse_seq(tokens, options)
+        result += [Required(*seq)] if len(seq) > 1 else seq
+    return [Either(*result)] if len(result) > 1 else result
+
+
+def parse_seq(tokens, options):
+    """seq ::= ( atom [ '...' ] )* ;"""
+    result = []
+    while tokens.current() not in [None, ']', ')', '|']:
+        atom = parse_atom(tokens, options)
+        if tokens.current() == '...':
+            atom = [OneOrMore(*atom)]
+            tokens.move()
+        result += atom
+    return result
+
+
+def parse_atom(tokens, options):
+    """atom ::= '(' expr ')' | '[' expr ']' | 'options'
+             | long | shorts | argument | command ;
+    """
+    token = tokens.current()
+    result = []
+    if token in '([':
+        tokens.move()
+        matching, pattern = {'(': [')', Required], '[': [']', Optional]}[token]
+        result = pattern(*parse_expr(tokens, options))
+        if tokens.move() != matching:
+            raise tokens.error("unmatched '%s'" % token)
+        return [result]
+    elif token == 'options':
+        tokens.move()
+        return [OptionsShortcut()]
+    elif token.startswith('--') and token != '--':
+        return parse_long(tokens, options)
+    elif token.startswith('-') and token not in ('-', '--'):
+        return parse_shorts(tokens, options)
+    elif token.startswith('<') and token.endswith('>') or token.isupper():
+        return [Argument(tokens.move())]
+    else:
+        return [Command(tokens.move())]
+
+
+def parse_argv(tokens, options, options_first=False):
+    """Parse command-line argument vector.
+
+    If options_first:
+        argv ::= [ long | shorts ]* [ argument ]* [ '--' [ argument ]* ] ;
+    else:
+        argv ::= [ long | shorts | argument ]* [ '--' [ argument ]* ] ;
+
+    """
+    parsed = []
+    while tokens.current() is not None:
+        if tokens.current() == '--':
+            return parsed + [Argument(None, v) for v in tokens]
+        elif tokens.current().startswith('--'):
+            parsed += parse_long(tokens, options)
+        elif tokens.current().startswith('-') and tokens.current() != '-':
+            parsed += parse_shorts(tokens, options)
+        elif options_first:
+            return parsed + [Argument(None, v) for v in tokens]
+        else:
+            parsed.append(Argument(None, tokens.move()))
+    return parsed
+
+
+def parse_defaults(doc):
+    defaults = []
+    for s in parse_section('options:', doc):
+        # FIXME corner case "bla: options: --foo"
+        _, _, s = s.partition(':')  # get rid of "options:"
+        split = re.split('\n[ \t]*(-\S+?)', '\n' + s)[1:]
+        split = [s1 + s2 for s1, s2 in zip(split[::2], split[1::2])]
+        options = [Option.parse(s) for s in split if s.startswith('-')]
+        defaults += options
+    return defaults
+
+
+def parse_section(name, source):
+    pattern = re.compile('^([^\n]*' + name + '[^\n]*\n?(?:[ \t].*?(?:\n|$))*)',
+                         re.IGNORECASE | re.MULTILINE)
+    return [s.strip() for s in pattern.findall(source)]
+
+
+def formal_usage(section):
+    _, _, section = section.partition(':')  # drop "usage:"
+    pu = section.split()
+    return '( ' + ' '.join(') | (' if s == pu[0] else s for s in pu[1:]) + ' )'
+
+
+def extras(help, version, options, doc):
+    if help and any((o.name in ('-h', '--help')) and o.value for o in options):
+        print(doc.strip("\n"))
+        sys.exit()
+    if version and any(o.name == '--version' and o.value for o in options):
+        print(version)
+        sys.exit()
+
+
+class Dict(dict):
+    def __repr__(self):
+        return '{%s}' % ',\n '.join('%r: %r' % i for i in sorted(self.items()))
+
+
+def docopt(doc, argv=None, help=True, version=None, options_first=False):
+    """Parse `argv` based on command-line interface described in `doc`.
+
+    `docopt` creates your command-line interface based on its
+    description that you pass as `doc`. Such description can contain
+    --options, <positional-argument>, commands, which could be
+    [optional], (required), (mutually | exclusive) or repeated...
+
+    Parameters
+    ----------
+    doc : str
+        Description of your command-line interface.
+    argv : list of str, optional
+        Argument vector to be parsed. sys.argv[1:] is used if not
+        provided.
+    help : bool (default: True)
+        Set to False to disable automatic help on -h or --help
+        options.
+    version : any object
+        If passed, the object will be printed if --version is in
+        `argv`.
+    options_first : bool (default: False)
+        Set to True to require options precede positional arguments,
+        i.e. to forbid options and positional arguments intermix.
+
+    Returns
+    -------
+    args : dict
+        A dictionary, where keys are names of command-line elements
+        such as e.g. "--verbose" and "<path>", and values are the
+        parsed values of those elements.
+
+    Example
+    -------
+    >>> from docopt import docopt
+    >>> doc = '''
+    ... Usage:
+    ...     my_program tcp <host> <port> [--timeout=<seconds>]
+    ...     my_program serial <port> [--baud=<n>] [--timeout=<seconds>]
+    ...     my_program (-h | --help | --version)
+    ...
+    ... Options:
+    ...     -h, --help  Show this screen and exit.
+    ...     --baud=<n>  Baudrate [default: 9600]
+    ... '''
+    >>> argv = ['tcp', '127.0.0.1', '80', '--timeout', '30']
+    >>> docopt(doc, argv)
+    {'--baud': '9600',
+     '--help': False,
+     '--timeout': '30',
+     '--version': False,
+     '<host>': '127.0.0.1',
+     '<port>': '80',
+     'serial': False,
+     'tcp': True}
+
+    See also
+    --------
+    * For video introduction see http://docopt.org
+    * Full documentation is available in README.rst as well as online
+      at https://github.com/docopt/docopt#readme
+
+    """
+    argv = sys.argv[1:] if argv is None else argv
+
+    usage_sections = parse_section('usage:', doc)
+    if len(usage_sections) == 0:
+        raise DocoptLanguageError('"usage:" (case-insensitive) not found.')
+    if len(usage_sections) > 1:
+        raise DocoptLanguageError('More than one "usage:" (case-insensitive).')
+    DocoptExit.usage = usage_sections[0]
+
+    options = parse_defaults(doc)
+    pattern = parse_pattern(formal_usage(DocoptExit.usage), options)
+    # [default] syntax for argument is disabled
+    #for a in pattern.flat(Argument):
+    #    same_name = [d for d in arguments if d.name == a.name]
+    #    if same_name:
+    #        a.value = same_name[0].value
+    argv = parse_argv(Tokens(argv), list(options), options_first)
+    pattern_options = set(pattern.flat(Option))
+    for options_shortcut in pattern.flat(OptionsShortcut):
+        doc_options = parse_defaults(doc)
+        options_shortcut.children = list(set(doc_options) - pattern_options)
+        #if any_options:
+        #    options_shortcut.children += [Option(o.short, o.long, o.argcount)
+        #                    for o in argv if type(o) is Option]
+    extras(help, version, argv, doc)
+    matched, left, collected = pattern.fix().match(argv)
+    if matched and left == []:  # better error message if left?
+        return Dict((a.name, a.value) for a in (pattern.flat() + collected))
+    raise DocoptExit()

vendor/pip-pop/pip-diff

@@ -0,0 +1,116 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""Usage:
+  pip-diff (--fresh | --stale) <reqfile1> <reqfile2> [--exclude <package>...]
+  pip-diff (-h | --help)
+
+Options:
+  -h --help     Show this screen.
+  --fresh       List newly added packages.
+  --stale       List removed packages.
+"""
+import os
+from docopt import docopt
+from pip.req import parse_requirements
+from pip.index import PackageFinder
+from pip._vendor.requests import session
+
+requests = session()
+
+
+class Requirements(object):
+    def __init__(self, reqfile=None):
+        super(Requirements, self).__init__()
+        self.path = reqfile
+        self.requirements = []
+
+        if reqfile:
+            self.load(reqfile)
+
+    def __repr__(self):
+        return '<Requirements \'{}\'>'.format(self.path)
+
+    def load(self, reqfile):
+        if not os.path.exists(reqfile):
+            raise ValueError('The given requirements file does not exist.')
+
+        finder = PackageFinder([], [], session=requests)
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
+            if requirement.req:
+                if not getattr(requirement.req, 'name', None):
+                    # Prior to pip 8.1.2 the attribute `name` did not exist.
+                    requirement.req.name = requirement.req.project_name
+                self.requirements.append(requirement.req)
+
+
+    def diff(self, requirements, ignore_versions=False, excludes=None):
+        r1 = self
+        r2 = requirements
+        results = {'fresh': [], 'stale': []}
+
+        # Generate fresh packages.
+        other_reqs = (
+            [r.name for r in r1.requirements]
+            if ignore_versions else r1.requirements
+        )
+
+        for req in r2.requirements:
+            r = req.name if ignore_versions else req
+
+            if r not in other_reqs and r not in excludes:
+                results['fresh'].append(req)
+
+        # Generate stale packages.
+        other_reqs = (
+            [r.name for r in r2.requirements]
+            if ignore_versions else r2.requirements
+        )
+
+        for req in r1.requirements:
+            r = req.name if ignore_versions else req
+
+            if r not in other_reqs and r not in excludes:
+                results['stale'].append(req)
+
+        return results
+
+
+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)
+        r2 = Requirements(r2)
+    except ValueError:
+        print('There was a problem loading the given requirements files.')
+        exit(os.EX_NOINPUT)
+
+    results = r1.diff(r2, ignore_versions=True, excludes=excludes)
+
+    if include_fresh:
+        for line in results['fresh']:
+            print(line.name if include_versions else line)
+
+    if include_stale:
+        for line in results['stale']:
+            print(line.name if include_versions else line)
+
+
+def main():
+    args = docopt(__doc__, version='pip-diff')
+
+    kwargs = {
+        'r1': args['<reqfile1>'],
+        'r2': args['<reqfile2>'],
+        'include_fresh': args['--fresh'],
+        'include_stale': args['--stale'],
+        'excludes': args['<package>']
+    }
+
+    diff(**kwargs)
+
+
+if __name__ == '__main__':
+    main()

vendor/pip-pop/pip-grep

@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""Usage:
+  pip-grep [-s] <reqfile> <package>...
+
+Options:
+  -h --help     Show this screen.
+"""
+import os
+from docopt import docopt
+from pip.req import parse_requirements
+from pip.index import PackageFinder
+from pip._vendor.requests import session
+
+requests = session()
+
+
+class Requirements(object):
+    def __init__(self, reqfile=None):
+        super(Requirements, self).__init__()
+        self.path = reqfile
+        self.requirements = []
+
+        if reqfile:
+            self.load(reqfile)
+
+    def __repr__(self):
+        return '<Requirements \'{}\'>'.format(self.path)
+
+    def load(self, reqfile):
+        if not os.path.exists(reqfile):
+            raise ValueError('The given requirements file does not exist.')
+
+        finder = PackageFinder([], [], session=requests)
+        for requirement in parse_requirements(reqfile, finder=finder, session=requests):
+            if requirement.req:
+                if not getattr(requirement.req, 'name', None):
+                    # Prior to pip 8.1.2 the attribute `name` did not exist.
+                    requirement.req.name = requirement.req.project_name
+                self.requirements.append(requirement.req)
+
+
+def grep(reqfile, packages, silent=False):
+    try:
+        r = Requirements(reqfile)
+    except ValueError:
+        if not silent:
+            print('There was a problem loading the given requirement file.')
+        exit(os.EX_NOINPUT)
+
+    for req in r.requirements:
+        if req.name in packages:
+            if not silent:
+                print('Package {} found!'.format(req.name))
+            exit(0)
+
+    if not silent:
+        print('Not found.')
+
+    exit(1)
+
+
+def main():
+    args = docopt(__doc__, version='pip-grep')
+
+    kwargs = {'reqfile': args['<reqfile>'], 'packages': args['<package>'], 'silent': args['-s']}
+
+    grep(**kwargs)
+
+
+if __name__ == '__main__':
+    main()

vendor/python.gunicorn.sh

@@ -0,0 +1,32 @@
+case $(ulimit -u) in
+
+# Automatic configuration for Gunicorn's Workers setting.
+
+# Standard-1X (+Free, +Hobby) Dyno
+256)
+  export DYNO_RAM=512
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-2}
+  ;;
+
+# Standard-2X Dyno
+512)
+  export DYNO_RAM=1024
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4}
+  ;;
+
+# Performance-M Dyno
+16384)
+  export DYNO_RAM=2560
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-8}
+  ;;
+
+# Performance-L Dyno
+32768)
+  export DYNO_RAM=6656
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-11}
+  ;;
+
+esac
+
+# Automatic configuration for Gunicorn's ForwardedAllowIPS setting.
+export FORWARDED_ALLOW_IPS='*'