Merge remote-tracking branch 'gh/master'

Author: rinti

.travis.yml

@@ -0,0 +1,2 @@
+sudo: false
+script: exit 0

CHANGELOG.md

@@ -0,0 +1,112 @@
+# Python Buildpack Changelog
+
+## 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,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:
 

LICENSE

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

Makefile

@@ -0,0 +1,55 @@
+-![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
+
+# Heroku Buildpack: Python
+
+This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [pip](https://pip.pypa.io/) and other excellent software.
+
+Recommended web frameworks include **Django** and **Flask**. The recommended webserver is **Gunicorn**. There are no restrictions around what software can be used (as long as it's pip-installable). Web processes must bind to `$PORT`, and only the HTTP protocol is permitted for incoming connections.
+
+Some Python packages with obscure C dependencies (e.g. scipy) are [not compatible](https://devcenter.heroku.com/articles/python-c-deps). 
+
+See it in Action
+----------------
+
+Deploying a Python application couldn't be easier:
+
+ $ ls
+ Procfile requirements.txt web.py
+
+ $ heroku create --buildpack heroku/python
+
+ $ git push heroku master
+ ...
+ -----> Python app detected
+ -----> Installing python-2.7.12
+  $ pip install -r requirements.txt
+  Collecting requests (from -r requirements.txt (line 1))
+  Downloading requests-2.10.0-py2.py3-none-any.whl (501kB)
+  Installing collected packages: requests
+  Successfully installed requests-2.10.0
+  
+ -----> 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.5.2
+
+Runtime options include:
+
+- `python-2.7.12`
+- `python-3.5.2`
+- `pypy-5.3.1` (unsupported, experimental)
+
+Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well. Use at your own risk. 

README.md

@@ -1,6 +1,55 @@
-Heroku buildpack: Python with python-ldap
-=========================================
+-![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
 
-This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) for Python apps with `python-ldap` package requirement, powered by [pip](http://www.pip-installer.org/).
+# Heroku Buildpack: Python
 
-Adds support for `python-ldap` package. Nothing more than `python-ldap` specified in requirements.txt file is needed.
+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.12
+  $ pip install -r requirements.txt
+  Collecting requests (from -r requirements.txt (line 1))
+  Downloading requests-2.10.0-py2.py3-none-any.whl (501kB)
+  Installing collected packages: requests
+  Successfully installed requests-2.10.0
+  
+ -----> 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.5.2
+
+Runtime options include:
+
+- `python-2.7.12`
+- `python-3.5.2`
+- `pypy-5.3.1` (unsupported, experimental)
+
+Other [unsupported runtimes](https://github.com/heroku/heroku-buildpack-python/tree/master/builds/runtimes) are available as well. Use at your own risk.