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.

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

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)
 
@@ -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)
 
 
@@ -73,4 +76,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()