move v87 notes

* drop duplicate mkdir for .heroku

* simplify linking and moving of python and source

* steps/python needs its own symlink setup

* fix symlink destinations for vendor and venv

* always symlink python

CHANGELOG.md

@@ -1,5 +1,46 @@
 # Python Buildpack Changelog
 
+## 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.

Dockerfile

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

README.md

@@ -1,4 +1,4 @@
--![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
+![python](https://cloud.githubusercontent.com/assets/51578/13712821/b68a42ce-e793-11e5-96b0-d8eb978137ba.png)
 
 # Heroku Buildpack: Python
 
@@ -51,5 +51,4 @@ Runtime options include:
 - `python-2.7.12`
 - `python-3.5.2`
 - `pypy-5.3.1` (unsupported, experimental)
-
+- `pypy3-2.4.0` (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.12"
+DEFAULT_PYTHON_VERSION="python-2.7.13"
 DEFAULT_PYTHON_STACK="cedar-14"
 PYTHON_EXE="/app/.heroku/python/bin/python"
-PIP_VERSION="8.1.2"
+PIP_VERSION="9.0.1"
-SETUPTOOLS_VERSION="23.1.0"
+SETUPTOOLS_VERSION="32.1.0"
 
 # Common Problem Warnings
 export WARNINGS_LOG=$(mktemp)
@@ -56,14 +56,13 @@ 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
+unset GIT_DIR PYTHONHOME PYTHONPATH
 unset RECEIVE_DATA RUN_KEY BUILD_INFO DEPLOY LOG_TOKEN DYNO
 unset CYTOKINE_LOG_FILE GEM_PATH
 
 # Setup buildpack instrumentation.
 bpwatch init $LOGPLEX_KEY
 bpwatch build python $BUILDPACK_VERSION $REQUEST_ID
-TMP_APP_DIR=$CACHE_DIR/tmp_app_dir
 
 bpwatch start compile
 
@@ -73,50 +72,26 @@ source $BIN_DIR/utils
 # Import collection of warnings.
 source $BIN_DIR/warnings
 
-# Directory Hacks for path consistency.
+# we need to put a bunch of symlinks in there later
-APP_DIR='/app'
+mkdir -p /app/.heroku
-TMP_APP_DIR=$CACHE_DIR/tmp_app_dir
-
-# Skip these steps for Docker.
-if [[ ! "$DOCKER_BUILD" ]]; then
-
-  # Copy Anvil app dir to temporary storage...
-  bpwatch start anvil_appdir_stage
-  if [ "$SLUG_ID" ]; then
-    mkdir -p $TMP_APP_DIR
-    deep-mv $APP_DIR $TMP_APP_DIR
-  else
-    deep-rm $APP_DIR
-  fi
-  bpwatch stop anvil_appdir_stage
-
-  # Copy Application code in.
-  bpwatch start appdir_stage
-    deep-cp $BUILD_DIR $APP_DIR
-  bpwatch stop appdir_stage
-fi
-
-
-# Set new context.
-ORIG_BUILD_DIR=$BUILD_DIR
-BUILD_DIR=$APP_DIR
 
 # 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"
 
 # We'll need to send these statics to other scripts we `source`.
-export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH
+export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH EXPORT_PATH
 
 # Prepend proper environment variables for Python use.
-export PATH=$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH
+export PATH=/app/.heroku/python/bin:/app/.heroku/vendor/bin:$PATH
 export PYTHONUNBUFFERED=1
 export LANG=en_US.UTF-8
-export C_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include:$C_INCLUDE_PATH
+export C_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$C_INCLUDE_PATH
-export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:$BUILD_DIR/.heroku/vendor/include:/app/.heroku/python/include:$CPLUS_INCLUDE_PATH
+export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$CPLUS_INCLUDE_PATH
-export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH
+export LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH
-export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_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:$BUILD_DIR/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_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
@@ -176,13 +151,16 @@ bpwatch start restore_cache
 
 bpwatch stop restore_cache
 
-set +e
-# Create set-aside `.heroku` folder.
-mkdir .heroku &> /dev/null
-set -e
-
 mkdir -p $(dirname $PROFILE_PATH)
 
+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 -s $BUILD_DIR/.heroku/python /app/.heroku/python
+    ln -s $BUILD_DIR/.heroku/vendor /app/.heroku/vendor
+    ln -s $BUILD_DIR/.heroku/venv /app/.heroku/venv
+fi
+
 # Install Python.
 source $BIN_DIR/steps/python
 
@@ -252,19 +230,4 @@ bpwatch start dump_cache
 bpwatch stop dump_cache
 
 # Fin.
-if [[ ! "$DOCKER_BUILD" ]]; then
+bpwatch stop compile
-
-  bpwatch start appdir_commit
-    deep-rm $ORIG_BUILD_DIR
-    deep-mv $BUILD_DIR $ORIG_BUILD_DIR
-  bpwatch stop appdir_commit
-
-  bpwatch start anvil_appdir_commit
-  if [ "$SLUG_ID" ]; then
-    deep-mv $TMP_APP_DIR $APP_DIR
-  fi
-
-  bpwatch stop anvil_appdir_commit
-  bpwatch stop compile
-fi
-

bin/steps/cryptography

@@ -20,18 +20,16 @@ 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] PyNaCl pyOpenSSL PyOpenSSL requests[security] misaka &> /dev/null) then
+if (pip-grep -s requirements.txt argon2-cffi bcrypt cffi cryptography django[argon2] Django[argon2] django[bcrypt] Django[bcrypt] PyNaCl pyOpenSSL PyOpenSSL requests[security] misaka &> /dev/null) then
 
-  if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
+  if [ ! -d ".heroku/vendor/lib/libffi-3.1" ]; then
-    export LIBFFI=$(pwd)/vendor
-  else
     echo "-----> Noticed cffi. Bootstrapping libffi."
     mkdir -p .heroku/vendor
     # Download and extract libffi into target vendor directory.
     curl $VENDORED_LIBFFI -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export LIBFFI=$(pwd)/vendor
   fi
+
+  export LIBFFI=$(pwd)/vendor
 fi
 
 bpwatch stop libffi_install

bin/steps/gdal

@@ -22,16 +22,14 @@ bpwatch start gdal_install
 # If GDAL exists within requirements, use vendored gdal.
 if (pip-grep -s requirements.txt GDAL gdal pygdal &> /dev/null) then
 
-  if [ -f ".heroku/vendor/bin/gdalserver" ]; then
+  if [ ! -f ".heroku/vendor/bin/gdalserver" ]; then
-    export GDAL=$(pwd)/vendor
-  else
     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
-
-    export GDAL=$(pwd)/vendor
   fi
+
+  export GDAL=$(pwd)/vendor
 fi
 
 bpwatch stop gdal_install

bin/steps/geo-libs

@@ -24,18 +24,16 @@ bpwatch start geo_libs_install
 # If GDAL exists within requirements, use vendored gdal.
 if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
 
-  if [ -f ".heroku/vendor/bin/gdalserver" ]; then
+  if [ ! -f ".heroku/vendor/bin/proj" ]; then
-    export GDAL=$(pwd)/vendor
-  else
     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
-
-    export GDAL=$(pwd)/vendor
   fi
+
+  export GDAL=$(pwd)/vendor
 fi
 
 bpwatch stop geo_libs_install

bin/steps/pylibmc

@@ -21,16 +21,14 @@ 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
+  if [ ! -d ".heroku/vendor/lib/sasl2" ]; then
-    export LIBMEMCACHED=$(pwd)/vendor
-  else
     echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
     mkdir -p .heroku/vendor
     # Download and extract libmemcached into target vendor directory.
     curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    export LIBMEMCACHED=$(pwd)/vendor
   fi
+
+  export LIBMEMCACHED=$(pwd)/vendor
 fi
 
 bpwatch stop pylibmc_install

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

@@ -39,11 +39,13 @@ puts-cmd() {
 # Usage: $ set-env key value
 set-env() {
   echo "export $1=$2" >> $PROFILE_PATH
+  echo "export $1=$2" >> $EXPORT_PATH
 }
 
 # Usage: $ set-default-env key value
 set-default-env() {
   echo "export $1=\${$1:-$2}" >> $PROFILE_PATH
+  echo "export $1=\${$1:-$2}" >> $EXPORT_PATH
 }
 
 # Usage: $ un-set-env key

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

builds/runtimes/pypy-2.0.2

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

builds/runtimes/pypy-2.1

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

builds/runtimes/pypy-2.2

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

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

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

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

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

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

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

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

builds/runtimes/pypy-5.1.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-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

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

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

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

builds/runtimes/python-2.4.4

@@ -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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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='https://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.1

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

builds/runtimes/python-2.7.13

@@ -5,11 +5,11 @@
 OUT_PREFIX=$1
 
 echo "Building Python..."
-SOURCE_TARBALL='https://python.org/ftp/python/2.7/Python-2.7.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 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.2

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

builds/runtimes/python-2.7.3

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

builds/runtimes/python-2.7.4

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

builds/runtimes/python-3.1.1

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

builds/runtimes/python-3.2.0

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

builds/runtimes/python-3.2.1

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

builds/runtimes/python-3.3.2

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

builds/runtimes/python-3.3.3

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

builds/runtimes/python-3.3.4

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

builds/runtimes/python-3.3.5

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

builds/runtimes/python-3.3.6

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

builds/runtimes/python-3.4.0

@@ -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='https://python.org/ftp/python/3.4.0/Python-3.4.0.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.4.0 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
-make
-make install
-
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.4.1

@@ -1,18 +0,0 @@
-#!/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.4.1/Python-3.4.1.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.4.1 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
-make
-make install
-
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
-

builds/runtimes/python-3.4.2

@@ -1,18 +0,0 @@
-#!/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.4.2/Python-3.4.2.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.4.2 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
-make
-make install
-
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
-

builds/runtimes/python-3.4.3

@@ -1,18 +0,0 @@
-#!/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.4.3/Python-3.4.3.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.4.3 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
-make
-make install
-
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
-

builds/runtimes/python-3.5.0

@@ -1,18 +0,0 @@
-#!/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.0/Python-3.5.0.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.5.0 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no --enable-shared
-make
-make install
-
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
-

builds/runtimes/python-3.5.1

@@ -1,18 +0,0 @@
-#!/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.1/Python-3.5.1.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.5.1 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no
-make
-make install
-
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
-

builds/runtimes/python-3.5.2

@@ -14,5 +14,5 @@ cd src
 make
 make install
 
-ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
+# ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
 

vendor/pip-pop/pip-diff

@@ -18,6 +18,7 @@ from pip._vendor.requests import session
 
 requests = session()
 
+
 class Requirements(object):
     def __init__(self, reqfile=None):
         super(Requirements, self).__init__()
@@ -31,13 +32,15 @@ class Requirements(object):
         return '<Requirements \'{}\'>'.format(self.path)
 
     def load(self, reqfile):
-
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
         finder = PackageFinder([], [], session=requests)
         for requirement in parse_requirements(reqfile, finder=finder, session=requests):
             if requirement.req:
+                if not getattr(requirement.req, 'name', None):
+                    # Prior to pip 8.1.2 the attribute `name` did not exist.
+                    requirement.req.name = requirement.req.project_name
                 self.requirements.append(requirement.req)
 
 
@@ -48,24 +51,24 @@ class Requirements(object):
 
         # Generate fresh packages.
         other_reqs = (
-            [r.project_name for r in r1.requirements]
+            [r.name for r in r1.requirements]
             if ignore_versions else r1.requirements
         )
 
         for req in r2.requirements:
-            r = req.project_name if ignore_versions else req
+            r = req.name if ignore_versions else req
 
             if r not in other_reqs and r not in excludes:
                 results['fresh'].append(req)
 
         # Generate stale packages.
         other_reqs = (
-            [r.project_name for r in r2.requirements]
+            [r.name for r in r2.requirements]
             if ignore_versions else r2.requirements
         )
 
         for req in r1.requirements:
-            r = req.project_name if ignore_versions else req
+            r = req.name if ignore_versions else req
 
             if r not in other_reqs and r not in excludes:
                 results['stale'].append(req)
@@ -73,11 +76,7 @@ class Requirements(object):
         return results
 
 
-
-
-
 def diff(r1, r2, include_fresh=False, include_stale=False, excludes=None):
-
     include_versions = True if include_stale else False
     excludes = excludes if len(excludes) else []
 
@@ -92,12 +91,11 @@ def diff(r1, r2, include_fresh=False, include_stale=False, excludes=None):
 
     if include_fresh:
         for line in results['fresh']:
-            print(line.project_name if include_versions else line)
+            print(line.name if include_versions else line)
 
     if include_stale:
         for line in results['stale']:
-            print(line.project_name if include_versions else line)
+            print(line.name if include_versions else line)
-
 
 
 def main():
@@ -114,6 +112,5 @@ def main():
     diff(**kwargs)
 
 
-
 if __name__ == '__main__':
     main()

vendor/pip-pop/pip-grep

@@ -15,6 +15,7 @@ from pip._vendor.requests import session
 
 requests = session()
 
+
 class Requirements(object):
     def __init__(self, reqfile=None):
         super(Requirements, self).__init__()
@@ -28,38 +29,31 @@ class Requirements(object):
         return '<Requirements \'{}\'>'.format(self.path)
 
     def load(self, reqfile):
-
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
         finder = PackageFinder([], [], session=requests)
         for requirement in parse_requirements(reqfile, finder=finder, session=requests):
-            self.requirements.append(requirement)
+            if requirement.req:
-
+                if not getattr(requirement.req, 'name', None):
-
+                    # Prior to pip 8.1.2 the attribute `name` did not exist.
+                    requirement.req.name = requirement.req.project_name
+                self.requirements.append(requirement.req)
 
 
 def grep(reqfile, packages, silent=False):
-
     try:
         r = Requirements(reqfile)
     except ValueError:
-
         if not silent:
             print('There was a problem loading the given requirement file.')
-
         exit(os.EX_NOINPUT)
 
-    for requirement in r.requirements:
+    for req in r.requirements:
-
+        if req.name in packages:
-        if requirement.req:
+            if not silent:
-
+                print('Package {} found!'.format(req.name))
-            if requirement.req.project_name in packages:
+            exit(0)
-
-                if not silent:
-                    print('Package {} found!'.format(requirement.req.project_name))
-
-                exit(0)
 
     if not silent:
         print('Not found.')
@@ -72,10 +66,8 @@ def main():
 
     kwargs = {'reqfile': args['<reqfile>'], 'packages': args['<package>'], 'silent': args['-s']}
 
-
     grep(**kwargs)
 
 
-
 if __name__ == '__main__':
     main()

vendor/pip-pop/pip/__init__.py

@@ -1,315 +0,0 @@
-#!/usr/bin/env python
-from __future__ import absolute_import
-
-import logging
-import os
-import optparse
-import warnings
-
-import sys
-import re
-
-from pip.exceptions import InstallationError, CommandError, PipError
-from pip.utils import get_installed_distributions, get_prog
-from pip.utils import deprecation
-from pip.vcs import git, mercurial, subversion, bazaar  # noqa
-from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter
-from pip.commands import get_summaries, get_similar_commands
-from pip.commands import commands_dict
-from pip._vendor.requests.packages.urllib3.exceptions import (
-    InsecureRequestWarning,
-)
-
-
-# assignment for flake8 to be happy
-
-# This fixes a peculiarity when importing via __import__ - as we are
-# initialising the pip module, "from pip import cmdoptions" is recursive
-# and appears not to work properly in that situation.
-import pip.cmdoptions
-cmdoptions = pip.cmdoptions
-
-# The version as used in the setup.py and the docs conf.py
-__version__ = "7.1.2"
-
-
-logger = logging.getLogger(__name__)
-
-# Hide the InsecureRequestWArning from urllib3
-warnings.filterwarnings("ignore", category=InsecureRequestWarning)
-
-
-def autocomplete():
-    """Command and option completion for the main option parser (and options)
-    and its subcommands (and options).
-
-    Enable by sourcing one of the completion shell scripts (bash or zsh).
-    """
-    # Don't complete if user hasn't sourced bash_completion file.
-    if 'PIP_AUTO_COMPLETE' not in os.environ:
-        return
-    cwords = os.environ['COMP_WORDS'].split()[1:]
-    cword = int(os.environ['COMP_CWORD'])
-    try:
-        current = cwords[cword - 1]
-    except IndexError:
-        current = ''
-
-    subcommands = [cmd for cmd, summary in get_summaries()]
-    options = []
-    # subcommand
-    try:
-        subcommand_name = [w for w in cwords if w in subcommands][0]
-    except IndexError:
-        subcommand_name = None
-
-    parser = create_main_parser()
-    # subcommand options
-    if subcommand_name:
-        # special case: 'help' subcommand has no options
-        if subcommand_name == 'help':
-            sys.exit(1)
-        # special case: list locally installed dists for uninstall command
-        if subcommand_name == 'uninstall' and not current.startswith('-'):
-            installed = []
-            lc = current.lower()
-            for dist in get_installed_distributions(local_only=True):
-                if dist.key.startswith(lc) and dist.key not in cwords[1:]:
-                    installed.append(dist.key)
-            # if there are no dists installed, fall back to option completion
-            if installed:
-                for dist in installed:
-                    print(dist)
-                sys.exit(1)
-
-        subcommand = commands_dict[subcommand_name]()
-        options += [(opt.get_opt_string(), opt.nargs)
-                    for opt in subcommand.parser.option_list_all
-                    if opt.help != optparse.SUPPRESS_HELP]
-
-        # filter out previously specified options from available options
-        prev_opts = [x.split('=')[0] for x in cwords[1:cword - 1]]
-        options = [(x, v) for (x, v) in options if x not in prev_opts]
-        # filter options by current input
-        options = [(k, v) for k, v in options if k.startswith(current)]
-        for option in options:
-            opt_label = option[0]
-            # append '=' to options which require args
-            if option[1]:
-                opt_label += '='
-            print(opt_label)
-    else:
-        # show main parser options only when necessary
-        if current.startswith('-') or current.startswith('--'):
-            opts = [i.option_list for i in parser.option_groups]
-            opts.append(parser.option_list)
-            opts = (o for it in opts for o in it)
-
-            subcommands += [i.get_opt_string() for i in opts
-                            if i.help != optparse.SUPPRESS_HELP]
-
-        print(' '.join([x for x in subcommands if x.startswith(current)]))
-    sys.exit(1)
-
-
-def create_main_parser():
-    parser_kw = {
-        'usage': '\n%prog <command> [options]',
-        'add_help_option': False,
-        'formatter': UpdatingDefaultsHelpFormatter(),
-        'name': 'global',
-        'prog': get_prog(),
-    }
-
-    parser = ConfigOptionParser(**parser_kw)
-    parser.disable_interspersed_args()
-
-    pip_pkg_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    parser.version = 'pip %s from %s (python %s)' % (
-        __version__, pip_pkg_dir, sys.version[:3])
-
-    # add the general options
-    gen_opts = cmdoptions.make_option_group(cmdoptions.general_group, parser)
-    parser.add_option_group(gen_opts)
-
-    parser.main = True  # so the help formatter knows
-
-    # create command listing for description
-    command_summaries = get_summaries()
-    description = [''] + ['%-27s %s' % (i, j) for i, j in command_summaries]
-    parser.description = '\n'.join(description)
-
-    return parser
-
-
-def parseopts(args):
-    parser = create_main_parser()
-
-    # Note: parser calls disable_interspersed_args(), so the result of this
-    # call is to split the initial args into the general options before the
-    # subcommand and everything else.
-    # For example:
-    #  args: ['--timeout=5', 'install', '--user', 'INITools']
-    #  general_options: ['--timeout==5']
-    #  args_else: ['install', '--user', 'INITools']
-    general_options, args_else = parser.parse_args(args)
-
-    # --version
-    if general_options.version:
-        sys.stdout.write(parser.version)
-        sys.stdout.write(os.linesep)
-        sys.exit()
-
-    # pip || pip help -> print_help()
-    if not args_else or (args_else[0] == 'help' and len(args_else) == 1):
-        parser.print_help()
-        sys.exit()
-
-    # the subcommand name
-    cmd_name = args_else[0]
-
-    if cmd_name not in commands_dict:
-        guess = get_similar_commands(cmd_name)
-
-        msg = ['unknown command "%s"' % cmd_name]
-        if guess:
-            msg.append('maybe you meant "%s"' % guess)
-
-        raise CommandError(' - '.join(msg))
-
-    # all the args without the subcommand
-    cmd_args = args[:]
-    cmd_args.remove(cmd_name)
-
-    return cmd_name, cmd_args
-
-
-def check_isolated(args):
-    isolated = False
-
-    if "--isolated" in args:
-        isolated = True
-
-    return isolated
-
-
-def main(args=None):
-    if args is None:
-        args = sys.argv[1:]
-
-    # Enable our Deprecation Warnings
-    for deprecation_warning in deprecation.DEPRECATIONS:
-        warnings.simplefilter("default", deprecation_warning)
-
-    # Configure our deprecation warnings to be sent through loggers
-    deprecation.install_warning_logger()
-
-    autocomplete()
-
-    try:
-        cmd_name, cmd_args = parseopts(args)
-    except PipError as exc:
-        sys.stderr.write("ERROR: %s" % exc)
-        sys.stderr.write(os.linesep)
-        sys.exit(1)
-
-    command = commands_dict[cmd_name](isolated=check_isolated(cmd_args))
-    return command.main(cmd_args)
-
-
-# ###########################################################
-# # Writing freeze files
-
-class FrozenRequirement(object):
-
-    def __init__(self, name, req, editable, comments=()):
-        self.name = name
-        self.req = req
-        self.editable = editable
-        self.comments = comments
-
-    _rev_re = re.compile(r'-r(\d+)$')
-    _date_re = re.compile(r'-(20\d\d\d\d\d\d)$')
-
-    @classmethod
-    def from_dist(cls, dist, dependency_links, find_tags=False):
-        location = os.path.normcase(os.path.abspath(dist.location))
-        comments = []
-        from pip.vcs import vcs, get_src_requirement
-        if vcs.get_backend_name(location):
-            editable = True
-            try:
-                req = get_src_requirement(dist, location, find_tags)
-            except InstallationError as exc:
-                logger.warning(
-                    "Error when trying to get requirement for VCS system %s, "
-                    "falling back to uneditable format", exc
-                )
-                req = None
-            if req is None:
-                logger.warning(
-                    'Could not determine repository location of %s', location
-                )
-                comments.append(
-                    '## !! Could not determine repository location'
-                )
-                req = dist.as_requirement()
-                editable = False
-        else:
-            editable = False
-            req = dist.as_requirement()
-            specs = req.specs
-            assert len(specs) == 1 and specs[0][0] in ["==", "==="], \
-                'Expected 1 spec with == or ===; specs = %r; dist = %r' % \
-                (specs, dist)
-            version = specs[0][1]
-            ver_match = cls._rev_re.search(version)
-            date_match = cls._date_re.search(version)
-            if ver_match or date_match:
-                svn_backend = vcs.get_backend('svn')
-                if svn_backend:
-                    svn_location = svn_backend().get_location(
-                        dist,
-                        dependency_links,
-                    )
-                if not svn_location:
-                    logger.warning(
-                        'Warning: cannot find svn location for %s', req)
-                    comments.append(
-                        '## FIXME: could not find svn URL in dependency_links '
-                        'for this package:'
-                    )
-                else:
-                    comments.append(
-                        '# Installing as editable to satisfy requirement %s:' %
-                        req
-                    )
-                    if ver_match:
-                        rev = ver_match.group(1)
-                    else:
-                        rev = '{%s}' % date_match.group(1)
-                    editable = True
-                    req = '%s@%s#egg=%s' % (
-                        svn_location,
-                        rev,
-                        cls.egg_name(dist)
-                    )
-        return cls(dist.project_name, req, editable, comments)
-
-    @staticmethod
-    def egg_name(dist):
-        name = dist.egg_name()
-        match = re.search(r'-py\d\.\d$', name)
-        if match:
-            name = name[:match.start()]
-        return name
-
-    def __str__(self):
-        req = self.req
-        if self.editable:
-            req = '-e %s' % req
-        return '\n'.join(list(self.comments) + [str(req)]) + '\n'
-
-
-if __name__ == '__main__':
-    sys.exit(main())

vendor/pip-pop/pip/__main__.py

@@ -1,19 +0,0 @@
-from __future__ import absolute_import
-
-import os
-import sys
-
-# If we are running from a wheel, add the wheel to sys.path
-# This allows the usage python pip-*.whl/pip install pip-*.whl
-if __package__ == '':
-    # __file__ is pip-*.whl/pip/__main__.py
-    # first dirname call strips of '/__main__.py', second strips off '/pip'
-    # Resulting path is the name of the wheel itself
-    # Add that to sys.path so we can import pip
-    path = os.path.dirname(os.path.dirname(__file__))
-    sys.path.insert(0, path)
-
-import pip  # noqa
-
-if __name__ == '__main__':
-    sys.exit(pip.main())