don't skip Pipenv installation if there are git deps (#656)

* default to user python path for collectstatic runs

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

* bugfixes

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

* fix

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

CHANGELOG.md

@@ -1,5 +1,60 @@
 # Python Buildpack Changelog
 
+# 126
+
+Bugfixes.
+
+# 125
+
+Bugfixes.
+
+# 124
+
+Update buildpack to automatically install `[dev-packages]` during Heroku CI Pipenv builds.
+
+- Skip installs if Pipfile.lock hasn't changed, and uninstall stale dependencies with Pipenv.
+- Set `PYTHONPATH` during collectstatic runs.
+- No longer warn if there is no `Procfile`.
+- Update Pipenv's "3.6" runtime specifier to point to "3.6.4".
+
+# 123
+
+Update gunicorn `init.d` script to allow overrides.
+
+# 122
+
+Update default Python to v3.6.4.
+
+# 121
+
+Update default Python to v3.6.3.
+
+# 120
+
+Use `$ pipenv --deploy`.
+
+# 119
+
+Improvements to Pipenv support, warning on unsupported Python versions.
+
+- We now warn when a user is not using latest 2.x or 3.x Python.
+- Heroku now supports `[requires]` `python_full_version` in addition to `python_version`.
+
+# 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 +83,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
 

Makefile

@@ -5,7 +5,7 @@ test: test-heroku-16
 
 check:
 	@shellcheck -x bin/compile bin/detect bin/release bin/test-compile bin/utils bin/warnings
