Merge remote-tracking branch 'origin/master'

2026-06-05 23:10:16 +00:00 · 2017-08-28 13:41:47 -04:00 · 2017-08-28 13:24:32 -04:00 · 2017-08-15 22:19:31 -07:00 · 2017-08-09 14:17:07 -04:00 · 2017-08-03 17:38:27 -04:00
61 changed files with 140 additions and 671 deletions
@@ -1,76 +1,5 @@
 # Python Buildpack Changelog

-# 126
-
-Skip installs if Pipfile.lock hasn't changed, and uninstall stale dependencies with Pipenv.
-
- No longer warn if there is no `Procfile`.
-
-# 125
-
-Set `PYTHONPATH` during collectstatic runs, other updates.
-
- Update Set `PYTHONPATH` during collectstatic runs.
- Update Pipenv "3.6" to "3.6.4".
-
-# 124
-
-Update buildpack to automatically install [dev-packages] (Pipenv) during Heroku CI builds.
-
-# 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.
-
- No longer using `sub_env` for `pip install` step.
-
-# 114
-
- Bugfixes.
-
-Blacklisting `PYTHONHOME` and `PYTHONPATH` for older apps. Upgrades to nltk support.
-
-# 113
-
-Updates to Pipenv support.
-
 # 112

 Bugfix.
@@ -83,18 +12,18 @@ 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.

-# 108
+# 109

 Fix output for collectstatic step.

+# 108
+
+Updated setuptools.
+
 # 107

 Bugfix for C dependency installation.
