Fix pyyaml (#402)

* Revert "use pkg_resources to check for distributions (#395)"

This reverts commit 9b185f99d5.

* use sp-grep for django detection

* sp-grep

* fix setuptools script

.dockerignore

@@ -0,0 +1 @@
+.git/

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
 site
+.DS_Store

.travis.yml

@@ -0,0 +1,9 @@
+language: bash
+sudo: required
+services:
+  - docker
+# install: docker pull heroku/cedar:14
+script: ./tests.sh
+env:
+  - STACK=heroku-16
+  - STACK=cedar-14

CHANGELOG.md

@@ -0,0 +1,252 @@
+# Python Buildpack Changelog
+
+# 106
+
+Don't install packages that could mess up packaging.
+
+- The Python buildpack will automatically remove `six`, `pyparsing`, `appdirs`,
+  `setuptools`, and `distribute` from a `requirements.txt` file now, as these
+  packages are provided by the Python buildpack.
+
+# 105
+
+Improvements to output messaging.
+
+# 104
+
+General improvements.
+
+- Fix for Heroku CI.
+- Use `pkg_resources` to check if a distribution is installed instead of
+  parsing `requirements.txt`. ([#395][395])
+
+[395]: https://github.com/heroku/heroku-buildpack-python/pull/395
+
+## 103
+
+Bug fixes and improvements.
+
+- Fix for Pipenv.
+- Fix for Heroku CI.
+- Improve handling of WEB_CONCURRENCY when using multiple buildpacks.
+- Adjust environment variables set during the build to more closely match those in the dyno environment (DYNO is now available, STACK is not).
+- Restore the build cache prior to running bin/pre_compile.
+
+## 102
+
+Buildpack code cleanup.
+
+- Improved messaging around NLTK.
+
+## 101
+
+Updated setuptools installation method.
+
+- Improved pipenv support.
+
+## 100
+
+Preliminary pipenv support.
+
+## 99
+
+Cleanup.
+
+## 98
+
+Official NLTK support and other improvements.
+
+- Support for `nltk.txt` file for declaring corpora to be downloaded.
+- Leading zeros for auto-set WEB_CONCURRENCY.
+
+## 97
+
+Improved egg-link functionality.
+
+## 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,13 @@
+FROM heroku/heroku:16-build
+
+WORKDIR /app
+ENV WORKSPACE_DIR="/app/builds" \
+    S3_BUCKET="lang-python" \
+    S3_PREFIX="heroku-16/"
+
+RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt /app/
+RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
+
+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

@@ -1,5 +1,32 @@
 # These targets are not files
 .PHONY: tests
 
-tests:
-	./bin/test
+test: test-cedar-14
+
+test-cedar-14:
+	@echo "Running tests in docker (cedar-14)..."
+	@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=cedar-14" heroku/cedar:14 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
+	@echo ""
+
+test-heroku-16:
+	@echo "Running tests in docker (heroku-16)..."
+	@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-16" heroku/heroku:16-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
+	@echo ""
+
+buildenv-heroku-16:
+	@echo "Creating build environment (heroku-16)..."
+	@echo
+	@docker build --pull -t python-buildenv-heroku-16 .
+	@echo
+	@echo "Usage..."
+	@echo
+	@echo "  $$ export AWS_ACCESS_KEY_ID=foo AWS_SECRET_ACCESS_KEY=bar  # Optional unless deploying"
+	@echo "  $$ bob build runtimes/python-2.7.13"
+	@echo "  $$ bob deploy runtimes/python-2.7.13"
+	@echo
+	@docker run -it --rm python-buildenv-heroku-16
+
+tools:
+	git clone https://github.com/kennethreitz/pip-pop.git
+	mv pip-pop/bin/* vendor/pip-pop/
+	rm -fr pip-pop

NOTICE

@@ -0,0 +1,137 @@
+This buildpack includes some vendorized packages to ease installation.
+
+jq license
+----------
+
+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:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+shunit2 license
+---------------
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
+
+0. Additional Definitions.
+
+As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License.
+
+“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
+
+An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
+
+A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”.
+
+The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
+
+The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
+
+1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
+
+2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
+
+a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
+
+a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this license document.
+4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
+
+a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
+c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
+e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
+5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
+
+get-pip.py license
+------------------
+
+Copyright (c) 2008-2016 The pip developers (see AUTHORS.txt file)
+
+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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+pip-pop license
+---------------
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Kenneth Reitz.
+
+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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -0,0 +1,56 @@
+![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
+
+# Heroku Buildpack: Python
+
+[![Build Status](https://travis-ci.org/heroku/heroku-buildpack-python.svg?branch=master)](https://travis-ci.org/heroku/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.1
+
+Runtime options include:
+
+- `python-2.7.13`
+- `python-3.6.1`
+- `pypy-5.7.1` (unsupported, experimental)
+- `pypy3-5.5.1` (unsupported, experimental)

Readme.md

@@ -1,52 +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
-    -----> Installing runtime (python-2.7.8)
-    -----> Installing dependencies using pip
-           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.2
-
-Runtime options include:
-
-- python-2.7.8
-- python-3.4.2
-- pypy-2.4.0 (unsupported, experimental)
-- pypy3-2.3.1 (unsupported, experimental)
-
-Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) 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,12 @@
 # Fail fast and fail hard.
 set -eo pipefail
 
+# Standard Library.
+export BPLOG_PREFIX="buildpack.python"
+export BUILDPACK_LOG_FILE=${BUILDPACK_LOG_FILE:-/dev/null}
+
+[ "$BUILDPACK_XTRACE" ] && set -o xtrace
+
 # Prepend proper path for virtualenv hackery. This will be deprecated soon.
 export PATH=:/usr/local/bin:$PATH
 
@@ -17,28 +31,19 @@ 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.9"
-DEFAULT_PYTHON_STACK="cedar"
+# Python defaults
+DEFAULT_PYTHON_VERSION="python-2.7.13"
+DEFAULT_PYTHON_STACK="cedar-14"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="1.5.6"
-SETUPTOOLS_VERSION="7.0"
+PIP_VERSION="9.0.1"
+SETUPTOOLS_VERSION="32.1.0"
 
-# Setup bpwatch
-export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
-LOGPLEX_KEY="t.b90d9d29-5388-4908-9737-b4576af1d4ce"
-export BPWATCH_STORE_PATH=$CACHE_DIR/bpwatch.json
-BUILDPACK_VERSION=v28
+# Common Problem Warnings
+export WARNINGS_LOG=$(mktemp)
+export RECOMMENDED_PYTHON_VERSION=$DEFAULT_PYTHON_VERSION
 
-# Setup pip-pop (pip-diff)
-export PATH=$PATH:$ROOT_DIR/vendor/pip-pop
+# Setup vendored tools and pip-pop (pip-diff)
+export PATH=$PATH:$ROOT_DIR/vendor/:$ROOT_DIR/vendor/pip-pop
 
 # Support Anvil Build_IDs
 [ ! "$SLUG_ID" ] && SLUG_ID="defaultslug"
@@ -46,67 +51,64 @@ export PATH=$PATH:$ROOT_DIR/vendor/pip-pop
 [ ! "$STACK" ] && STACK=$DEFAULT_PYTHON_STACK
 
 # Sanitizing environment variables.
-unset GIT_DIR PYTHONHOME PYTHONPATH LD_LIBRARY_PATH LIBRARY_PATH
-
-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
+unset GIT_DIR PYTHONHOME PYTHONPATH
+unset RECEIVE_DATA RUN_KEY BUILD_INFO DEPLOY LOG_TOKEN
+unset CYTOKINE_LOG_FILE GEM_PATH
 
 # Syntax sugar.
 source $BIN_DIR/utils
 
-# Directory Hacks for path consistiency.
-APP_DIR='/app'
-TMP_APP_DIR=$CACHE_DIR/tmp_app_dir
+# Import collection of warnings.
+source $BIN_DIR/warnings
 
-# Copy Anvil app dir to temporary storage...
-bpwatch start anvil_appdir_stage
-  if [ "$SLUG_ID" ]; then
-    mkdir -p $TMP_APP_DIR
-    deep-mv $APP_DIR $TMP_APP_DIR
-  else
-    deep-rm $APP_DIR
-  fi
-bpwatch stop anvil_appdir_stage
+# we need to put a bunch of symlinks in there later
+mkdir -p /app/.heroku
 
-# Copy Application code in.
-bpwatch start appdir_stage
-  deep-mv $BUILD_DIR $APP_DIR
-bpwatch stop appdir_stage
+# Set up outputs under new context
+PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
+EXPORT_PATH="$BIN_DIR/../export"
+GUNICORN_PROFILE_PATH="$BUILD_DIR/.profile.d/python.gunicorn.sh"
+WEB_CONCURRENCY_PROFILE_PATH="$BUILD_DIR/.profile.d/WEB_CONCURRENCY.sh"
 
-# Set new context.
-ORIG_BUILD_DIR=$BUILD_DIR
-BUILD_DIR=$APP_DIR
+# We'll need to send these statics to other scripts we `source`.
+export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH EXPORT_PATH
 
-# Prepend proper path buildpack use.
-export PATH=$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH
+# Prepend proper environment variables for Python use.
+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:/app/.heroku/python/include
-export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include
-export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib
-export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib
-export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config
+export C_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$C_INCLUDE_PATH
+export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$CPLUS_INCLUDE_PATH
+export LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH
+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:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH
 
 # Switch to the repo's context.
 cd $BUILD_DIR
 
-# 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 [ ! -f requirements.txt ]; then
-  echo "-e ." > requirements.txt
+# 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
 
+# Prepare the cache.
+mkdir -p $CACHE_DIR
+
+# Restore old artifacts from the cache.
+mkdir -p .heroku
+
+cp -R $CACHE_DIR/.heroku/python .heroku/ &> /dev/null || true
+cp -R $CACHE_DIR/.heroku/python-stack .heroku/ &> /dev/null || true
+cp -R $CACHE_DIR/.heroku/python-version .heroku/ &> /dev/null || true
+cp -R $CACHE_DIR/.heroku/vendor .heroku/ &> /dev/null || true
+if [[ -d $CACHE_DIR/.heroku/src ]]; then
+  cp -R $CACHE_DIR/.heroku/src .heroku/ &> /dev/null || true
+fi
+
+# Experimental pre_compile hook.
+source $BIN_DIR/steps/hooks/pre_compile
+
 # Sticky runtimes.
 if [ -f $CACHE_DIR/.heroku/python-version ]; then
   DEFAULT_PYTHON_VERSION=$(cat $CACHE_DIR/.heroku/python-version)
@@ -116,45 +118,43 @@ fi
 if [ -f $CACHE_DIR/.heroku/python-stack ]; then
   CACHED_PYTHON_STACK=$(cat $CACHE_DIR/.heroku/python-stack)
 else
-  CACHED_PYTHON_STACK=$DEFAULT_PYTHON_STACK
+  CACHED_PYTHON_STACK=$STACK
 fi
 
+# Pipenv Python version support.
+source $BIN_DIR/steps/pipenv-python-version
+
 # If no runtime given, assume default version.
 if [ ! -f runtime.txt ]; then
   echo $DEFAULT_PYTHON_VERSION > runtime.txt
 fi
 
-# ### The Cache
-mkdir -p $CACHE_DIR
-
-# Purge "old-style" virtualenvs.
-bpwatch start clear_old_venvs
-  [ -d $CACHE_DIR/$LEGACY_TRIGGER ] && rm -fr $CACHE_DIR/.heroku/bin $CACHE_DIR/.heroku/lib $CACHE_DIR/.heroku/include
-  [ -d $CACHE_DIR/$VIRTUALENV_LOC ] && rm -fr $CACHE_DIR/.heroku/venv $CACHE_DIR/.heroku/src
-bpwatch stop clear_old_venvs
-
-# Restore old artifacts from the cache.
-bpwatch start restore_cache
-  for dir in $CACHED_DIRS; do
-    cp -R $CACHE_DIR/$dir . &> /dev/null || true
-  done
-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
+
+if [[ $BUILD_DIR != '/app' ]]; then
+    # 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
+    # Note: .heroku/src is copied in later.
+fi
 
 # Install Python.
+let start=$(nowms)
 source $BIN_DIR/steps/python
+mtime "python.install.time" "${start}"
 
-# Sanity check for setuptools/distribute.
-source $BIN_DIR/steps/setuptools
+# Pipenv support.
+source $BIN_DIR/steps/pipenv
 
-# Uninstall removed dependencies with Pip.
-source $BIN_DIR/steps/pip-uninstall
+# If no requirements.txt file given, assume `setup.py develop` is intended.
+if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
+  echo "-e ." > requirements.txt
+fi
+
+# Fix egg-links.
+source $BIN_DIR/steps/eggpath-fix
 
 # Mercurial support.
 source $BIN_DIR/steps/mercurial
@@ -165,49 +165,81 @@ source $BIN_DIR/steps/pylibmc
 # Libffi support.
 source $BIN_DIR/steps/cryptography
 
-# Install dependencies with Pip.
-sub-env $BIN_DIR/steps/pip-install
+# Support for Geo libraries.
+sub-env $BIN_DIR/steps/geo-libs
+
+# GDAL support.
+source $BIN_DIR/steps/gdal
+
+# Uninstall removed dependencies with Pip.
+let start=$(nowms)
+source $BIN_DIR/steps/pip-uninstall
+mtime "pip.uninstall.time" "${start}"
+
+# Cleanup requirements.txt
+source $BIN_DIR/steps/setuptools
+
+# Install dependencies with Pip (where the magic happens).
+let start=$(nowms)
+source $BIN_DIR/steps/pip-install
+mtime "pip.install.time" "${start}"
+
+
+# Support for NLTK corpora.
+let start=$(nowms)
+sub-env $BIN_DIR/steps/nltk
+mtime "nltk.download.time" "${start}"
+
+# Support for pip install -e.
+# In CI, $BUILD_DIR is /app.
+if [[ ! "$BUILD_DIR" == "/app" ]]; then
+  rm -fr $BUILD_DIR/.heroku/src
+  deep-cp /app/.heroku/src $BUILD_DIR/.heroku/src
+fi
+
 
 # Django collectstatic support.
+let start=$(nowms)
 sub-env $BIN_DIR/steps/collectstatic
+mtime "collectstatic.time" "${start}"
 
-
-# ### Finalize
-#
-
-# Set context environment variables.
+# Create .profile script for application runtime environment variables.
 set-env PATH '$HOME/.heroku/python/bin:$PATH'
 set-env PYTHONUNBUFFERED true
 set-env PYTHONHOME /app/.heroku/python
-set-env LIBRARY_PATH /app/.heroku/vendor/lib:/app/.heroku/python/lib
+set-env LIBRARY_PATH '/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH'
 set-env LD_LIBRARY_PATH '/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH'
 set-default-env LANG en_US.UTF-8
 set-default-env PYTHONHASHSEED random
 set-default-env PYTHONPATH /app/
 
+# Install sane-default script for $WEB_CONCURRENCY and $FORWARDED_ALLOW_IPS.
+cp $ROOT_DIR/vendor/WEB_CONCURRENCY.sh $WEB_CONCURRENCY_PROFILE_PATH
+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
+source $BIN_DIR/steps/hooks/post_compile
+
+# Fix egg-links, again.
+source $BIN_DIR/steps/eggpath-fix2
 
 # Store new artifacts in cache.
-bpwatch start dump_cache
-  for dir in $CACHED_DIRS; do
-    rm -rf $CACHE_DIR/$dir
-    cp -R $dir $CACHE_DIR/
-  done
-bpwatch stop dump_cache
 
-# ### Fin.
-bpwatch start appdir_commit
-  deep-mv $BUILD_DIR $ORIG_BUILD_DIR
-bpwatch stop appdir_commit
+rm -rf $CACHE_DIR/.heroku/python
+rm -rf $CACHE_DIR/.heroku/python-version
+rm -rf $CACHE_DIR/.heroku/python-stack
+rm -rf $CACHE_DIR/.heroku/vendor
+rm -rf $CACHE_DIR/.heroku/src
 
-bpwatch start anvil_appdir_commit
-  if [ "$SLUG_ID" ]; then
-    deep-mv $TMP_APP_DIR $APP_DIR
-  fi
+mkdir -p $CACHE_DIR/.heroku
+cp -R .heroku/python $CACHE_DIR/.heroku/
+cp -R .heroku/python-version $CACHE_DIR/.heroku/
+cp -R .heroku/python-stack $CACHE_DIR/.heroku/ &> /dev/null || true
+cp -R .heroku/vendor $CACHE_DIR/.heroku/ &> /dev/null || true
+if [[ -d .heroku/src ]]; then
+  cp -R .heroku/src $CACHE_DIR/.heroku/ &> /dev/null || true
+fi
 
-bpwatch stop anvil_appdir_commit
-bpwatch stop compile
+# Measure the size of the Python installation.
+mmeasure 'python.size' "$(measure-size)"

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
@@ -15,7 +15,7 @@
 BUILD_DIR=$1
 
 # Exit early if app is clearly not Python.
-if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ]; then
+if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ] && [ ! -f $BUILD_DIR/Pipfile ]; then
   exit 1
 fi
 

bin/release

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

bin/steps/collectstatic

@@ -1,36 +1,64 @@
 #!/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
 
-bpwatch start collectstatic
+# Ensure that Django is explicitly specified in requirements.txt
+sp-grep django && DJANGO_INSTALLED=1
 
-if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ]; then
+
+if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALLED" ]; then
     set +e
 
-    echo "-----> Preparing static assets"
-    # Check if collectstatic is configured properly.
-    python $MANAGE_FILE collectstatic --dry-run --noinput &> /dev/null && RUN_COLLECTSTATIC=true
+    puts-step "$ python $MANAGE_FILE collectstatic --noinput"
 
-    # Compile assets if collectstatic appears to be kosher.
-    if [ "$RUN_COLLECTSTATIC" ]; then
+    # Run collectstatic, cleanup some of the noisy output.
+    python $MANAGE_FILE collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
+    COLLECTSTATIC_STATUS="${PIPESTATUS[0]}"
 
-        echo "       Running collectstatic..."
-        python $MANAGE_FILE collectstatic --noinput  2>&1 | sed '/^Copying/d;/^$/d;/^ /d' | indent
+    set -e
+
+    # Display a warning if collectstatic failed.
+    [ $COLLECTSTATIC_STATUS -ne 0 ] && {
+
+        echo
+        echo " !     Error while running '$ python $MANAGE_FILE collectstatic --noinput'."
+        echo "       See traceback above for details."
+        echo
+        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
+    }
 
-        [ $? -ne 0 ] && {
-            echo " !     Error running 'manage.py collectstatic'. More info:"
-            echo "       http://devcenter.heroku.com/articles/django-assets"
-        }
-    else
-        echo "       Collectstatic configuration error. To debug, run:"
-        echo "       $ heroku run python $MANAGE_FILE collectstatic --noinput"
-    fi
     echo
 fi
-
-bpwatch stop collectstatic

bin/steps/cryptography

@@ -1,37 +1,31 @@
 #!/usr/bin/env bash
 
-# This script serves as the Pylibmc build step of the
+# This script serves as the Cryptography build step of the
 # [**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 cryptography binary.
-VENDORED_LIBFFI="http://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libffi.tar.gz"
+# 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 pylibmc exists within requirements, use vendored cryptography.
-if (pip-grep -s requirements.txt bcrypt cffi cryptography &> /dev/null) then
-
-  if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
-    export LIBFFI=$(pwd)/vendor
-  else
+  if [ ! -d ".heroku/vendor/lib/libffi-3.1" ]; then
     echo "-----> Noticed cffi. Bootstrapping libffi."
     mkdir -p .heroku/vendor
-    # Download and extract cryptography into target vendor directory.
+    # Download and extract libffi into target vendor directory.
     curl $VENDORED_LIBFFI -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export LIBFFI=$(pwd)/vendor
   fi
-fi
 
-bpwatch stop libffi_install
+  export LIBFFI=$(pwd)/vendor
+fi

bin/steps/eggpath-fix

@@ -0,0 +1,11 @@
+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

bin/steps/eggpath-fix2

@@ -0,0 +1,9 @@
+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

bin/steps/gdal

@@ -0,0 +1,32 @@
+#!/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
+
+# 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
+

bin/steps/geo-libs

@@ -0,0 +1,36 @@
+#!/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
+
+# 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
+

bin/steps/mercurial

@@ -1,6 +1,4 @@
 # 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
+fi

bin/steps/nltk

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# This script serves as the NLTK 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`](/).
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+# Check that nltk was installed by pip, otherwise obviously not needed
+python -m nltk.downloader -h >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+    puts-step "Downloading NLTK corpora..."
+    nltk_packages_definition="$BUILD_DIR/nltk.txt"
+    if [ -f "$nltk_packages_definition" ]; then
+        nltk_packages=$(tr "\n" " " < "$nltk_packages_definition")
+        puts-step "Downloading NLTK packages: $nltk_packages"
+        python -m nltk.downloader -d $BUILD_DIR/.heroku/python/nltk_data $nltk_packages  | indent
+        set-env NLTK_DATA "/app/.heroku/python/nltk_data"
+    else
+        puts-warn "'nltk.txt' not found, not downloading any corpora"
+        puts-warn "Learn more: https://devcenter.heroku.com/articles/python-nltk"
+    fi
+fi
+

bin/steps/pip-install

@@ -1,20 +1,23 @@
-#!/usr/bin/env bash
+if [ ! "$SKIP_PIP_INSTALL" ]; then
 
-source $BIN_DIR/utils
+    # Install dependencies with Pip.
+    puts-step "Installing requirements with pip"
 
-# Install dependencies with Pip.
-puts-step "Installing dependencies with pip"
+    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
 
-[ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
-[ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
+    show-warnings
 
-/app/.heroku/python/bin/pip install -r requirements.txt --exists-action=w --src=./.heroku/src --allow-all-external  | cleanup | indent
+    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 > .heroku/python/requirements-installed.txt
 
-[ ! "$FRESH_PYTHON" ] && bpwatch stop pip_install
-[ "$FRESH_PYTHON" ] && bpwatch stop pip_install_first
+    # 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
 
-echo
+    echo
+fi

bin/steps/pip-uninstall

@@ -1,11 +1,11 @@
 set +e
 # Install dependencies with Pip.
-bpwatch start pip_uninstall
+
 if [[ -f .heroku/python/requirements-declared.txt ]]; then
 
   cp .heroku/python/requirements-declared.txt requirements-declared.txt
 
-  pip-diff --stale requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+  pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt
 
   rm -fr requirements-declared.txt
 
@@ -14,5 +14,5 @@ if [[ -f .heroku/python/requirements-declared.txt ]]; then
     /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
+
+set -e

bin/steps/pipenv

@@ -0,0 +1,19 @@
+# Pipenv support (Generate requriements.txt with pipenv).
+if [[ -f Pipfile ]]; then
+    if [[ ! -f requirements.txt ]]; then
+        puts-step "Installing requirements with latest pipenv..."
+
+        # Install pipenv.
+        /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
+
+        # Install the dependencies.
+        /app/.heroku/python/bin/pipenv install --system 2>&1 | indent
+
+        # Skip pip install, later.
+        export SKIP_PIP_INSTALL=1
+
+        # Pip freeze, for compatibility.
+        /app/.heroku/python/bin/pip freeze > requirements.txt
+
+    fi
+fi

bin/steps/pipenv-python-version

@@ -0,0 +1,23 @@
+# Detect Python-version with Pipenv.
+
+if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
+
+    if [[ ! -f $BUILD_DIR/runtime.txt ]]; then
+        if [[ ! -f $BUILD_DIR/Pipfile.lock ]]; then
+            puts-warn "No 'pipfile.lock' found! We recommend you commit this into your repository."
+        fi
+        if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
+            set +e
+            PYTHON=$(cat $BUILD_DIR/Pipfile.lock | jq '._meta.requires.python_version' -r)
+            set -e
+
+            if [ "$PYTHON" = 2.7 ]; then
+                echo "python-2.7.13" > $BUILD_DIR/runtime.txt
+            fi
+            if [ "$PYTHON" = 3.6 ]; then
+                echo "python-3.6.0" > $BUILD_DIR/runtime.txt
+            fi
+        fi
+    fi
+fi
+

bin/steps/pylibmc

@@ -4,33 +4,27 @@
 # [**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://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
+VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
 
 # Syntax sugar.
 source $BIN_DIR/utils
 
 
-bpwatch start pylibmc_install
-
 # 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
-    export LIBMEMCACHED=$(pwd)/vendor
-  else
+  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 $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export LIBMEMCACHED=$(pwd)/vendor
   fi
-fi
 
-bpwatch stop pylibmc_install
+  export LIBMEMCACHED=$(pwd)/vendor
+fi

bin/steps/python

@@ -1,43 +1,38 @@
 set +e
+runtime-fixer runtime.txt
 PYTHON_VERSION=$(cat runtime.txt)
 
 # Install Python.
 if [ -f .heroku/python-version ]; then
   if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then
-    bpwatch start uninstall_python
-      puts-step "Found runtime $(cat .heroku/python-version), removing"
+      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
-    puts-step "Stack changed, re-installing runtime"
     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 runtime ($PYTHON_VERSION)"
+    puts-step "Installing $PYTHON_VERSION"
 
     # Prepare destination directory.
     mkdir -p .heroku/python
 
-    curl http://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
+    curl https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
+    mcount "version.python.$PYTHON_VERSION"
+
     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
@@ -50,29 +45,17 @@ fi
 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
+  puts-step "Installing pip"
 
-  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
+  # Remove old installations.
+  rm -fr /app/.heroku/python/lib/python2.7/site-packages/pip-*
+  rm -fr /app/.heroku/python/lib/python2.7/site-packages/setuptools-*
+
+  /app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py &> /dev/null
 
-  bpwatch stop install_pip
-  bpwatch stop prepare_environment
 fi
 
 set -e

bin/steps/setuptools

@@ -3,9 +3,9 @@
 # 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. '
+puts-step "Removing packaging utilities from requirements.txt."
 
+if [[ -f requirements.txt ]]; then
+    pip-clean requirements.txt
 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

@@ -1,5 +1,12 @@
+#!/usr/bin/env bash
 shopt -s extglob
 
+# The standard library.
+if [[ ! -f  /tmp/stdlib.sh ]]; then
+  curl --retry 3 -s https://lang-common.s3.amazonaws.com/buildpack-stdlib/v2/stdlib.sh > /tmp/stdlib.sh
+fi
+source /tmp/stdlib.sh
+
 if [ $(uname) == Darwin ]; then
     sed() { command sed -l "$@"; }
 else
@@ -11,9 +18,10 @@ indent() {
   sed "s/^/       /"
 }
 
+
 # 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 Steps.
@@ -26,21 +34,6 @@ puts-warn() {
   echo " !     $@"
 }
 
-# Usage: $ set-env key value
-set-env() {
-  echo "export $1=$2" >> $PROFILE_PATH
-}
-
-# Usage: $ set-default-env key value
-set-default-env() {
-  echo "export $1=\${$1:-$2}" >> $PROFILE_PATH
-}
-
-# Usage: $ set-default-env key value
-un-set-env() {
-  echo "unset $1" >> $PROFILE_PATH
-}
-
 # Does some serious copying.
 deep-cp() {
   declare source="$1" target="$2"
@@ -57,26 +50,15 @@ deep-cp() {
   )
 }
 
-# Does some serious moving.
-deep-mv() {
-  deep-cp "$1" "$2"
-  deep-rm "$1"
-}
-
-# Does some serious deleting.
-deep-rm() {
-  # subshell to avoid surprising caller with shopts.
-  (
-    shopt -s dotglob
-    rm -rf "$1"/!(tmp|.|..)
-  )
-}
-
 
 sub-env() {
 
   WHITELIST=${2:-''}
-  BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'}
+  BLACKLIST=${3:-'^(GIT_DIR|STACK|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 +73,9 @@ sub-env() {
 
   )
 }
+
+# Measure the size of the Python installation.
+measure-size() {
+  echo "$((du -s .heroku/python 2>/dev/null || echo 0) | awk '{print $1}')"
+}
+

bin/warnings

@@ -0,0 +1,65 @@
+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."
+    mcount 'warnings.python.old'
+  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."
+    mcount 'warnings.libmemcache'
+  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."
+    mcount 'warnings.scipy'
+  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."
+    mcount 'warnings.distribute'
+  fi
+}
+
+six-included() {
+  if grep -qi 'Running setup.py install for six' "$WARNINGS_LOG"; then
+    echo
+    puts-warn "Hello! Your requirements.txt file contains the six 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."
+    mcount 'warnings.six'
+  fi
+}
+
+show-warnings() {
+  old-platform
+  pylibmc-missing
+  scipy-included
+  distribute-included
+  six-included
+}
+

builds/README.md

@@ -1,5 +1,7 @@
 # Python Buildpack Binaries
 
+For Cedar-14 stack
+------------------
 
 To get started with it, create an app on Heroku inside a clone of this repository, and set your S3 config vars:
 
@@ -28,4 +30,12 @@ If this works, run `bob deploy` instead of `bob build` to have the result upload
 
 To speed things up drastically, it'll usually be a good idea to `heroku run bash --size PX` instead.
 
-Enjoy :)
+For Heroku-16 stack
+-------------------
+
+1. Ensure GNU Make and Docker are installed.
+2. From the root of the buildpack repository, run: `make buildenv-heroku-16`
+3. Follow the instructions displayed!
+
+
+Enjoy :)

builds/libraries/autoconf

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

builds/libraries/libffi

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

builds/libraries/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 --enable-static=no  &&
+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.3.tar.bz2'
+
+curl -L $SOURCE_TARBALL | tar xj
+
+cd geos-3.4.3
+./configure --prefix=$OUT_PREFIX --enable-static=no &&
+make
+make install
+
+# Cleanup
+cd ..

builds/libraries/vendor/libffi

@@ -3,6 +3,11 @@
 
 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

builds/libraries/vendor/libmemcache

@@ -3,6 +3,11 @@
 
 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

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 --enable-static=no &&
+make
+make install
+
+# Cleanup
+cd ..

builds/runtimes/pypy-1.7

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

builds/runtimes/pypy-1.8

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

builds/runtimes/pypy-1.9

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

builds/runtimes/pypy-2.2

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

builds/runtimes/pypy-2.2.1

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

builds/runtimes/pypy-2.3

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

builds/runtimes/pypy-2.3.1

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

builds/runtimes/pypy-2.4.0

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

builds/runtimes/pypy-5.3.1

@@ -7,8 +7,8 @@
 OUT_PREFIX=$1
 
 echo "Building PyPy..."
-SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux64.tar.bz2'
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.1-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
-cp -R pypy-2.0.2/* $OUT_PREFIX
+cp -R pypy2-v5.3.1-linux64/* $OUT_PREFIX
 
 ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-5.6.0

@@ -7,8 +7,8 @@
 OUT_PREFIX=$1
 
 echo "Building PyPy..."
-SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux64.tar.bz2'
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
-cp -R pypy-2.0.1/* $OUT_PREFIX
+cp -R pypy2-v5.6.0-linux64/* $OUT_PREFIX
 
 ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-5.7.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 and heroku-16 stacks, not cedar.
+
+OUT_PREFIX=$1
+
+echo "Building PyPy..."
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux64.tar.bz2'
+curl -L $SOURCE_TARBALL | tar jx
+cp -R pypy2-v5.7.0-linux64/* $OUT_PREFIX
+
+ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-5.7.1

@@ -7,8 +7,8 @@
 OUT_PREFIX=$1
 
 echo "Building PyPy..."
-SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux64.tar.bz2'
+SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
-cp -R pypy-2.1/* $OUT_PREFIX
+cp -R pypy2-v5.7.1-linux64/* $OUT_PREFIX
 
 ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy3-5.5.0

@@ -7,8 +7,8 @@
 OUT_PREFIX=$1
 
 echo "Building PyPy..."
-SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux64.tar.bz2'
+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 pypy-2.0/* $OUT_PREFIX
+cp -R pypy3-v5.5.0-linux64/* $OUT_PREFIX
 
-ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python
+ln $OUT_PREFIX/bin/pypy3 $OUT_PREFIX/bin/python

builds/runtimes/pypy3-5.7.1

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

builds/runtimes/python-2.4.4

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

builds/runtimes/python-2.4.5

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

builds/runtimes/python-2.4.6

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

builds/runtimes/python-2.5.0

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

builds/runtimes/python-2.5.1

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

builds/runtimes/python-2.5.2

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

builds/runtimes/python-2.5.3

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

builds/runtimes/python-2.5.4

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

builds/runtimes/python-2.5.5

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

builds/runtimes/python-2.5.6

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

builds/runtimes/python-2.6.0

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
-
-# NOTICE: This formula only works for the cedar stack, not cedar-14.
-
-OUT_PREFIX=$1
-
-# Protect 2.6 builds from parent Python (causes segfault during build).
-unset LANG PYTHONHOME PYTHONPATH
-
-echo "Building Python..."
-SOURCE_TARBALL='http://www.python.org/ftp/python/2.6/Python-2.6.tar.bz2'
-curl -L $SOURCE_TARBALL | tar jx
-mv Python-2.6 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --enable-shared
-make
-make install

builds/runtimes/python-2.6.1

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
-
-# NOTICE: This formula only works for the cedar stack, not cedar-14.
-
-OUT_PREFIX=$1
-
-# Protect 2.6 builds from parent Python (causes segfault during build).
-unset LANG PYTHONHOME PYTHONPATH
-
-echo "Building Python..."
-SOURCE_TARBALL='http://python.org/ftp/python/2.6.1/Python-2.6.1.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-2.6.1 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --enable-shared
-make
-make install

builds/runtimes/python-2.6.2

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

builds/runtimes/python-2.6.3

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

builds/runtimes/python-2.6.4

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

builds/runtimes/python-2.6.5

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

builds/runtimes/python-2.6.6

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

builds/runtimes/python-2.6.7

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

builds/runtimes/python-2.6.8

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

builds/runtimes/python-2.6.9

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

builds/runtimes/python-2.7.10

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

builds/runtimes/python-2.7.11

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

builds/runtimes/python-2.7.12

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

builds/runtimes/python-2.7.13

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

builds/runtimes/python-2.7.4

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

builds/runtimes/python-2.7.5

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

builds/runtimes/python-2.7.6

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

builds/runtimes/python-2.7.7

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

builds/runtimes/python-2.7.7-shared

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

builds/runtimes/python-2.7.8

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

builds/runtimes/python-2.7.8-shared

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

builds/runtimes/python-2.7.9

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

builds/runtimes/python-3.1.1

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

builds/runtimes/python-3.1.2

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

builds/runtimes/python-3.1.3

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

builds/runtimes/python-3.1.4

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

builds/runtimes/python-3.1.5

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

builds/runtimes/python-3.2.1

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

builds/runtimes/python-3.2.2

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

builds/runtimes/python-3.2.3

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

builds/runtimes/python-3.2.4

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

builds/runtimes/python-3.2.5

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

builds/runtimes/python-3.3.0

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

builds/runtimes/python-3.3.1

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