-	@shellcheck -x bin/steps/collectstatic bin/steps/cryptography bin/steps/eggpath-fix  bin/steps/eggpath-fix2 bin/steps/gdal bin/steps/geo-libs bin/steps/mercurial bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/pylibmc bin/steps/python
+	@shellcheck -x bin/steps/collectstatic bin/steps/eggpath-fix  bin/steps/eggpath-fix2 bin/steps/gdal bin/steps/geo-libs bin/steps/mercurial bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/pylibmc bin/steps/python
 	@shellcheck -x bin/steps/hooks/*
 
 test-cedar-14:

Pipfile

@@ -0,0 +1,9 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[dev-packages]
+
+[packages]
+"bob-builder" = "==0.0.13"

Pipfile.lock

@@ -0,0 +1,52 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "36d17c46a8b1b844b3cae475f6f42d6c0a9e59b2a9685cbcdc0985656a7a129f"
+        },
+        "host-environment-markers": {
+            "implementation_name": "cpython",
+            "implementation_version": "3.6.3",
+            "os_name": "posix",
+            "platform_machine": "x86_64",
+            "platform_python_implementation": "CPython",
+            "platform_release": "16.7.0",
+            "platform_system": "Darwin",
+            "platform_version": "Darwin Kernel Version 16.7.0: Thu Jun 15 17:36:27 PDT 2017; root:xnu-3789.70.16~2/RELEASE_X86_64",
+            "python_full_version": "3.6.3",
+            "python_version": "3.6",
+            "sys_platform": "darwin"
+        },
+        "pipfile-spec": 6,
+        "requires": {},
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.python.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "bob-builder": {
+            "hashes": [
+                "sha256:b4de49a8e436fcaf82236ea43f78413b4a4c92100726e382ab57b6bdfb38fe64",
+                "sha256:288e3e765c4890fe9a63ae52ac6b4a963c13fe508482c70ff701a5ae21b9a673"
+            ],
+            "version": "==0.0.13"
+        },
+        "boto": {
+            "hashes": [
+                "sha256:13be844158d1bd80a94c972c806ec8381b9ea72035aa06123c5db6bc6a6f3ead",
+                "sha256:deb8925b734b109679e3de65856018996338758f4b916ff4fe7bb62b6d7000d1"
+            ],
+            "version": "==2.48.0"
+        },
+        "docopt": {
+            "hashes": [
+                "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
+            ],
+            "version": "==0.6.2"
+        }
+    },
+    "develop": {}
+}

README.md

@@ -4,11 +4,11 @@
 
 [![Build Status](https://travis-ci.org/heroku/heroku-buildpack-python.svg?branch=master)](https://travis-ci.org/heroku/heroku-buildpack-python)
 
-This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [Pipenv](http://docs.pipenv.org/en/latest/), [pip](https://pip.pypa.io/) and other excellent software.
+This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) for Python apps, powered by [Pipenv](http://docs.pipenv.org/), [pip](https://pip.pypa.io/) and other excellent software.
 
 Recommended web frameworks include **Django** and **Flask**. The recommended webserver is **Gunicorn**. There are no restrictions around what software can be used (as long as it's pip-installable). Web processes must bind to `$PORT`, and only the HTTP protocol is permitted for incoming connections.
 
-Some Python packages with obscure C dependencies are [not compatible](https://devcenter.heroku.com/articles/python-c-deps).
+Python packages with C dependencies that are not [available on the stack image](https://devcenter.heroku.com/articles/stack-packages) are generally not supported, unless `manylinux` wheels are provided by the package maintainers (common). For recommended solutions, check out [this article](https://devcenter.heroku.com/articles/python-c-deps) for more information. 
 
 See it in Action
 ----------------
@@ -16,18 +16,18 @@ See it in Action
 Deploying a Python application couldn't be easier:
 
     $ ls
-    Pipfile		Procfile	web.py
+    Pipfile		Pipfile.lock	Procfile	web.py
 
     $ heroku create --buildpack heroku/python
 
     $ git push heroku master
-    ...
+    …
     -----> Python app detected
-    -----> Installing python-3.6.2
+    -----> Installing python-3.6.4
     -----> Installing pip
-    -----> Installing requirements with latest pipenv...
+    -----> Installing requirements with latest pipenv…
            ...
-           Installing dependencies from Pipfile...
+           Installing dependencies from Pipfile…
     -----> Discovering process types
            Procfile declares types -> (none)
 
@@ -41,14 +41,22 @@ You can also specify the latest production release of this buildpack for upcomin
 Specify a Python Runtime
 ------------------------
 
-Specific versions of the Python runtime can be specified with a `runtime.txt` file:
+Specific versions of the Python runtime can be specified in your `Pipfile`:
+
+    [requires]
+    python_version = "2.7"
+
+Or, more specifically:
+
+    [requires]
+    python_full_version = "2.7.14"
+
+Or, with a `runtime.txt` file:
 
     $ cat runtime.txt
-    python-2.7.13
+    python-2.7.14
 
 Runtime options include:
 
-- `python-3.6.2`
-- `python-2.7.13`
-- `pypy-5.7.1` (unsupported, experimental)
-- `pypy3-5.5.1` (unsupported, experimental)
+- `python-3.6.4`
+- `python-2.7.14`

bin/compile

@@ -33,12 +33,21 @@ ENV_DIR=$3
 
 export BUILD_DIR CACHE_DIR ENV_DIR
 
+VENDOR_URL="https://lang-python.s3.amazonaws.com/$STACK"
+if [[ -n ${BUILDPACK_VENDOR_URL:-} ]]; then
+    VENDOR_URL="$BUILDPACK_VENDOR_URL"
+fi
+export VENDOR_URL
+
 # Python defaults
-DEFAULT_PYTHON_VERSION="python-3.6.2"
+DEFAULT_PYTHON_VERSION="python-3.6.4"
+LATEST_3="python-3.6.4"
+LATEST_2="python-2.7.14"
+
 DEFAULT_PYTHON_STACK="cedar-14"
 PIP_UPDATE="9.0.1"
 
-export DEFAULT_PYTHON_VERSION DEFAULT_PYTHON_STACK PIP_UPDATE
+export DEFAULT_PYTHON_VERSION DEFAULT_PYTHON_STACK PIP_UPDATE LATEST_2 LATEST_3
 
 # Common Problem Warnings
 WARNINGS_LOG=$(mktemp)
@@ -91,12 +100,6 @@ export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:/app/.heroku/python/li
 # Switch to the repo's context.
 cd "$BUILD_DIR"
 
-# Warn for lack of Procfile.
-if [[ ! -f Procfile ]]; then
-  puts-warn 'Warning: Your application is missing a Procfile. This file tells Heroku how to run your application.'
-  puts-warn 'Learn more: https://devcenter.heroku.com/articles/procfile'
-fi
-
 # Prepare the cache.
 mkdir -p "$CACHE_DIR"
 
@@ -159,6 +162,13 @@ mtime "python.install.time" "${start}"
 # shellcheck source=bin/steps/pipenv
 source "$BIN_DIR/steps/pipenv"
 
+# Uninstall removed dependencies with Pip.
+let start=$(nowms)
+# shellcheck source=bin/steps/pip-uninstall
+source "$BIN_DIR/steps/pip-uninstall"
+mtime "pip.uninstall.time" "${start}"
+
+
 # If no requirements.txt file given, assume `setup.py develop` is intended.
 if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
   echo "-e ." > requirements.txt
@@ -176,10 +186,6 @@ source "$BIN_DIR/steps/mercurial"
 # shellcheck source=bin/steps/pylibmc
 source "$BIN_DIR/steps/pylibmc"
 
-# Libffi support.
-# shellcheck source=bin/steps/cryptography
-source "$BIN_DIR/steps/cryptography"
-
 # Support for Geo libraries.
 # shellcheck source=bin/steps/geo-libs
 sub_env "$BIN_DIR/steps/geo-libs"
@@ -188,12 +194,6 @@ sub_env "$BIN_DIR/steps/geo-libs"
 # shellcheck source=bin/steps/gdal
 source "$BIN_DIR/steps/gdal"
 
-# Uninstall removed dependencies with Pip.
-let start=$(nowms)
-# shellcheck source=bin/steps/pip-uninstall
-source "$BIN_DIR/steps/pip-uninstall"
-mtime "pip.uninstall.time" "${start}"
-
 # Install dependencies with Pip (where the magic happens).
 let start=$(nowms)
 # shellcheck source=bin/steps/pip-install
@@ -221,14 +221,24 @@ mtime "collectstatic.time" "${start}"
 # Create .profile script for application runtime environment variables.
 set_env PATH "\$HOME/.heroku/python/bin:\$PATH"
 set_env PYTHONUNBUFFERED true
-set_env PYTHONHOME /app/.heroku/python
+set_env PYTHONHOME "\$HOME/.heroku/python"
 
-set_env LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LIBRARY_PATH"
-set_env LD_LIBRARY_PATH "/app/.heroku/vendor/lib:/app/.heroku/python/lib:\$LD_LIBRARY_PATH"
+set_env LIBRARY_PATH "\$HOME/.heroku/vendor/lib:\$HOME/.heroku/python/lib:\$LIBRARY_PATH"
+set_env LD_LIBRARY_PATH "\$HOME/.heroku/vendor/lib:\$HOME/.heroku/python/lib:\$LD_LIBRARY_PATH"
 
 set_default_env LANG en_US.UTF-8
 set_default_env PYTHONHASHSEED random
-set_default_env PYTHONPATH /app/
+set_default_env PYTHONPATH "\$HOME"
+
+# python expects to be in /app, if at runtime, it is not, set
+# up symlinks... this can occur when the subdir buildpack is used
+cat <<EOT >> "$PROFILE_PATH"
+if [[ \$HOME != "/app" ]]; then
+    mkdir -p /app/.heroku
+    ln -nsf "\$HOME/.heroku/python" /app/.heroku/python
+    ln -nsf "\$HOME/.heroku/vendor" /app/.heroku/vendor
+fi
+EOT
 
 # Install sane-default script for $WEB_CONCURRENCY and $FORWARDED_ALLOW_IPS.
 cp "$ROOT_DIR/vendor/WEB_CONCURRENCY.sh" "$WEB_CONCURRENCY_PROFILE_PATH"

bin/steps/collectstatic

@@ -30,6 +30,8 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
     puts-step "$ python $MANAGE_FILE collectstatic --noinput"
 
     # Run collectstatic, cleanup some of the noisy output.
+    PYTHONPATH=${PYTHONPATH:-.}
+    export PYTHONPATH
     python "$MANAGE_FILE" collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
     COLLECTSTATIC_STATUS="${PIPESTATUS[0]}"
 
@@ -38,6 +40,8 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
     # Display a warning if collectstatic failed.
     [ "$COLLECTSTATIC_STATUS" -ne 0 ] && {
 
+        mcount "failure.collectstatic"
+
         echo
         echo " !     Error while running '$ python $MANAGE_FILE collectstatic --noinput'."
         echo "       See traceback above for details."

bin/steps/cryptography

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# This script serves as the Cryptography build step of the
-# [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
-# compiler.
-#
-# A [buildpack](https://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 libffi binary.
-VENDORED_LIBFFI="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libffi.tar.gz"
-
-PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-# Syntax sugar.
-# shellcheck source=bin/utils
-source "$BIN_DIR/utils"
-
-# If a package using cffi exists within requirements, use vendored libffi.
-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" ]; then
-    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
-  fi
-
-  LIBFFI=$(pwd)/vendor
-  export LIBFFI
-fi

bin/steps/gdal

@@ -10,7 +10,7 @@
 # This script is invoked by [`bin/compile`](/).
 
 # The location of the pre-compiled cryptography binary.
-VENDORED_GDAL="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/gdal.tar.gz"
+VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz"
 
 PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
 

bin/steps/geo-libs

@@ -10,9 +10,9 @@
 # This script is invoked by [`bin/compile`](/).
 
 # The location of the pre-compiled cryptography binary.
-VENDORED_GDAL="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/gdal.tar.gz"
-VENDORED_GEOS="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/geos.tar.gz"
-VENDORED_PROJ="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/proj.tar.gz"
+VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz"
+VENDORED_GEOS="${VENDOR_URL}/libraries/vendor/geos.tar.gz"
+VENDORED_PROJ="${VENDOR_URL}/libraries/vendor/proj.tar.gz"
 
 PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
 
@@ -30,9 +30,20 @@ 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
   export GDAL
+  # set path for post_compile hooks
+  export GDAL_LIBRARY_PATH="$BUILD_DIR/.heroku/vendor/lib/libgdal.so"
+  export GEOS_LIBRARY_PATH="$BUILD_DIR/.heroku/vendor/lib/libgeos_c.so"
+  # set path for runtime environmeht
+  set_env GDAL_LIBRARY_PATH "/app/.heroku/vendor/lib/libgdal.so"
+  set_env GEOS_LIBRARY_PATH "/app/.heroku/vendor/lib/libgeos_c.so"
 fi
-

bin/steps/mercurial

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 # Install Mercurial if it appears to be required.
-if (grep -Fiq "hg+" requirements.txt) then
-    /app/.heroku/python/bin/pip install  mercurial | cleanup | indent
+if [[ -f "requirements.txt" ]]; then
+	if (grep -Fiq "hg+" requirements.txt) then
+		/app/.heroku/python/bin/pip install  mercurial | cleanup | indent
+	fi
 fi
+

bin/steps/nltk

@@ -15,7 +15,7 @@ source "$BIN_DIR/utils"
 
 # Check that nltk was installed by pip, otherwise obviously not needed
 if sp-grep -s nltk; then
-    puts-step "Downloading NLTK corpora..."
+    puts-step "Downloading NLTK corpora…"
 
     nltk_packages_definition="$BUILD_DIR/nltk.txt"
 

bin/steps/pip-install

@@ -1,12 +1,33 @@
 #!/usr/bin/env bash
 
+# shellcheck source=bin/utils
+source $BIN_DIR/utils
+
 if [ ! "$SKIP_PIP_INSTALL" ]; then
 
     # Install dependencies with Pip.
     puts-step "Installing requirements with pip"
 
+    # Set PIP_EXTRA_INDEX_URL
+    if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then
+        PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
+        export PIP_EXTRA_INDEX_URL
+    fi
+
     set +e
 
+    # Measure that we're using pip.
+    mcount "tool.pip"
+
+    # Count expected build failures.
+    if grep -q 'wsgiref' requirements.txt; then
+        mcount "failure.wsgiref"
+    fi
+    if grep -q '==0.0.0' requirements.txt; then
+        mcount "failure.none-version"
+    fi
+
+
     /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
     PIP_STATUS="${PIPESTATUS[0]}"
     set -e
@@ -23,4 +44,12 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
 
     echo
+
+    # Install test dependencies, for CI.
+    if [ "$INSTALL_TEST" ]; then
+        if [[ -f "$1/requirements-test.txt" ]]; then
+            puts-step "Installing test dependencies…"
+            /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
+    fi
 fi

bin/steps/pip-uninstall

@@ -2,19 +2,27 @@
 
 set +e
 # Install dependencies with Pip.
+# shellcheck source=bin/utils
+source $BIN_DIR/utils
 
-if [[ -f .heroku/python/requirements-declared.txt ]]; then
+if [ ! "$SKIP_PIP_INSTALL" ]; then
 
-  cp .heroku/python/requirements-declared.txt requirements-declared.txt
+  if [[ -f .heroku/python/requirements-declared.txt ]]; then
 
-  pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt
+    cp .heroku/python/requirements-declared.txt requirements-declared.txt
 
-  rm -fr requirements-declared.txt
 
-  if [[ -s .heroku/python/requirements-stale.txt ]]; then
-    puts-step "Uninstalling stale dependencies"
-    /app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w | cleanup | indent
+    if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then
+      mount "failure.bad-requirements"
+    fi
+
+    rm -fr requirements-declared.txt
+
+    if [[ -s .heroku/python/requirements-stale.txt ]]; then
+      puts-step "Uninstalling stale dependencies"
+      /app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w | cleanup | indent
+    fi
   fi
-fi
 
+fi
 set -e

bin/steps/pipenv

@@ -1,21 +1,70 @@
 #!/usr/bin/env bash
 
-# Pipenv support (Generate requriements.txt with pipenv).
-if [[ -f Pipfile ]]; then
-    if [[ ! -f requirements.txt ]]; then
-        puts-step "Installing requirements with latest pipenv..."
+# export CLINT_FORCE_COLOR=1
+# export PIPENV_FORCE_COLOR=1
+# shellcheck source=bin/utils
+source $BIN_DIR/utils
+set -e
+
+if [[ -f Pipfile.lock ]]; then
+    if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then
+        if [[ $(openssl dgst -sha256 Pipfile.lock) == $(cat .heroku/python/Pipfile.lock.sha256) ]]; then
+            # Measure that we're using Pipenv.
+            mcount "tool.pipenv"
+
+            # Don't skip installation of there are git deps.
+            if ! grep -q 'git' Pipfile.lock; then
+                echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent
+
+                mcount "tool.pipenv"
+                export SKIP_PIPENV_INSTALL=1
+                export SKIP_PIP_INSTALL=1
+            fi
+
+        fi
+    fi
+fi
+
+
+if [ ! "$SKIP_PIPENV_INSTALL" ]; then
+    # Pipenv support (Generate requriements.txt with pipenv).
+    if [[ -f Pipfile ]]; then
+        # Measure that we're using Pipenv.
+        mcount "tool.pipenv"
+
+        # Skip pip install, later.
+        export SKIP_PIP_INSTALL=1
+
+        # Set PIP_EXTRA_INDEX_URL
+        if [[ -r $ENV_DIR/PIP_EXTRA_INDEX_URL ]]; then
+            PIP_EXTRA_INDEX_URL="$(cat "$ENV_DIR/PIP_EXTRA_INDEX_URL")"
+            export PIP_EXTRA_INDEX_URL
+        fi
 
         # Install pipenv.
         /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
 
         # Install the dependencies.
-        /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+        if [[ ! -f Pipfile.lock ]]; then
+            puts-step "Installing dependencies with latest Pipenv…"
+            /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+        else
+            pipenv-to-pip Pipfile.lock > requirements.txt
+            "$BIN_DIR/steps/pip-uninstall"
+            cp requirements.txt .heroku/python/requirements-declared.txt
+            openssl dgst -sha256 Pipfile.lock > .heroku/python/Pipfile.lock.sha256
 
-        # Skip pip install, later.
-        export SKIP_PIP_INSTALL=1
-
-        # Pip freeze, for compatibility.
-        /app/.heroku/python/bin/pip freeze > requirements.txt
+            puts-step "Installing dependencies with latest Pipenv…"
+            /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
+        fi
 
+        # Install the test dependencies, for CI.
+        if [ "$INSTALL_TEST" ]; then
+            puts-step "Installing test dependencies…"
+            /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
+        fi
     fi
+else
+    export SKIP_PIP_INSTALL=1
+    pipenv-to-pip Pipfile.lock > requirements.txt
 fi

bin/steps/pipenv-python-version

@@ -6,19 +6,27 @@ if [[ -f $BUILD_DIR/Pipfile ]]; then
 
     if [[ ! -f $BUILD_DIR/runtime.txt ]]; then
         if [[ ! -f $BUILD_DIR/Pipfile.lock ]]; then
-            puts-warn "No 'pipfile.lock' found! We recommend you commit this into your repository."
+            puts-warn "No 'Pipfile.lock' found! We recommend you commit this into your repository."
         fi
         if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
             set +e
-            PYTHON=$(jq -r '._meta.requires.python_version' "$BUILD_DIR/Pipfile.lock")
+            PYTHON=$(jq -r '._meta.requires.python_full_version' "$BUILD_DIR/Pipfile.lock")
+            if [[ "$PYTHON" != "null" ]]; then
+                echo "python-$PYTHON" > "$BUILD_DIR/runtime.txt"
+            fi
             set -e
 
-            if [ "$PYTHON" = 2.7 ]; then
-                echo "python-2.7.13" > "$BUILD_DIR/runtime.txt"
-            fi
-            if [ "$PYTHON" = 3.6 ]; then
-                echo "python-3.6.2" > "$BUILD_DIR/runtime.txt"
+            if [[ "$PYTHON" == "null" ]]; then
+                PYTHON=$(jq -r '._meta.requires.python_version' "$BUILD_DIR/Pipfile.lock")
+                if [ "$PYTHON" = 2.7 ]; then
+                    echo "$LATEST_2" > "$BUILD_DIR/runtime.txt"
+                fi
+                if [ "$PYTHON" = 3.6 ]; then
+                    echo "$LATEST_3" > "$BUILD_DIR/runtime.txt"
+                fi
             fi
+
+
         fi
     fi
 fi

bin/steps/pylibmc

@@ -9,14 +9,18 @@
 #
 # 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"
+VENDORED_MEMCACHED="${VENDOR_URL}/libraries/vendor/libmemcache.tar.gz"
 
 # Syntax sugar.
 # 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
 

bin/steps/python

@@ -4,6 +4,24 @@ set +e
 runtime-fixer runtime.txt
 PYTHON_VERSION=$(cat runtime.txt)
 
+# The location of the pre-compiled python binary.
+VENDORED_PYTHON="${VENDOR_URL}/runtimes/$PYTHON_VERSION.tar.gz"
+
+if [[ $PYTHON_VERSION =~ ^python-2 ]]; then
+  if [[ "$PYTHON_VERSION" != "$LATEST_2" ]]; then
+    puts-warn "The latest version of Python 2 is $LATEST_2 (you are using $PYTHON_VERSION, which is unsupported)."
+    puts-warn "We recommend upgrading by specifying the latest version ($LATEST_2)."
+    echo "       Learn More: https://devcenter.heroku.com/articles/python-runtimes"
+  fi
+else
+  if [[ "$PYTHON_VERSION" != "$LATEST_3" ]]; then
+    puts-warn "The latest version of Python 3 is $LATEST_3 (you are using $PYTHON_VERSION, which is unsupported)."
+    puts-warn "We recommend upgrading by specifying the latest version ($LATEST_3)."
+    echo "       Learn More: https://devcenter.heroku.com/articles/python-runtimes"
+  fi
+
+fi
+
 if [[ "$STACK" != "$CACHED_PYTHON_STACK" ]]; then
     puts-step "Stack has changed from $CACHED_PYTHON_STACK to $STACK, clearing cache"
     rm -fr .heroku/python-stack .heroku/python-version .heroku/python .heroku/vendor
@@ -26,7 +44,7 @@ if [ ! "$SKIP_INSTALL" ]; then
 
     mcount "version.python.$PYTHON_VERSION"
 
-    if ! curl "https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz" -s | tar zxv -C .heroku/python &> /dev/null; then
+    if ! curl "${VENDORED_PYTHON}" -s | tar zxv -C .heroku/python &> /dev/null; then
       puts-warn "Requested runtime ($PYTHON_VERSION) is not available for this stack ($STACK)."
       puts-warn "Aborting.  More info: https://devcenter.heroku.com/articles/python-support"
       exit 1

bin/test-compile

@@ -6,8 +6,8 @@ BIN_DIR=$(cd "$(dirname "$0")" || return; pwd) # absolute path
 # shellcheck source=bin/utils
 source "$BIN_DIR/utils"
 
-DISABLE_COLLECTSTATIC=1 "$(dirname "${0:-}")/compile" "$1" "$2" "$3"
+# Locale support for Pipenv.
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
 
-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
+DISABLE_COLLECTSTATIC=1 INSTALL_TEST=1 "$(dirname "${0:-}")/compile" "$1" "$2" "$3"

builds/libraries/sqlite

@@ -3,7 +3,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building SQLite..."
+echo "Building SQLite…"
 
 
 SOURCE_TARBALL='https://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'

builds/libraries/vendor/gdal

@@ -8,9 +8,9 @@ export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 
-echo "Building gdal..."
+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

@@ -8,16 +8,18 @@ export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 
-echo "Building geos..."
+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/libffi

@@ -13,7 +13,7 @@ export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 
-echo "Building libffi..."
+echo "Building libffi…"
 
 SOURCE_TARBALL='ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz'
 

builds/libraries/vendor/libmemcache

@@ -20,7 +20,7 @@ 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..."
+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
@@ -33,7 +33,7 @@ make -s -j 9
 make install -s
 popd
 
-echo "-----> Building libmemcached ${dep_version}..."
+echo "-----> Building libmemcached ${dep_version}…"
 
 curl -L ${dep_url} | tar xz
 pushd ${dep_dirname}

builds/libraries/vendor/proj

@@ -8,16 +8,17 @@ export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 
-echo "Building gdal..."
+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

builds/runtimes/pypy-5.3.1

@@ -6,7 +6,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.1-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy2-v5.3.1-linux64/* $OUT_PREFIX

builds/runtimes/pypy-5.6.0

@@ -6,7 +6,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy2-v5.6.0-linux64/* $OUT_PREFIX

builds/runtimes/pypy-5.7.0

@@ -6,7 +6,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy2-v5.7.0-linux64/* $OUT_PREFIX

builds/runtimes/pypy-5.7.1

@@ -6,7 +6,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy2-v5.7.1-linux64/* $OUT_PREFIX

builds/runtimes/pypy-5.8.0

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy2-v5.8.0-linux64/* $OUT_PREFIX

builds/runtimes/pypy3-2.4.0

@@ -6,7 +6,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy3-2.4.0-linux64/* $OUT_PREFIX

builds/runtimes/pypy3-5.5.0

@@ -6,7 +6,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy3-v5.5.0-linux64/* $OUT_PREFIX

builds/runtimes/pypy3-5.7.1

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy3-v5.7.1-linux64/* $OUT_PREFIX

builds/runtimes/pypy3-5.8.0

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building PyPy..."
+echo "Building PyPy…"
 SOURCE_TARBALL='https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-linux64.tar.bz2'
 curl -L $SOURCE_TARBALL | tar jx
 cp -R pypy3-v5.8.0-linux64/* $OUT_PREFIX

builds/runtimes/python-2.7.10

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/2.7.10/Python-2.7.10.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.10 src

builds/runtimes/python-2.7.11

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/2.7.11/Python-2.7.11.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.11 src

builds/runtimes/python-2.7.12

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/2.7.12/Python-2.7.12.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.12 src

builds/runtimes/python-2.7.13

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 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.13 src

builds/runtimes/python-2.7.14

@@ -0,0 +1,19 @@
+#!/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.14/Python-2.7.14.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-2.7.14 src
+cd src
+
+./configure --prefix=$OUT_PREFIX  --enable-unicode=ucs4 --with-ensurepip=no
+make
+make install
+
+# Remove unneeded test directories, similar to the official Docker Python images:
+# https://github.com/docker-library/python
+find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +

builds/runtimes/python-2.7.9

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/2.7.9/Python-2.7.9.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-2.7.9 src

builds/runtimes/python-3.5.2

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.5.2/Python-3.5.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.5.2 src

builds/runtimes/python-3.5.3

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.5.3/Python-3.5.3.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.5.3 src

builds/runtimes/python-3.6.0

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.6.0/Python-3.6.0.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.6.0 src

builds/runtimes/python-3.6.1

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.6.1/Python-3.6.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.6.1 src

builds/runtimes/python-3.6.2

@@ -4,7 +4,7 @@
 
 OUT_PREFIX=$1
 
-echo "Building Python..."
+echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.6.2/Python-3.6.2.tgz'
 curl -L $SOURCE_TARBALL | tar xz
 mv Python-3.6.2 src

builds/runtimes/python-3.6.3

@@ -0,0 +1,21 @@
+#!/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.6.3/Python-3.6.3.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.6.3 src
+cd src
+
+./configure --prefix=$OUT_PREFIX --with-ensurepip=no
+make
+make install
+
+# Remove unneeded test directories, similar to the official Docker Python images:
+# https://github.com/docker-library/python
+find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

builds/runtimes/python-3.6.4

@@ -0,0 +1,21 @@
+#!/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.6.4/Python-3.6.4.tgz'
+curl -L $SOURCE_TARBALL | tar xz
+mv Python-3.6.4 src
+cd src
+
+./configure --prefix=$OUT_PREFIX --with-ensurepip=no
+make
+make install
+
+# Remove unneeded test directories, similar to the official Docker Python images:
+# https://github.com/docker-library/python
+find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
+
+ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python

requirements.txt

@@ -1 +1,3 @@
+docopt==0.6.2
 bob-builder==0.0.13
+boto==2.48.0

test/fixtures/cffi/requirements.txt

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

test/fixtures/pipenv-full-version/Pipfile

@@ -0,0 +1,9 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+
+[packages]
+requests = "*"
+
+[requires]
+python_full_version = "3.6.3"

test/fixtures/pipenv-full-version/Pipfile.lock

@@ -0,0 +1,68 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "22a052f4d1cfe6518b2f236fe45c3208c587a9ab1323bdd390632e27278b541e"
+        },
+        "host-environment-markers": {
+            "implementation_name": "cpython",
+            "implementation_version": "3.6.3",
+            "os_name": "posix",
+            "platform_machine": "x86_64",
+            "platform_python_implementation": "CPython",
+            "platform_release": "16.7.0",
+            "platform_system": "Darwin",
+            "platform_version": "Darwin Kernel Version 16.7.0: Thu Jun 15 17:36:27 PDT 2017; root:xnu-3789.70.16~2/RELEASE_X86_64",
+            "python_full_version": "3.6.3",
+            "python_version": "3.6",
+            "sys_platform": "darwin"
+        },
+        "pipfile-spec": 6,
+        "requires": {
+            "python_full_version": "3.6.3"
+        },
+        "sources": [
+            {
+                "url": "https://pypi.python.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "certifi": {
+            "hashes": [
+                "sha256:244be0d93b71e93fc0a0a479862051414d0e00e16435707e5bf5000f92e04694",
+                "sha256:5ec74291ca1136b40f0379e1128ff80e866597e4e2c1e755739a913bbc3613c0"
+            ],
+            "version": "==2017.11.5"
+        },
+        "chardet": {
+            "hashes": [
+                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691",
+                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"
+            ],
+            "version": "==3.0.4"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4",
+                "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f"
+            ],
+            "version": "==2.6"
+        },
+        "requests": {
+            "hashes": [
+                "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b",
+                "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e"
+            ],
+            "version": "==2.18.4"
+        },
+        "urllib3": {
+            "hashes": [
+                "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b",
+                "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f"
+            ],
+            "version": "==1.22"
+        }
+    },
+    "develop": {}
+}

test/fixtures/pipenv-lock/Pipfile

@@ -0,0 +1,2 @@
+[packages]
+"delegator.py" = "*"

test/fixtures/pipenv-lock/Pipfile.lock

@@ -0,0 +1,53 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "397f2c55e3558ea57d292e3fc19b34e483770e5ec02cdedfb1f330680cd26635"
+        },
+        "host-environment-markers": {
+            "implementation_name": "cpython",
+            "implementation_version": "3.6.3",
+            "os_name": "posix",
+            "platform_machine": "x86_64",
+            "platform_python_implementation": "CPython",
+            "platform_release": "16.7.0",
+            "platform_system": "Darwin",
+            "platform_version": "Darwin Kernel Version 16.7.0: Thu Jun 15 17:36:27 PDT 2017; root:xnu-3789.70.16~2/RELEASE_X86_64",
+            "python_full_version": "3.6.3",
+            "python_version": "3.6",
+            "sys_platform": "darwin"
+        },
+        "pipfile-spec": 6,
+        "requires": {},
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.python.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "delegator.py": {
+            "hashes": [
+                "sha256:2575c4adc923ad0b8fdaa433f862b2b7cf21982717fb23cc895fd8f249ea820c",
+                "sha256:495e11ada66648650171a6c9a188df4eb050b235abff8771f41ee8a064eb9ded"
+            ],
+            "version": "==0.0.13"
+        },
+        "pexpect": {
+            "hashes": [
+                "sha256:f853b52afaf3b064d29854771e2db509ef80392509bde2dd7a6ecf2dfc3f0018",
+                "sha256:3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"
+            ],
+            "version": "==4.2.1"
+        },
+        "ptyprocess": {
+            "hashes": [
+                "sha256:e8c43b5eee76b2083a9badde89fd1bbce6c8942d1045146e100b7b5e014f4f1a",
+                "sha256:e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365"
+            ],
+            "version": "==0.5.2"
+        }
+    },
+    "develop": {}
+}

test/fixtures/python2/runtime.txt

@@ -1 +1 @@
-python-2.7.13
+python-2.7.14

test/run

@@ -5,9 +5,20 @@ testPipenv() {
   assertCapturedSuccess
 }
 
+testPipenvLock() {
+  compile "pipenv-lock"
+  assertCapturedSuccess
+}
+
 testPipenvVersion() {
   compile "pipenv-version"
-  assertCaptured "3.6.2"
+  assertCaptured "3.6.4"
+  assertCapturedSuccess
+}
+
+testPipenvFullVersion() {
+  compile "pipenv-full-version"
+  assertCaptured "3.6.3"
   assertCapturedSuccess
 }
 
@@ -47,6 +58,12 @@ testPsycopg2() {
   assertCapturedSuccess
 }
 
+testCffi() {
+  compile "cffi"
+  assertCaptured "cffi"
+  assertCapturedSuccess
+}
+
 testPylibmc() {
   compile "pylibmc"
   assertCaptured "pylibmc"
@@ -55,13 +72,13 @@ testPylibmc() {
 
 testPython2() {
   compile "python2"
-  assertCaptured "python-2.7.13"
+  assertCaptured "python-2.7.14"
   assertCapturedSuccess
 }
 
 testPython3() {
   compile "python3"
-  assertCaptured "python-3.6.2"
+  assertCaptured "python-3.6.4"
   assertCapturedSuccess
 }
 

test/shunit2

@@ -25,9 +25,9 @@ SHUNIT_ERROR=2
 # enable strict mode by default
 SHUNIT_STRICT=${SHUNIT_STRICT:-${SHUNIT_TRUE}}
 
-_shunit_warn() { echo "shunit2:WARN $@" >&2; }
-_shunit_error() { echo "shunit2:ERROR $@" >&2; }
-_shunit_fatal() { echo "shunit2:FATAL $@" >&2; exit ${SHUNIT_ERROR}; }
+_shunit_warn() { echo "shunit2:WARN $*" >&2; }
+_shunit_error() { echo "shunit2:ERROR $*" >&2; }
+_shunit_fatal() { echo "shunit2:FATAL $*" >&2; exit ${SHUNIT_ERROR}; }
 
 # specific shell checks
 if [ -n "${ZSH_VERSION:-}" ]; then

test/utils

@@ -36,7 +36,7 @@ capture()
 
   LAST_COMMAND="$@"
 
-  $@ >${STD_OUT} 2>${STD_ERR}
+  "$@" >${STD_OUT} 2>${STD_ERR}
   RETURN=$?
   rtrn=${RETURN} # deprecated
 }

vendor/pip-pop/pip-diff

@@ -41,6 +41,7 @@ class Requirements(object):
                 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
+                    requirement.req.name = requirement.req.name.lower()
                 self.requirements.append(requirement.req)
 
 

vendor/pip-pop/pip-grep

@@ -8,6 +8,7 @@ Options:
   -h --help     Show this screen.
 """
 import os
+import sys
 from docopt import docopt
 from pip.req import parse_requirements
 from pip.index import PackageFinder
@@ -70,4 +71,8 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    try:
+        main()
+    except Exception:
+        sys.exit(1)
+

vendor/pipenv-to-pip

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+import json
+import sys
+
+
+def main():
+    INFILE = sys.argv[1]
+
+    with open(INFILE, 'rb') as f:
+        lockfile = json.load(f)
+
+    packages = []
+    for package in lockfile.get('default', {}):
+        try:
+            packages.append('{0}{1}'.format(package, lockfile['default'][package]['version']))
+        except KeyError:
+            pass
+
+    print('\n'.join(packages))
+
+if __name__ == '__main__':
+    main()

vendor/python.gunicorn.sh

@@ -1,2 +1,5 @@
 # Automatic configuration for Gunicorn's ForwardedAllowIPS setting.
 export FORWARDED_ALLOW_IPS='*'
+
+# Automatic configuration for Gunicorn's stdout access log setting.
+export GUNICORN_CMD_ARGS=${GUNICORN_CMD_ARGS:-"--access-logfile -"}

vendor/shunit2

@@ -25,9 +25,9 @@ SHUNIT_ERROR=2
 # enable strict mode by default
 SHUNIT_STRICT=${SHUNIT_STRICT:-${SHUNIT_TRUE}}
 
-_shunit_warn() { echo "shunit2:WARN $@" >&2; }
-_shunit_error() { echo "shunit2:ERROR $@" >&2; }
-_shunit_fatal() { echo "shunit2:FATAL $@" >&2; exit ${SHUNIT_ERROR}; }
+_shunit_warn() { echo "shunit2:WARN $*" >&2; }
+_shunit_error() { echo "shunit2:ERROR $*" >&2; }
+_shunit_fatal() { echo "shunit2:FATAL $*" >&2; exit ${SHUNIT_ERROR}; }
 
 # specific shell checks
 if [ -n "${ZSH_VERSION:-}" ]; then

vendor/test-utils

@@ -36,7 +36,7 @@ capture()
 
   LAST_COMMAND="$@"
 
-  $@ >${STD_OUT} 2>${STD_ERR}
+  "$@" >${STD_OUT} 2>${STD_ERR}
   RETURN=$?
   rtrn=${RETURN} # deprecated
 }