changelog

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Python Buildpack Changelog
 
+# 118
+
+Improvements to Pipenv support.
+
+# 117
+
+Bug fix.
+
+# 116
+
+Vendoring improvements.
+
+- Geos libraries should work on Heroku-16 now.
+- The libffi/libmemcached vendoring step is now skipped on Heroku-16 (since they are installed in the base image).
+
 # 115
 
 Revert a pull request.
@@ -28,17 +43,17 @@ Linting, bugfixes.
 
 # 110
 
+Update default Python to 3.6.2.
+
+# 109
+
 Update Default Python to 3.6.1, bugfixes.
 
 - Fixed automatic pip uninstall of dependencies removed from requirements.txt.
 
-# 109
-
-Fix output for collectstatic step.
-
 # 108
 
-Updated setuptools.
+Fix output for collectstatic step.
 
 # 107
 

bin/steps/cryptography

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This script serves as the Cryptography build step of the
+# This script serves as the cffi build step of the
 # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
 # compiler.
 #
@@ -9,6 +9,11 @@
 #
 # This script is invoked by [`bin/compile`](/).
 
+if [[ "$STACK" == "heroku-16" ]]; then
+    # libffi is pre-installed in the stack image so there is no need to vendor it.
+    return 0
+fi
+
 # The location of the pre-compiled libffi binary.
 VENDORED_LIBFFI="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libffi.tar.gz"
 

bin/steps/geo-libs

@@ -30,6 +30,12 @@ if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
     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
+
+    # Copy libjasper from build image to slug.
+    if [[ "$STACK" == "heroku-16" ]]; then
+      cp /usr/lib/x86_64-linux-gnu/libjasper.so* ".heroku/vendor/lib/."
+    fi
+
   fi
 
   GDAL=$(pwd)/vendor

bin/steps/pipenv

@@ -3,13 +3,18 @@
 # Pipenv support (Generate requriements.txt with pipenv).
 if [[ -f Pipfile ]]; then
     if [[ ! -f requirements.txt ]]; then
-        puts-step "Installing requirements with latest pipenv..."
+        puts-step "Installing requirements with latest Pipenv..."
 
         # Install pipenv.
         /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
 
+        if [[ ! -f Pipfile.lock ]]; then
+            /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+        else
+            /app/.heroku/python/bin/pipenv install --system 2>&1 | indent
+        fi
         # Install the dependencies.
-        /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+
 
         # Skip pip install, later.
         export SKIP_PIP_INSTALL=1

bin/steps/pylibmc

@@ -9,6 +9,11 @@
 #
 # This script is invoked by [`bin/compile`](/).
 
+if [[ "$STACK" == "heroku-16" ]]; then
+    # libmemcached is pre-installed in the stack image so there is no need to vendor it.
+    return 0
+fi
+
 # The location of the pre-compiled libmemcached binary.
 VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
 
@@ -16,7 +21,6 @@ VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor
 # shellcheck source=bin/utils
 source "$BIN_DIR/utils"
 
-
 # If pylibmc exists within requirements, use vendored libmemcached.
 if (pip-grep -s requirements.txt pylibmc &> /dev/null) then
 

builds/libraries/vendor/gdal

@@ -10,7 +10,7 @@ hash -r
 
 echo "Building gdal..."
 
-VERSION="1.11.5"
+VERSION="2.2.1"
 SOURCE_TARBALL="http://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}.tar.gz"
 
 curl -L $SOURCE_TARBALL | tar zx

builds/libraries/vendor/geos

@@ -10,14 +10,16 @@ hash -r
 
 echo "Building geos..."
 
-SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.3.tar.bz2'
+VERSION=3.6.2
+
+SOURCE_TARBALL="http://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
 
 curl -L $SOURCE_TARBALL | tar xj
 
-cd geos-3.4.3
+pushd "geos-${VERSION}"
 ./configure --prefix=$OUT_PREFIX --enable-static=no &&
 make
 make install
 
 # Cleanup
-cd ..
+popd

builds/libraries/vendor/proj

@@ -10,14 +10,15 @@ hash -r
 
 echo "Building gdal..."
 
-SOURCE_TARBALL='http://download.osgeo.org/proj/proj-4.8.0.tar.gz'
+VERSION=4.9.3
+SOURCE_TARBALL="http://download.osgeo.org/proj/proj-${VERSION}.tar.gz"
 
 curl -L $SOURCE_TARBALL | tar zx
 
-cd proj-4.8.0
-./configure --prefix=$OUT_PREFIX --enable-static=no &&
+pushd "proj-${VERSION}"
+./configure --prefix=$OUT_PREFIX --enable-static=no
 make
 make install
 
 # Cleanup
-cd ..
+popd

test/fixtures/cffi/requirements.txt

@@ -0,0 +1 @@
+cffi

test/run

@@ -47,6 +47,12 @@ testPsycopg2() {
   assertCapturedSuccess
 }
 
+testCffi() {
+  compile "cffi"
+  assertCaptured "cffi"
+  assertCapturedSuccess
+}
+
 testPylibmc() {
   compile "pylibmc"
   assertCaptured "pylibmc"