Merge remote-tracking branch 'origin/master'

Updated pypy to 2.3.1 and added pypy3

Readme.md

@@ -46,6 +46,7 @@ Runtime options include:
 
 - python-2.7.8
 - python-3.4.1
-- pypy-1.9 (experimental)
+- pypy-2.3.1 (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/steps/cryptography

@@ -20,7 +20,7 @@ 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 (pip-grep -s requirements.txt cffi crytography &> /dev/null) then
 
   if [ -d ".heroku/vendor/lib/libffi-3.1.1" ]; then
     export LIBFFI=$(pwd)/vendor

builds/libraries/libffi

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

@@ -10,7 +10,7 @@ hash -r
 
 echo "Building libffi..."
 
-SOURCE_TARBALL='http://cl.ly/2s1t1u3v0N0I/download/libffi-3.1.tar'
+SOURCE_TARBALL='ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz'
 
 curl -L $SOURCE_TARBALL | tar x
 

builds/libraries/vendor/libmemcache

@@ -22,7 +22,8 @@ curl -LO ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 tar xzf cyrus-sasl-2.1.26.tar.gz
 
 pushd cyrus-sasl-2.1.26
-./configure --prefix=${OUT_PREFIX}
+./configure --prefix=${OUT_PREFIX} --with-plugindir=${OUT_PREFIX}lib/sasl2 --with-configdir=${OUT_PREFIX}lib/sasl2
+
 make -s -j 9
 make install -s
 popd

builds/runtimes/pypy-2.3

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
+# Build Deps: libraries/sqlite, libraries/libffi
 
 # NOTICE: This formula only works for the cedar-14 stack, not cedar.
 

vendor/pip-pop/pip-diff

@@ -13,6 +13,7 @@ Options:
 import os
 from docopt import docopt
 from pip.req import parse_requirements
+from pip.index import PackageFinder
 
 class Requirements(object):
     def __init__(self, reqfile=None):
@@ -31,7 +32,8 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        for requirement in parse_requirements(reqfile):
+        finder = PackageFinder([], [])
+        for requirement in parse_requirements(reqfile, finder=finder):
             if requirement.req:
                 self.requirements.append(requirement.req)
 
@@ -79,18 +81,18 @@ def diff(r1, r2, include_fresh=False, include_stale=False):
         r1 = Requirements(r1)
         r2 = Requirements(r2)
     except ValueError:
-        print 'There was a problem loading the given requirements files.'
+        print('There was a problem loading the given requirements files.')
         exit(os.EX_NOINPUT)
 
     results = r1.diff(r2, ignore_versions=True)
 
     if include_fresh:
         for line in results['fresh']:
-            print line.project_name if include_versions else line
+            print(line.project_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.project_name if include_versions else line)
 
 
 
@@ -109,4 +111,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()

vendor/pip-pop/pip-grep

@@ -10,6 +10,8 @@ Options:
 import os
 from docopt import docopt
 from pip.req import parse_requirements
+from pip.index import PackageFinder
+
 
 class Requirements(object):
     def __init__(self, reqfile=None):
@@ -28,7 +30,8 @@ class Requirements(object):
         if not os.path.exists(reqfile):
             raise ValueError('The given requirements file does not exist.')
 
-        for requirement in parse_requirements(reqfile):
+        finder = PackageFinder([], [])
+        for requirement in parse_requirements(reqfile, finder=finder):
             self.requirements.append(requirement)
 
 
@@ -41,7 +44,7 @@ def grep(reqfile, packages, silent=False):
     except ValueError:
 
         if not silent:
-            print 'There was a problem loading the given requirement file.'
+            print('There was a problem loading the given requirement file.')
 
         exit(os.EX_NOINPUT)
 
@@ -52,12 +55,12 @@ def grep(reqfile, packages, silent=False):
             if requirement.req.project_name in packages:
 
                 if not silent:
-                    print 'Package {} found!'.format(requirement.req.project_name)
+                    print('Package {} found!'.format(requirement.req.project_name))
 
                 exit(0)
 
     if not silent:
-        print 'Not found.'.format(requirement.req.project_name)
+        print('Not found.'.format(requirement.req.project_name))
 
     exit(1)
 
@@ -73,4 +76,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()