suppress pip-grep errors

bin/compile

@@ -159,11 +159,14 @@ source $BIN_DIR/steps/mercurial
 # Pylibmc support.
 source $BIN_DIR/steps/pylibmc
 
+# Libffi support.
+source $BIN_DIR/steps/cryptography
+
 # Install dependencies with Pip.
 source $BIN_DIR/steps/pip-install
 
 # Django collectstatic support.
-source $BIN_DIR/steps/collectstatic
+sub-env $BIN_DIR/steps/collectstatic
 
 
 # ### Finalize

bin/steps/cryptography

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# This script serves as the Pylibmc build step of the
+# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
+# compiler.
+#
+# A [buildpack](http://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"
+
+PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+bpwatch start libffi_install
+
+# If pylibmc exists within requirements, use vendored cryptography.
+if (pip-grep -s requirements.txt cffi pylibmc &> /dev/null) then
+
+  if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
+    export LIBFFI=$(pwd)/vendor
+  else
+    echo "-----> Noticed cffi. Bootstrapping libffi."
+    mkdir -p .heroku/vendor
+    # Download and extract cryptography 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

bin/steps/pip-uninstall

@@ -3,7 +3,11 @@ set +e
 bpwatch start pip_uninstall
 if [[ -f .heroku/python/requirements-declared.txt ]]; then
 
-  pip-diff --stale .heroku/python/requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+  cp .heroku/python/requirements-declared.txt requirements-declared.txt
+
+  pip-diff --stale requirements-declared.txt requirements.txt > .heroku/python/requirements-stale.txt
+
+  rm -fr requirements-declared.txt
 
   if [[ -s .heroku/python/requirements-stale.txt ]]; then
     puts-step "Uninstalling stale dependencies"

bin/steps/pylibmc

@@ -10,30 +10,27 @@
 # This script is invoked by [`bin/compile`](/).
 
 # The location of the pre-compiled libmemcached binary.
-VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz"
+VENDORED_MEMCACHED="http://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) then
-  echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
-  cd .heroku
+if (pip-grep -s requirements.txt pylibmc &> /dev/null) then
 
-  if [ -d "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 -s -L -o tmp-libmemcached.tar.gz $VENDORED_MEMCACHED
-    tar -zxvf tmp-libmemcached.tar.gz > /dev/null
-    rm tmp-libmemcached.tar.gz
+    curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
+
     export LIBMEMCACHED=$(pwd)/vendor
   fi
-
-  export LIBMEMCACHED=$(pwd)/vendor
-  cd ..
 fi
 
 bpwatch stop pylibmc_install

builds/libraries/libffi

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/autoconf
-
-OUT_PREFIX=$1
-
-# Use new path, containing autoconf.
-export PATH="/app/.heroku/python/bin/:$PATH"
-hash -r
-
-
-echo "Building libffi..."
-
-SOURCE_TARBALL='https://github.com/atgreen/libffi/archive/master.tar.gz'
-
-curl -L $SOURCE_TARBALL | tar xz
-mv libffi-master libffi
-
-cd libffi
-./autogen.sh
-./configure --prefix=$OUT_PREFIX --enable-shared
-make
-make install
-
-# Cleanup
-cd ..

builds/libraries/vendor/libffi

@@ -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 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/vendor/libmemcache

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/vendor/
+
+OUT_PREFIX=$1
+
+# fail hard
+set -o pipefail
+# fail harder
+set -eux
+
+DEFAULT_VERSION="1.0.18"
+dep_version=${VERSION:-$DEFAULT_VERSION}
+dep_dirname=libmemcached-${dep_version}
+dep_archive_name=${dep_dirname}.tar.gz
+dep_url=https://launchpad.net/libmemcached/1.0/${dep_version}/+download/${dep_archive_name}
+
+# SASL Support.
+echo "-----> Building cyrus-sasl 2.1.26..."
+
+curl -LO ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+# FTP doesn't play well with piping into tar xz
+tar xzf cyrus-sasl-2.1.26.tar.gz
+
+pushd cyrus-sasl-2.1.26
+./configure --prefix=${OUT_PREFIX}
+make -s -j 9
+make install -s
+popd
+
+echo "-----> Building libmemcached ${dep_version}..."
+
+curl -L ${dep_url} | tar xz
+pushd ${dep_dirname}
+CPPFLAGS=-I${OUT_PREFIX}/include LDFLAGS=-L${OUT_PREFIX}/lib ./configure --prefix=${OUT_PREFIX} --without-memcached
+make -s -j 9
+make install -s
+popd
+
+echo "-----> Done."

vendor/pip-pop/pip-grep

@@ -39,8 +39,10 @@ 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:
@@ -48,11 +50,15 @@ def grep(reqfile, packages, silent=False):
         if requirement.req:
 
             if requirement.req.project_name in packages:
+
                 if not silent:
                     print 'Package {} found!'.format(requirement.req.project_name)
+
                 exit(0)
 
-    print 'Not found.'.format(requirement.req.project_name)
+    if not silent:
+        print 'Not found.'.format(requirement.req.project_name)
+
     exit(1)