@@ -1,9 +0,0 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[dev-packages]
-
-[packages]
-"bob-builder" = "==0.0.13"
@@ -1,52 +0,0 @@
-{
-    "_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": {}
-}
@@ -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/), [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 [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.

-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. 
+Some Python packages with obscure C dependencies are [not compatible](https://devcenter.heroku.com/articles/python-c-deps).

 See it in Action
 ----------------
@@ -16,22 +16,24 @@ See it in Action
 Deploying a Python application couldn't be easier:

    $ ls
-    Pipfile		Pipfile.lock	Procfile	web.py
+    Procfile  requirements.txt  web.py

    $ heroku create --buildpack heroku/python

    $ git push heroku master
-    …
+    ...
    -----> Python app detected
-    -----> Installing python-3.6.4
-    -----> Installing pip
-    -----> Installing requirements with latest pipenv…
-           ...
-           Installing dependencies from Pipfile…
+    -----> Installing python-3.6.2
+         $ pip install -r requirements.txt
+           Collecting requests (from -r requirements.txt (line 1))
+             Downloading requests-2.12.4-py2.py3-none-any.whl (576KB)
+           Installing collected packages: requests
+           Successfully installed requests-2.12.4
+
    -----> Discovering process types
           Procfile declares types -> (none)

-A `Pipfile` or `requirements.txt` must be present at the root of your application's repository.
+A `requirements.txt` file must be present at the root of your application's repository.

 You can also specify the latest production release of this buildpack for upcoming builds of an existing application:

@@ -41,22 +43,14 @@ 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 in your `Pipfile`:
-
-    [requires]
-    python_version = "2.7"
-
-Or, more specifically:
-
-    [requires]
-    python_full_version = "2.7.14"
-
-Or, with a `runtime.txt` file:
+Specific versions of the Python runtime can be specified with a `runtime.txt` file:

    $ cat runtime.txt
-    python-2.7.14
+    python-2.7.13

 Runtime options include:

- `python-3.6.4`
- `python-2.7.14`
+- `python-3.6.2`
+- `python-2.7.13`
+- `pypy-5.7.1` (unsupported, experimental)
+- `pypy3-5.5.1` (unsupported, experimental)
@@ -33,21 +33,12 @@ 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.4"
-LATEST_3="python-3.6.4"
-LATEST_2="python-2.7.14"
-
+DEFAULT_PYTHON_VERSION="python-3.6.2"
 DEFAULT_PYTHON_STACK="cedar-14"
 PIP_UPDATE="9.0.1"

-export DEFAULT_PYTHON_VERSION DEFAULT_PYTHON_STACK PIP_UPDATE LATEST_2 LATEST_3
+export DEFAULT_PYTHON_VERSION DEFAULT_PYTHON_STACK PIP_UPDATE

 # Common Problem Warnings
 WARNINGS_LOG=$(mktemp)
@@ -100,6 +91,12 @@ 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"

@@ -160,14 +157,7 @@ mtime "python.install.time" "${start}"

 # Pipenv support.
 # shellcheck source=bin/steps/pipenv
-sub_env "$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}"
-
+source "$BIN_DIR/steps/pipenv"

 # If no requirements.txt file given, assume `setup.py develop` is intended.
 if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
@@ -198,6 +188,12 @@ 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
@@ -225,24 +221,14 @@ 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 "\$HOME/.heroku/python"
+set_env PYTHONHOME /app/.heroku/python

-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_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_default_env LANG en_US.UTF-8
 set_default_env PYTHONHASHSEED random
-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
+set_default_env PYTHONPATH /app/

 # Install sane-default script for $WEB_CONCURRENCY and $FORWARDED_ALLOW_IPS.
 cp "$ROOT_DIR/vendor/WEB_CONCURRENCY.sh" "$WEB_CONCURRENCY_PROFILE_PATH"
@@ -30,7 +30,6 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
    puts-step "$ python $MANAGE_FILE collectstatic --noinput"

    # Run collectstatic, cleanup some of the noisy output.
-    export PYTHONPATH=.
    python "$MANAGE_FILE" collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
    COLLECTSTATIC_STATUS="${PIPESTATUS[0]}"

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-# This script serves as the cffi build step of the
+# This script serves as the Cryptography build step of the
 # [**Python Buildpack**](https://github.com/heroku/heroku-buildpack-python)
 # compiler.
 #
@@ -9,13 +9,8 @@
 #
 # 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="${VENDOR_URL}/libraries/vendor/libffi.tar.gz"
+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"

@@ -10,7 +10,7 @@
 # This script is invoked by [`bin/compile`](/).

 # The location of the pre-compiled cryptography binary.
-VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz"
+VENDORED_GDAL="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/gdal.tar.gz"

 PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"

@@ -10,9 +10,9 @@
 # This script is invoked by [`bin/compile`](/).

 # The location of the pre-compiled cryptography binary.
-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"
+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"

 PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"

@@ -30,20 +30,9 @@ 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
+
@@ -15,16 +15,16 @@ 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"

    if [ -f "$nltk_packages_definition" ]; then

-        readarray -t nltk_packages < "$nltk_packages_definition"
-        puts-step "Downloading NLTK packages: ${nltk_packages[*]}"
+        nltk_packages=$(tr "\n" " " < "$nltk_packages_definition")
+        puts-step "Downloading NLTK packages: $nltk_packages"

-        python -m nltk.downloader -d "$BUILD_DIR/.heroku/python/nltk_data" "${nltk_packages[@]}" | indent
+        python -m nltk.downloader -d "$BUILD_DIR/.heroku/python/nltk_data" "$nltk_packages"  | indent
        set_env NLTK_DATA "/app/.heroku/python/nltk_data"

    else
@@ -32,3 +32,4 @@ if sp-grep -s nltk; then
        puts-warn "Learn more: https://devcenter.heroku.com/articles/python-nltk"
    fi
 fi
+
@@ -1,25 +1,12 @@
 #!/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"
-
-    /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
+    sub_env /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

@@ -35,12 +22,4 @@ 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
@@ -2,24 +2,19 @@

 set +e
 # Install dependencies with Pip.
-# shellcheck source=bin/utils
-source $BIN_DIR/utils

-if [ ! "$SKIP_PIP_INSTALL" ]; then
+if [[ -f .heroku/python/requirements-declared.txt ]]; then

-  if [[ -f .heroku/python/requirements-declared.txt ]]; then
+  cp .heroku/python/requirements-declared.txt requirements-declared.txt

-    cp .heroku/python/requirements-declared.txt requirements-declared.txt
+  pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt

-    pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt
+  rm -fr 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
-    fi
+  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
+
 set -e
@@ -1,76 +1,21 @@
 #!/usr/bin/env bash

-# export CLINT_FORCE_COLOR=1
-# export PIPENV_FORCE_COLOR=1
-# shellcheck source=bin/utils
-source $BIN_DIR/utils
+# Pipenv support (Generate requriements.txt with pipenv).
+if [[ -f Pipfile ]]; then
+    if [[ ! -f requirements.txt ]]; then
+        puts-step "Installing requirements with latest pipenv..."

+        # Install pipenv.
+        /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null

-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
-            if [[ ! "$PIPENV_ALWAYS_INSTALL" ]]; then
-                echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent
-                echo "To disable this functionality, run the following command:"
-                echo ""
-                echo "    $ heroku config:set PIPENV_ALWAYS_INSTALL=1" | indent
+        # Install the dependencies.
+        /app/.heroku/python/bin/pipenv install --system 2>&1 | indent
+
+        # Skip pip install, later.
+        export SKIP_PIP_INSTALL=1
+
+        # Pip freeze, for compatibility.
+        /app/.heroku/python/bin/pip freeze > requirements.txt

-                SKIP_PIPENV_INSTALL=1
-            fi
-        fi
    fi
 fi
-
-
-if [ ! "$SKIP_PIPENV_INSTALL" ]; then
-
-    # Pipenv support (Generate requriements.txt with pipenv).
-    if [[ -f Pipfile ]]; then
-        if [[ ! -f requirements.txt ]]; then
-            puts-step "Installing requirements with latest Pipenv…"
-
-            # Measure that we're using Pipenv.
-            mcount "tool.pipenv"
-
-            # 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
-
-            # if [[ -f .heroku/python/requirements-declared.txt ]]; then
-            #     cp .heroku/python/requirements-declared.txt requirements.txt
-            # fi
-
-            # Install pipenv.
-            /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
-
-            # Install the dependencies.
-            if [[ ! -f Pipfile.lock ]]; then
-                /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
-
-                /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
-
-            # Skip pip install, later.
-            export SKIP_PIP_INSTALL=1
-
-            # Pip freeze, for compatibility.
-            pip freeze > requirements.txt
-        fi
-    fi
-else
-    pipenv-to-pip Pipfile.lock > requirements.txt
-    export SKIP_PIP_INSTALL=1
-fi
@@ -2,31 +2,23 @@

 # Detect Python-version with Pipenv.

-if [[ -f $BUILD_DIR/Pipfile ]]; then
+if [[ -f $BUILD_DIR/Pipfile.lock ]]; 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_full_version' "$BUILD_DIR/Pipfile.lock")
-            if [[ "$PYTHON" != "null" ]]; then
-                echo "python-$PYTHON" > "$BUILD_DIR/runtime.txt"
-            fi
+            PYTHON=$(jq -r '._meta.requires.python_version' "$BUILD_DIR/Pipfile.lock")
            set -e

-            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
+            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"
            fi
-
-
        fi
    fi
 fi
@@ -9,18 +9,14 @@
 #
 # 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="${VENDOR_URL}/libraries/vendor/libmemcache.tar.gz"
+VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/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

@@ -4,24 +4,6 @@ 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
@@ -44,7 +26,7 @@ if [ ! "$SKIP_INSTALL" ]; then

    mcount "version.python.$PYTHON_VERSION"

-    if ! curl "${VENDORED_PYTHON}" -s | tar zxv -C .heroku/python &> /dev/null; then
+    if ! curl "https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz" -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
@@ -6,8 +6,8 @@ BIN_DIR=$(cd "$(dirname "$0")" || return; pwd) # absolute path
 # shellcheck source=bin/utils
 source "$BIN_DIR/utils"

-# Locale support for Pipenv.
-export LC_ALL=C.UTF-8
-export LANG=C.UTF-8
+DISABLE_COLLECTSTATIC=1 "$(dirname "${0:-}")/compile" "$1" "$2" "$3"

-DISABLE_COLLECTSTATIC=1 INSTALL_TEST=1 "$(dirname "${0:-}")/compile" "$1" "$2" "$3"
+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
@@ -3,7 +3,7 @@

 OUT_PREFIX=$1

-echo "Building SQLite…"
+echo "Building SQLite..."


 SOURCE_TARBALL='https://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'
@@ -8,9 +8,9 @@ export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r


-echo "Building gdal…"
+echo "Building gdal..."

-VERSION="2.2.1"
+VERSION="1.11.5"
 SOURCE_TARBALL="http://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}.tar.gz"

 curl -L $SOURCE_TARBALL | tar zx
@@ -8,18 +8,16 @@ export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r


-echo "Building geos…"
+echo "Building geos..."

-VERSION=3.6.2
-
-SOURCE_TARBALL="http://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
+SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.3.tar.bz2'

 curl -L $SOURCE_TARBALL | tar xj

-pushd "geos-${VERSION}"
+cd geos-3.4.3
 ./configure --prefix=$OUT_PREFIX --enable-static=no &&
 make
 make install

 # Cleanup
-popd
+cd ..
@@ -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'

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


-echo "Building gdal…"
+echo "Building gdal..."

-VERSION=4.9.3
-SOURCE_TARBALL="http://download.osgeo.org/proj/proj-${VERSION}.tar.gz"
+SOURCE_TARBALL='http://download.osgeo.org/proj/proj-4.8.0.tar.gz'

 curl -L $SOURCE_TARBALL | tar zx

-pushd "proj-${VERSION}"
-./configure --prefix=$OUT_PREFIX --enable-static=no
+cd proj-4.8.0
+./configure --prefix=$OUT_PREFIX --enable-static=no &&
 make
 make install

 # Cleanup
-popd
+cd ..
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,19 +0,0 @@
-#!/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 '{}' +
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,21 +0,0 @@
-#!/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
@@ -1,21 +0,0 @@
-#!/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
@@ -1,3 +1 @@
-docopt==0.6.2
 bob-builder==0.0.13
-boto==2.48.0
@@ -1 +0,0 @@
-cffi
@@ -1,2 +1 @@
-city_database
-stopwords
+wordnet
@@ -1,9 +0,0 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-
-[packages]
-requests = "*"
-
-[requires]
-python_full_version = "3.6.3"
@@ -1,68 +0,0 @@
-{
-    "_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": {}
-}
@@ -1,2 +0,0 @@
-[packages]
-"delegator.py" = "*"
@@ -1,53 +0,0 @@
-{
-    "_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": {}
-}
@@ -1 +1 @@
-python-2.7.14
+python-2.7.13
@@ -5,20 +5,9 @@ testPipenv() {
  assertCapturedSuccess
 }

-testPipenvLock() {
-  compile "pipenv-lock"
-  assertCapturedSuccess
-}
-
 testPipenvVersion() {
  compile "pipenv-version"
-  assertCaptured "3.6.4"
-  assertCapturedSuccess
-}
-
-testPipenvFullVersion() {
-  compile "pipenv-full-version"
-  assertCaptured "3.6.3"
+  assertCaptured "3.6.2"
  assertCapturedSuccess
 }

@@ -35,7 +24,7 @@ testGEOS() {

 testNLTK() {
  compile "nltk"
-  assertCaptured "Downloading NLTK packages: city_database stopwords"
+  assertCaptured "wordnet"
  assertCapturedSuccess
 }

@@ -58,12 +47,6 @@ testPsycopg2() {
  assertCapturedSuccess
 }

-testCffi() {
-  compile "cffi"
-  assertCaptured "cffi"
-  assertCapturedSuccess
-}
-
 testPylibmc() {
  compile "pylibmc"
  assertCaptured "pylibmc"
@@ -72,13 +55,13 @@ testPylibmc() {

 testPython2() {
  compile "python2"
-  assertCaptured "python-2.7.14"
+  assertCaptured "python-2.7.13"
  assertCapturedSuccess
 }

 testPython3() {
  compile "python3"
-  assertCaptured "python-3.6.4"
+  assertCaptured "python-3.6.2"
  assertCapturedSuccess
 }

@@ -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
@@ -36,7 +36,7 @@ capture()

  LAST_COMMAND="$@"

-  "$@" >${STD_OUT} 2>${STD_ERR}
+  $@ >${STD_OUT} 2>${STD_ERR}
  RETURN=$?
  rtrn=${RETURN} # deprecated
 }
@@ -150,11 +150,6 @@ _assertContains()
    esac

    fail "${msg:-${default_msg}}"
-
-    if [ "${haystack_type}" == "file" ]; then
-      echo
-      cat "${haystack}"
-    fi
  fi
 }

@@ -41,7 +41,6 @@ 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)


@@ -1,26 +0,0 @@
-#!/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))
-
-
-try:
-    main()
-except Exception:
-    pass
@@ -1,5 +1,2 @@
 # 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 -"}
@@ -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
@@ -36,7 +36,7 @@ capture()

  LAST_COMMAND="$@"

-  "$@" >${STD_OUT} 2>${STD_ERR}
+  $@ >${STD_OUT} 2>${STD_ERR}
  RETURN=$?
  rtrn=${RETURN} # deprecated
 }
Author	SHA1	Message	Date
kennethreitz	98b2c904c3	Merge remote-tracking branch 'origin/master'	2017-08-28 13:41:47 -04:00
kennethreitz	fb52d1bf59	Merge remote-tracking branch 'origin/master'	2017-08-28 13:24:32 -04:00
kennethreitz	12c1d0b1d2	Merge remote-tracking branch 'origin/master'	2017-08-15 22:19:31 -07:00
kennethreitz	38dbb17313	Merge remote-tracking branch 'origin/master'	2017-08-09 14:17:07 -04:00
kennethreitz	0dd9911e91	Merge remote-tracking branch 'origin/master'	2017-08-03 17:38:27 -04:00
kennethreitz	2b00650c01	Merge remote-tracking branch 'origin/master'	2017-08-02 20:01:12 -04:00
kennethreitz	d380d949b7	Merge branch 'master' of https://git.heroku.com/python-builder-cedar-14	2017-08-01 14:38:14 -04:00
kennethreitz	d6ccb1aa57	fixed the bug for pypy-5.8.0	2017-07-31 19:08:15 -04:00