v81

Add Python 2.7.12, Python 3.5.2, Pypy 5.3.1, Pip 8.1.2, Setuptools 23.1.0 and remove release candidate

.travis.yml

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

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Python Buildpack Changelog
 
+## v81 (2016-06-28)
+
+Updated default Python to 2.7.11.
+
+- Updated setuptools to v8.1.2.
+- Updated pip to v23.1.0.
+
 ## v80 (2016-04-05)
 
 Improved pip-pop compatibility with latest pip releases.

README.md

@@ -1,5 +1,6 @@
+-![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
+
 # Heroku Buildpack: Python
-![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
 
 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.
 
@@ -20,12 +21,12 @@ Deploying a Python application couldn't be easier:
     $ git push heroku master
     ...
     -----> Python app detected
-    -----> Installing python-2.7.11
+    -----> Installing python-2.7.12
          $ pip install -r requirements.txt
            Collecting requests (from -r requirements.txt (line 1))
-             Downloading requests-2.9.1-py2.py3-none-any.whl (501kB)
+             Downloading requests-2.10.0-py2.py3-none-any.whl (501kB)
            Installing collected packages: requests
-           Successfully installed requests-2.9.1
+           Successfully installed requests-2.10.0
            
     -----> Discovering process types
            Procfile declares types -> (none)
@@ -43,12 +44,12 @@ Specify a Python Runtime
 Specific versions of the Python runtime can be specified with a `runtime.txt` file:
 
     $ cat runtime.txt
-    python-3.5.1
+    python-3.5.2
 
 Runtime options include:
 
-- `python-2.7.11`
+- `python-2.7.12`
-- `python-3.5.1`
+- `python-3.5.2`
-- `pypy-5.0.1` (unsupported, experimental)
+- `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. 

bin/compile

@@ -31,11 +31,11 @@ ENV_DIR=$3
 VIRTUALENV_LOC=".heroku/venv"
 LEGACY_TRIGGER="lib/python2.7"
 
-DEFAULT_PYTHON_VERSION="python-2.7.11"
+DEFAULT_PYTHON_VERSION="python-2.7.12"
 DEFAULT_PYTHON_STACK="cedar-14"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="8.1.1"
+PIP_VERSION="8.1.2"
-SETUPTOOLS_VERSION="20.4"
+SETUPTOOLS_VERSION="23.1.0"
 
 # Common Problem Warnings
 export WARNINGS_LOG=$(mktemp)

bin/steps/cryptography

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

builds/runtimes/pypy-5.1.0

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

builds/runtimes/pypy-5.1.1

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

builds/runtimes/pypy-5.3.1

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

builds/runtimes/python-2.7.12

@@ -5,9 +5,9 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='https://www.python.org/ftp/python/2.7.11/Python-2.7.11rc1.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.11rc1 src
+mv Python-2.7.12 src
 cd src
 
 ./configure --prefix=$OUT_PREFIX  --with-ensurepip=no

builds/runtimes/python-3.5.2

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

vendor/pip-pop/pip-grep

@@ -62,7 +62,7 @@ def grep(reqfile, packages, silent=False):
                 exit(0)
 
     if not silent:
-        print('Not found.'.format(requirement.req.project_name))
+        print('Not found.')
 
     exit(1)