add retry to curl

.dockerignore

@@ -1 +0,0 @@
-.git/

.gitignore

@@ -1,5 +1,3 @@
 *.pyc
 site
 .DS_Store
-
-/.envrc

.travis.yml

@@ -1,23 +1,9 @@
 language: bash
-dist: trusty
+sudo: required
-jobs:
+services:
-  include:
+  - docker
-    - stage: "Bash linting (shellcheck)"
+# install: docker pull heroku/cedar:14
-      sudo: false
+script: ./tests.sh
-      addons:
+env:
-        apt:
+  - STACK=heroku-16
-          sources:
+  - STACK=cedar-14
-          - debian-sid    # Grab shellcheck from the Debian repo (o_O)
-          packages:
-          - shellcheck
-      script: make check
-
-    - stage: "Stack Tests"
-      services: docker
-      env: STACK=heroku-16
-      script: ./tests.sh
-
-    - stage: "Stack Tests"
-      services: docker
-      env: STACK=cedar-14
-      script: ./tests.sh

CHANGELOG.md

@@ -1,65 +1,5 @@
 # Python Buildpack Changelog
 
-# 112
-
-Bugfix.
-
-- Fixed grep output bug.
-
-# 111
-
-Linting, bugfixes.
-
-# 110
-
-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.
-
-# 107
-
-Bugfix for C dependency installation.
-
-# 106
-
- Don't install packages that could mess up packaging.
-
- - The Python buildpack will automatically remove `six`, `pyparsing`, `appdirs`,
-   `setuptools`, and `distribute` from a `requirements.txt` file now, as these
-   packages are provided by the Python buildpack.
-
- # 105
-
- Improvements to output messaging.
-
-# 104
-
-General improvements.
-
-- Fix for Heroku CI.
-- Use `pkg_resources` to check if a distribution is installed instead of
-  parsing `requirements.txt`. ([#395][395])
-
-[395]: https://github.com/heroku/heroku-buildpack-python/pull/395
-
-## 103
-
-Bug fixes and improvements.
-
-- Fix for Pipenv.
-- Fix for Heroku CI.
-- Improve handling of WEB_CONCURRENCY when using multiple buildpacks.
-- Adjust environment variables set during the build to more closely match those in the dyno environment (DYNO is now available, STACK is not).
-- Restore the build cache prior to running bin/pre_compile.
-
 ## 102
 
 Buildpack code cleanup.

Dockerfile

@@ -1,13 +1,11 @@
 FROM heroku/heroku:16-build
 
 WORKDIR /app
-ENV WORKSPACE_DIR="/app/builds" \
+ENV WORKSPACE_DIR=/app/builds
-    S3_BUCKET="lang-python" \
-    S3_PREFIX="heroku-16/"
 
-RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y python-pip
 
-COPY requirements.txt /app/
+# Install bob-builder application
-RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
+RUN pip install bob-builder==0.0.5
 
 COPY . /app

LICENSE

@@ -1,6 +1,6 @@
 MIT License:
 
-Copyright (C) 2017 Heroku, Inc.
+Copyright (C) 2016 Heroku, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -1,12 +1,7 @@
 # These targets are not files
 .PHONY: tests
 
-test: test-heroku-16
+test: test-cedar-14
-
-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/hooks/*
 
 test-cedar-14:
 	@echo "Running tests in docker (cedar-14)..."
@@ -18,19 +13,6 @@ test-heroku-16:
 	@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-16" heroku/heroku:16-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
 	@echo ""
 
-buildenv-heroku-16:
-	@echo "Creating build environment (heroku-16)..."
-	@echo
-	@docker build --pull -t python-buildenv-heroku-16 .
-	@echo
-	@echo "Usage..."
-	@echo
-	@echo "  $$ export AWS_ACCESS_KEY_ID=foo AWS_SECRET_ACCESS_KEY=bar  # Optional unless deploying"
-	@echo "  $$ bob build runtimes/python-2.7.13"
-	@echo "  $$ bob deploy runtimes/python-2.7.13"
-	@echo
-	@docker run -it --rm python-buildenv-heroku-16
-
 tools:
 	git clone https://github.com/kennethreitz/pip-pop.git
 	mv pip-pop/bin/* vendor/pip-pop/

README.md

@@ -8,7 +8,7 @@ This is the official [Heroku buildpack](https://devcenter.heroku.com/articles/bu
 
 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).
+Some Python packages with obscure C dependencies (e.g. scipy) are [not compatible](https://devcenter.heroku.com/articles/python-c-deps).
 
 See it in Action
 ----------------
@@ -23,7 +23,7 @@ Deploying a Python application couldn't be easier:
     $ git push heroku master
     ...
     -----> Python app detected
-    -----> Installing python-3.6.2
+    -----> Installing python-2.7.13
          $ pip install -r requirements.txt
            Collecting requests (from -r requirements.txt (line 1))
              Downloading requests-2.12.4-py2.py3-none-any.whl (576KB)
@@ -46,11 +46,11 @@ Specify a Python Runtime
 Specific versions of the Python runtime can be specified with a `runtime.txt` file:
 
     $ cat runtime.txt
-    python-2.7.13
+    python-3.6.1
 
 Runtime options include:
 
-- `python-3.6.2`
 - `python-2.7.13`
-- `pypy-5.7.1` (unsupported, experimental)
+- `python-3.6.1`
-- `pypy3-5.5.1` (unsupported, experimental)
+- `pypy-5.7.0` (unsupported, experimental)
+- `pypy3-5.5.0` (unsupported, experimental)

bin/compile

@@ -25,24 +25,21 @@ export BUILDPACK_LOG_FILE=${BUILDPACK_LOG_FILE:-/dev/null}
 export PATH=:/usr/local/bin:$PATH
 
 # Paths.
-BIN_DIR=$(cd "$(dirname "$0")"; pwd) # absolute path
+BIN_DIR=$(cd $(dirname $0); pwd) # absolute path
-ROOT_DIR=$(dirname "$BIN_DIR")
+ROOT_DIR=$(dirname $BIN_DIR)
 BUILD_DIR=$1
 CACHE_DIR=$2
 ENV_DIR=$3
 
-export BUILD_DIR CACHE_DIR ENV_DIR
-
 # Python defaults
-DEFAULT_PYTHON_VERSION="python-3.6.2"
+DEFAULT_PYTHON_VERSION="python-2.7.13"
 DEFAULT_PYTHON_STACK="cedar-14"
-PIP_UPDATE="9.0.1"
+PYTHON_EXE="/app/.heroku/python/bin/python"
-
+PIP_VERSION="9.0.1"
-export DEFAULT_PYTHON_VERSION DEFAULT_PYTHON_STACK PIP_UPDATE
+SETUPTOOLS_VERSION="32.1.0"
 
 # Common Problem Warnings
-WARNINGS_LOG=$(mktemp)
+export WARNINGS_LOG=$(mktemp)
-export WARNINGS_LOG
 export RECOMMENDED_PYTHON_VERSION=$DEFAULT_PYTHON_VERSION
 
 # Setup vendored tools and pip-pop (pip-diff)
@@ -59,12 +56,10 @@ unset RECEIVE_DATA RUN_KEY BUILD_INFO DEPLOY LOG_TOKEN
 unset CYTOKINE_LOG_FILE GEM_PATH
 
 # Syntax sugar.
-# shellcheck source=bin/utils
+source $BIN_DIR/utils
-source "$BIN_DIR/utils"
 
 # Import collection of warnings.
-# shellcheck source=bin/warnings
+source $BIN_DIR/warnings
-source "$BIN_DIR/warnings"
 
 # we need to put a bunch of symlinks in there later
 mkdir -p /app/.heroku
@@ -73,7 +68,6 @@ mkdir -p /app/.heroku
 PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh"
 EXPORT_PATH="$BIN_DIR/../export"
 GUNICORN_PROFILE_PATH="$BUILD_DIR/.profile.d/python.gunicorn.sh"
-WEB_CONCURRENCY_PROFILE_PATH="$BUILD_DIR/.profile.d/WEB_CONCURRENCY.sh"
 
 # We'll need to send these statics to other scripts we `source`.
 export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH EXPORT_PATH
@@ -89,7 +83,7 @@ export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRA
 export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH
 
 # Switch to the repo's context.
-cd "$BUILD_DIR"
+cd $BUILD_DIR
 
 # Warn for lack of Procfile.
 if [[ ! -f Procfile ]]; then
@@ -97,67 +91,67 @@ if [[ ! -f Procfile ]]; then
   puts-warn 'Learn more: https://devcenter.heroku.com/articles/procfile'
 fi
 
-# Prepare the cache.
-mkdir -p "$CACHE_DIR"
-
-# Restore old artifacts from the cache.
-mkdir -p .heroku
-
-cp -R "$CACHE_DIR/.heroku/python" .heroku/ &> /dev/null || true
-cp -R "$CACHE_DIR/.heroku/python-stack" .heroku/ &> /dev/null || true
-cp -R "$CACHE_DIR/.heroku/python-version" .heroku/ &> /dev/null || true
-cp -R "$CACHE_DIR/.heroku/vendor" .heroku/ &> /dev/null || true
-if [[ -d "$CACHE_DIR/.heroku/src" ]]; then
-  cp -R "$CACHE_DIR/.heroku/src" .heroku/ &> /dev/null || true
-fi
-
 # Experimental pre_compile hook.
-# shellcheck source=bin/steps/hooks/pre_compile
+source $BIN_DIR/steps/hooks/pre_compile
-source "$BIN_DIR/steps/hooks/pre_compile"
 
 # Sticky runtimes.
-if [ -f "$CACHE_DIR/.heroku/python-version" ]; then
+if [ -f $CACHE_DIR/.heroku/python-version ]; then
-  DEFAULT_PYTHON_VERSION=$(cat "$CACHE_DIR/.heroku/python-version")
+  DEFAULT_PYTHON_VERSION=$(cat $CACHE_DIR/.heroku/python-version)
 fi
 
 # Stack fallback for non-declared caches.
-if [ -f "$CACHE_DIR/.heroku/python-stack" ]; then
+if [ -f $CACHE_DIR/.heroku/python-stack ]; then
-  CACHED_PYTHON_STACK=$(cat "$CACHE_DIR/.heroku/python-stack")
+  CACHED_PYTHON_STACK=$(cat $CACHE_DIR/.heroku/python-stack)
 else
   CACHED_PYTHON_STACK=$STACK
 fi
 
-export CACHED_PYTHON_STACK
-
 # Pipenv Python version support.
-# shellcheck source=bin/steps/pipenv-python-version
+source $BIN_DIR/steps/pipenv-python-version
-source "$BIN_DIR/steps/pipenv-python-version"
 
 # If no runtime given, assume default version.
 if [ ! -f runtime.txt ]; then
-  echo "$DEFAULT_PYTHON_VERSION" > runtime.txt
+  echo $DEFAULT_PYTHON_VERSION > runtime.txt
 fi
 
-mkdir -p "$(dirname "$PROFILE_PATH")"
+# Prepare the cache.
+mkdir -p $CACHE_DIR
+
+# Restore old artifacts from the cache.
+mkdir -p .heroku
+
+cp -R $CACHE_DIR/.heroku/python .heroku/ &> /dev/null || true
+cp -R $CACHE_DIR/.heroku/python-stack .heroku/ &> /dev/null || true
+cp -R $CACHE_DIR/.heroku/python-version .heroku/ &> /dev/null || true
+cp -R $CACHE_DIR/.heroku/vendor .heroku/ &> /dev/null || true
+if [[ -d $CACHE_DIR/.heroku/src ]]; then
+  cp -R $CACHE_DIR/.heroku/src .heroku/ &> /dev/null || true
+fi
+
+
+mkdir -p $(dirname $PROFILE_PATH)
 mkdir -p /app/.heroku/src
 
 if [[ $BUILD_DIR != '/app' ]]; then
     # python expects to reside in /app, so set up symlinks
     # we will not remove these later so subsequent buildpacks can still invoke it
-    ln -nsf "$BUILD_DIR/.heroku/python" /app/.heroku/python
+    ln -nsf $BUILD_DIR/.heroku/python /app/.heroku/python
-    ln -nsf "$BUILD_DIR/.heroku/vendor" /app/.heroku/vendor
+    ln -nsf $BUILD_DIR/.heroku/vendor /app/.heroku/vendor
     # Note: .heroku/src is copied in later.
 fi
 
 # Install Python.
 let start=$(nowms)
-# shellcheck source=bin/steps/python
+source $BIN_DIR/steps/python
-source "$BIN_DIR/steps/python"
 mtime "python.install.time" "${start}"
 
+# Sanity check for setuptools/distribute.
+let start=$(nowms)
+source $BIN_DIR/steps/setuptools
+mtime "setuptools.install.time" "${start}"
+
 # Pipenv support.
-# shellcheck source=bin/steps/pipenv
+source $BIN_DIR/steps/pipenv
-source "$BIN_DIR/steps/pipenv"
 
 # If no requirements.txt file given, assume `setup.py develop` is intended.
 if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
@@ -165,101 +159,82 @@ if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
 fi
 
 # Fix egg-links.
-# shellcheck source=bin/steps/eggpath-fix
+source $BIN_DIR/steps/eggpath-fix
-source "$BIN_DIR/steps/eggpath-fix"
 
 # Mercurial support.
-# shellcheck source=bin/steps/mercurial
+source $BIN_DIR/steps/mercurial
-source "$BIN_DIR/steps/mercurial"
 
 # Pylibmc support.
-# shellcheck source=bin/steps/pylibmc
+source $BIN_DIR/steps/pylibmc
-source "$BIN_DIR/steps/pylibmc"
 
 # Libffi support.
-# shellcheck source=bin/steps/cryptography
+source $BIN_DIR/steps/cryptography
-source "$BIN_DIR/steps/cryptography"
 
 # Support for Geo libraries.
-# shellcheck source=bin/steps/geo-libs
+sub-env $BIN_DIR/steps/geo-libs
-sub_env "$BIN_DIR/steps/geo-libs"
 
 # GDAL support.
-# shellcheck source=bin/steps/gdal
+source $BIN_DIR/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
+source $BIN_DIR/steps/pip-install
-source "$BIN_DIR/steps/pip-install"
 mtime "pip.install.time" "${start}"
 
+# Uninstall removed dependencies with Pip.
+let start=$(nowms)
+source $BIN_DIR/steps/pip-uninstall
+mtime "pip.uninstall.time" "${start}"
+
 # Support for NLTK corpora.
 let start=$(nowms)
-sub_env "$BIN_DIR/steps/nltk"
+sub-env $BIN_DIR/steps/nltk
 mtime "nltk.download.time" "${start}"
 
 # Support for pip install -e.
-# In CI, $BUILD_DIR is /app.
+rm -fr $BUILD_DIR/.heroku/src
-if [[ ! "$BUILD_DIR" == "/app" ]]; then
+deep-cp /app/.heroku/src $BUILD_DIR/.heroku/src
-  rm -fr "$BUILD_DIR/.heroku/src"
-  deep-cp /app/.heroku/src "$BUILD_DIR/.heroku/src"
-fi
-
 
 # Django collectstatic support.
 let start=$(nowms)
-sub_env "$BIN_DIR/steps/collectstatic"
+sub-env $BIN_DIR/steps/collectstatic
 mtime "collectstatic.time" "${start}"
 
 # Create .profile script for application runtime environment variables.
-set_env PATH "\$HOME/.heroku/python/bin:\$PATH"
+set-env PATH '$HOME/.heroku/python/bin:$PATH'
-set_env PYTHONUNBUFFERED true
+set-env PYTHONUNBUFFERED true
-set_env PYTHONHOME /app/.heroku/python
+set-env PYTHONHOME /app/.heroku/python
-
+set-env LIBRARY_PATH '/app/.heroku/vendor/lib:/app/.heroku/python/lib:$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_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 LANG en_US.UTF-8
+set-default-env PYTHONPATH /app/
-set_default_env PYTHONHASHSEED random
-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"
+cp $ROOT_DIR/vendor/python.gunicorn.sh $GUNICORN_PROFILE_PATH
-cp "$ROOT_DIR/vendor/python.gunicorn.sh" "$GUNICORN_PROFILE_PATH"
-
 
 # Experimental post_compile hook.
-# shellcheck source=bin/steps/hooks/post_compile
+source $BIN_DIR/steps/hooks/post_compile
-source "$BIN_DIR/steps/hooks/post_compile"
 
 # Fix egg-links, again.
-# shellcheck source=bin/steps/eggpath-fix2
+source $BIN_DIR/steps/eggpath-fix2
-source "$BIN_DIR/steps/eggpath-fix2"
 
 # Store new artifacts in cache.
 
-rm -rf "$CACHE_DIR/.heroku/python"
+rm -rf $CACHE_DIR/.heroku/python
-rm -rf "$CACHE_DIR/.heroku/python-version"
+rm -rf $CACHE_DIR/.heroku/python-version
-rm -rf "$CACHE_DIR/.heroku/python-stack"
+rm -rf $CACHE_DIR/.heroku/python-stack
-rm -rf "$CACHE_DIR/.heroku/vendor"
+rm -rf $CACHE_DIR/.heroku/vendor
-rm -rf "$CACHE_DIR/.heroku/src"
+rm -rf $CACHE_DIR/.heroku/src
 
-mkdir -p "$CACHE_DIR/.heroku"
+mkdir -p $CACHE_DIR/.heroku
-cp -R .heroku/python "$CACHE_DIR/.heroku/"
+cp -R .heroku/python $CACHE_DIR/.heroku/
-cp -R .heroku/python-version "$CACHE_DIR/.heroku/"
+cp -R .heroku/python-version $CACHE_DIR/.heroku/
-cp -R .heroku/python-stack "$CACHE_DIR/.heroku/" &> /dev/null || true
+cp -R .heroku/python-stack $CACHE_DIR/.heroku/ &> /dev/null || true
-cp -R .heroku/vendor "$CACHE_DIR/.heroku/" &> /dev/null || true
+cp -R .heroku/vendor $CACHE_DIR/.heroku/ &> /dev/null || true
 if [[ -d .heroku/src ]]; then
-  cp -R .heroku/src "$CACHE_DIR/.heroku/" &> /dev/null || true
+  cp -R .heroku/src $CACHE_DIR/.heroku/ &> /dev/null || true
 fi
 
 # Measure the size of the Python installation.
-# shellcheck disable=SC2119
 mmeasure 'python.size' "$(measure-size)"

bin/detect

@@ -15,7 +15,7 @@
 BUILD_DIR=$1
 
 # Exit early if app is clearly not Python.
-if [ ! -f "$BUILD_DIR/requirements.txt" ] && [ ! -f "$BUILD_DIR/setup.py" ] && [ ! -f "$BUILD_DIR/Pipfile" ]; then
+if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ] && [ ! -f $BUILD_DIR/Pipfile ]; then
   exit 1
 fi
 

bin/release

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 # bin/release <build-dir>
 
+BIN_DIR=$(cd $(dirname $0); pwd) # absolute path
 BUILD_DIR=$1
 
-MANAGE_FILE=$(cd "$BUILD_DIR" && find . -maxdepth 3 -type f -name 'manage.py' | head -1)
+MANAGE_FILE=$(cd $BUILD_DIR && find . -maxdepth 3 -type f -name 'manage.py' | head -1)
 MANAGE_FILE=${MANAGE_FILE:2}
 
 cat <<EOF

bin/steps/collectstatic

@@ -10,7 +10,6 @@
 #   - $DISABLE_COLLECTSTATIC: disables this functionality.
 #   - $DEBUG_COLLECTSTATIC: upon failure, print out environment variables.
 
-# shellcheck source=bin/utils
 source $BIN_DIR/utils
 
 # Location of 'manage.py', if it exists.
@@ -21,7 +20,7 @@ MANAGE_FILE=${MANAGE_FILE:-fakepath}
 [ -f .heroku/collectstatic_disabled ] && DISABLE_COLLECTSTATIC=1
 
 # Ensure that Django is explicitly specified in requirements.txt
-sp-grep -s django && DJANGO_INSTALLED=1
+pip-grep -s requirements.txt django Django && DJANGO_INSTALLED=1
 
 
 if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALLED" ]; then
@@ -30,13 +29,13 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
     puts-step "$ python $MANAGE_FILE collectstatic --noinput"
 
     # Run collectstatic, cleanup some of the noisy output.
-    python "$MANAGE_FILE" collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
+    python $MANAGE_FILE collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
     COLLECTSTATIC_STATUS="${PIPESTATUS[0]}"
 
     set -e
 
     # Display a warning if collectstatic failed.
-    [ "$COLLECTSTATIC_STATUS" -ne 0 ] && {
+    [ $COLLECTSTATIC_STATUS -ne 0 ] && {
 
         echo
         echo " !     Error while running '$ python $MANAGE_FILE collectstatic --noinput'."

bin/steps/cryptography

@@ -15,8 +15,7 @@ VENDORED_LIBFFI="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/li
 PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Syntax sugar.
-# shellcheck source=bin/utils
+source $BIN_DIR/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
@@ -25,9 +24,8 @@ if (pip-grep -s requirements.txt argon2-cffi bcrypt cffi cryptography django[arg
     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
+    curl $VENDORED_LIBFFI -s | tar zxv -C .heroku/vendor &> /dev/null
   fi
 
-  LIBFFI=$(pwd)/vendor
+  export LIBFFI=$(pwd)/vendor
-  export LIBFFI
 fi

bin/steps/eggpath-fix

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set +e
 # delete any existing egg links, to uninstall exisisting installations.
 find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -delete 2> /dev/null

bin/steps/eggpath-fix2

@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 set +e
 # rewrite build dir in egg links to /app so things are found at runtime
 find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#$(pwd)#/app#" &> /dev/null

bin/steps/gdal

@@ -15,8 +15,7 @@ VENDORED_GDAL="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/gdal
 PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Syntax sugar.
-# shellcheck source=bin/utils
+source $BIN_DIR/utils
-source "$BIN_DIR/utils"
 
 # If GDAL exists within requirements, use vendored gdal.
 if (pip-grep -s requirements.txt GDAL gdal pygdal &> /dev/null) then
@@ -25,10 +24,9 @@ if (pip-grep -s requirements.txt GDAL gdal pygdal &> /dev/null) then
     echo "-----> Noticed GDAL. Bootstrapping gdal."
     mkdir -p .heroku/vendor
     # Download and extract cryptography into target vendor directory.
-    curl "$VENDORED_GDAL" -s | tar zxv -C .heroku/vendor &> /dev/null
+    curl $VENDORED_GDAL -s | tar zxv -C .heroku/vendor &> /dev/null
   fi
 
-  GDAL=$(pwd)/vendor
+  export GDAL=$(pwd)/vendor
-  export GDAL
 fi
 

bin/steps/geo-libs

@@ -17,8 +17,7 @@ VENDORED_PROJ="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/proj
 PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Syntax sugar.
-# shellcheck source=bin/utils
+source $BIN_DIR/utils
-source "$BIN_DIR/utils"
 
 # If GDAL exists within requirements, use vendored gdal.
 if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
@@ -27,12 +26,11 @@ if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
     echo "-----> Bootstrapping gdal, geos, proj."
     mkdir -p .heroku/vendor
     # Download and extract cryptography into target vendor directory.
-    curl "$VENDORED_GDAL" -s | tar zxv -C .heroku/vendor &> /dev/null
+    curl $VENDORED_GDAL -s | tar zxv -C .heroku/vendor &> /dev/null
-    curl "$VENDORED_GEOS" -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
+    curl $VENDORED_PROJ -s | tar zxv -C .heroku/vendor &> /dev/null
   fi
 
-  GDAL=$(pwd)/vendor
+  export GDAL=$(pwd)/vendor
-  export GDAL
 fi
 

bin/steps/hooks/post_compile

@@ -3,5 +3,5 @@
 if [ -f bin/post_compile ]; then
     echo "-----> Running post-compile hook"
     chmod +x bin/post_compile
-    sub_env bin/post_compile
+    sub-env bin/post_compile
 fi

bin/steps/hooks/pre_compile

@@ -3,5 +3,5 @@
 if [ -f bin/pre_compile ]; then
     echo "-----> Running pre-compile hook"
     chmod +x bin/pre_compile
-    sub_env bin/pre_compile
+    sub-env bin/pre_compile
 fi

bin/steps/mercurial

@@ -1,5 +1,3 @@
-#!/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

bin/steps/nltk

@@ -10,23 +10,18 @@
 # This script is invoked by [`bin/compile`](/).
 
 # Syntax sugar.
-# shellcheck source=bin/utils
+source $BIN_DIR/utils
-source "$BIN_DIR/utils"
 
 # Check that nltk was installed by pip, otherwise obviously not needed
-if sp-grep -s nltk; then
+python -m nltk.downloader -h >/dev/null 2>&1
+if [ $? -eq 0 ]; then
     puts-step "Downloading NLTK corpora..."
-
     nltk_packages_definition="$BUILD_DIR/nltk.txt"
-
     if [ -f "$nltk_packages_definition" ]; then
-
         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"
-        set_env NLTK_DATA "/app/.heroku/python/nltk_data"
-
     else
         puts-warn "'nltk.txt' not found, not downloading any corpora"
         puts-warn "Learn more: https://devcenter.heroku.com/articles/python-nltk"

bin/steps/pip-install

@@ -1,25 +1,20 @@
-#!/usr/bin/env bash
+# Install dependencies with Pip.
+puts-step "Installing requirements with pip"
 
-if [ ! "$SKIP_PIP_INSTALL" ]; then
+set +e
+/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
 
-    # Install dependencies with Pip.
+show-warnings
-    puts-step "Installing requirements with pip"
 
-    set +e
+if [[ ! $PIP_STATUS -eq 0 ]]; then
-    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
+    exit 1
-    PIP_STATUS="${PIPESTATUS[0]}"
-    set -e
-
-    show-warnings
-
-    if [[ ! $PIP_STATUS -eq 0 ]]; then
-        exit 1
-    fi
-
-
-    # Smart Requirements handling
-    cp requirements.txt .heroku/python/requirements-declared.txt
-    /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
-
-    echo
 fi
+
+
+# Smart Requirements handling
+cp requirements.txt .heroku/python/requirements-declared.txt
+/app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
+
+echo

bin/steps/pip-uninstall

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set +e
 # Install dependencies with Pip.
 

bin/steps/pipenv

@@ -1,21 +1,10 @@
-#!/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..."
+        puts-step "Generating 'requirements.txt' with pipenv"
 
-        # Install pipenv.
         /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
 
-        # Install the dependencies.
+        /app/.heroku/python/bin/pipenv lock --requirements --no-hashes > $BUILD_DIR/requirements.txt 2> /dev/null
-        /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
-
     fi
 fi

bin/steps/pipenv-python-version

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # Detect Python-version with Pipenv.
 
 if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
@@ -10,14 +8,14 @@ if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
         fi
         if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
             set +e
-            PYTHON=$(jq -r '._meta.requires.python_version' "$BUILD_DIR/Pipfile.lock")
+            PYTHON=$(cat $BUILD_DIR/Pipfile.lock | jq '._meta.requires.python_version' -r)
             set -e
 
             if [ "$PYTHON" = 2.7 ]; then
-                echo "python-2.7.13" > "$BUILD_DIR/runtime.txt"
+                echo "python-2.7.13" > $BUILD_DIR/runtime.txt
             fi
             if [ "$PYTHON" = 3.6 ]; then
-                echo "python-3.6.2" > "$BUILD_DIR/runtime.txt"
+                echo "python-3.6.0" > $BUILD_DIR/runtime.txt
             fi
         fi
     fi

bin/steps/pylibmc

@@ -13,8 +13,7 @@
 VENDORED_MEMCACHED="https://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
 
 # Syntax sugar.
-# shellcheck source=bin/utils
+source $BIN_DIR/utils
-source "$BIN_DIR/utils"
 
 
 # If pylibmc exists within requirements, use vendored libmemcached.
@@ -24,9 +23,8 @@ if (pip-grep -s requirements.txt pylibmc &> /dev/null) then
     echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
     mkdir -p .heroku/vendor
     # Download and extract libmemcached into target vendor directory.
-    curl "$VENDORED_MEMCACHED" -s | tar zxv -C .heroku/vendor &> /dev/null
+    curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
   fi
 
-  LIBMEMCACHED=$(pwd)/vendor
+  export LIBMEMCACHED=$(pwd)/vendor
-  export LIBMEMCACHED
 fi

bin/steps/python

@@ -1,16 +1,10 @@
-#!/usr/bin/env bash
-
 set +e
 runtime-fixer runtime.txt
 PYTHON_VERSION=$(cat runtime.txt)
 
-if [[ "$STACK" != "$CACHED_PYTHON_STACK" ]]; then
+# Install Python.
-    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
-fi
-
 if [ -f .heroku/python-version ]; then
-  if [ ! "$(cat .heroku/python-version)" = "$PYTHON_VERSION" ]; then
+  if [ ! $(cat .heroku/python-version) = $PYTHON_VERSION ]; then
       puts-step "Found $(cat .heroku/python-version), removing"
       rm -fr .heroku/python
   else
@@ -18,30 +12,41 @@ if [ -f .heroku/python-version ]; then
   fi
 fi
 
+if [ ! $STACK = $CACHED_PYTHON_STACK ]; then
+    rm -fr .heroku/python .heroku/python-stack .heroku/vendor
+    unset SKIP_INSTALL
+fi
+
+
 if [ ! "$SKIP_INSTALL" ]; then
     puts-step "Installing $PYTHON_VERSION"
 
     # Prepare destination directory.
     mkdir -p .heroku/python
 
+    curl https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz -s | tar zxv -C .heroku/python &> /dev/null
     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 [[ $? != 0 ]] ; 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
     fi
 
   # Record for future reference.
-  echo "$PYTHON_VERSION" > .heroku/python-version
+  echo $PYTHON_VERSION > .heroku/python-version
-  echo "$STACK" > .heroku/python-stack
+  echo $STACK > .heroku/python-stack
   FRESH_PYTHON=true
 
   hash -r
 fi
 
 # If Pip isn't up to date:
-if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then
+if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
+  WORKING_DIR=$(pwd)
+
+  TMPTARDIR=$(mktemp -d)
+  trap "rm -rf $TMPTARDIR" RETURN
 
   puts-step "Installing pip"
 
@@ -49,7 +54,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then
   rm -fr /app/.heroku/python/lib/python2.7/site-packages/pip-*
   rm -fr /app/.heroku/python/lib/python2.7/site-packages/setuptools-*
 
-  /app/.heroku/python/bin/python "$ROOT_DIR/vendor/get-pip.py" &> /dev/null
+  /app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py &> /dev/null
 
 fi
 

bin/steps/setuptools

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Syntax sugar.
+source $BIN_DIR/utils
+
+if (pip-grep -s requirements.txt setuptools distribute &> /dev/null) then
+
+  puts-warn 'The package setuptools/distribute is listed in requirements.txt.'
+  puts-warn 'Please remove to ensure expected behavior. '
+
+fi

bin/test-compile

@@ -1,12 +1,10 @@
 #!/usr/bin/env bash
 
 # Syntax sugar.
-BIN_DIR=$(cd "$(dirname "$0")" || return; pwd) # absolute path
+BIN_DIR=$(cd $(dirname $0); pwd) # absolute path
+source $BIN_DIR/utils
 
-# shellcheck source=bin/utils
+DISABLE_COLLECTSTATIC=1 "$(dirname ${0:-})/compile" "$1" "$2" "$3"
-source "$BIN_DIR/utils"
-
-DISABLE_COLLECTSTATIC=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

bin/utils

@@ -1,15 +1,13 @@
 #!/usr/bin/env bash
 shopt -s extglob
-shopt -s nullglob
 
 # The standard library.
 if [[ ! -f  /tmp/stdlib.sh ]]; then
-  curl --retry 3 -s https://lang-common.s3.amazonaws.com/buildpack-stdlib/v8/stdlib.sh > /tmp/stdlib.sh
+  curl --retry 3 -s https://raw.githubusercontent.com/heroku/buildpack-stdlib/v2/stdlib.sh > /tmp/stdlib.sh
 fi
-# shellcheck source=/dev/null
 source /tmp/stdlib.sh
 
-if [ "$(uname)" == Darwin ]; then
+if [ $(uname) == Darwin ]; then
     sed() { command sed -l "$@"; }
 else
     sed() { command sed -u "$@"; }
@@ -28,12 +26,12 @@ cleanup() {
 
 # Buildpack Steps.
 puts-step() {
-  echo "-----> $*"
+  echo "-----> $@"
 }
 
 # Buildpack Warnings.
 puts-warn() {
-  echo " !     $*"
+  echo " !     $@"
 }
 
 # Does some serious copying.
@@ -53,8 +51,31 @@ deep-cp() {
 }
 
 
-# Measure the size of the Python installation.
+sub-env() {
-measure-size() {
+
-  echo "$(du -s .heroku/python 2>/dev/null || echo 0) | awk '{print $1}')"
+  WHITELIST=${2:-''}
+  BLACKLIST=${3:-'^(GIT_DIR|STACK|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'}
+
+  # Python-specific variables.
+  export PYHONHOME=$BUILD_DIR/.heroku/python
+  export PYTHONPATH=$BUILD_DIR/
+
+  (
+    if [ -d "$ENV_DIR" ]; then
+      for e in $(ls $ENV_DIR); do
+        echo "$e" | grep -E "$WHITELIST" | grep -qvE "$BLACKLIST" &&
+        export "$e=$(cat $ENV_DIR/$e)"
+        :
+      done
+    fi
+
+    $1
+
+  )
+}
+
+# Measure the size of the Python installation.
+measure-size() {
+  echo "$((du -s .heroku/python 2>/dev/null || echo 0) | awk '{print $1}')"
 }
 

bin/warnings

@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 shopt -s extglob
 
 old-platform() {

builds/README.md

@@ -1,7 +1,5 @@
 # Python Buildpack Binaries
 
-For Cedar-14 stack
-------------------
 
 To get started with it, create an app on Heroku inside a clone of this repository, and set your S3 config vars:
 
@@ -30,12 +28,4 @@ If this works, run `bob deploy` instead of `bob build` to have the result upload
 
 To speed things up drastically, it'll usually be a good idea to `heroku run bash --size PX` instead.
 
-For Heroku-16 stack
--------------------
-
-1. Ensure GNU Make and Docker are installed.
-2. From the root of the buildpack repository, run: `make buildenv-heroku-16`
-3. Follow the instructions displayed!
-
-
 Enjoy :)

builds/libraries/vendor/gdal

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

builds/runtimes/pypy-5.7.1

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
-
-# NOTICE: This formula only works for the cedar-14 stack, not cedar.
-
-OUT_PREFIX=$1
-
-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
-
-ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy-5.8.0

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
-
-OUT_PREFIX=$1
-
-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
-
-ln $OUT_PREFIX/bin/pypy $OUT_PREFIX/bin/python

builds/runtimes/pypy3-5.7.1

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
-
-OUT_PREFIX=$1
-
-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
-
-ln $OUT_PREFIX/bin/pypy3 $OUT_PREFIX/bin/python

builds/runtimes/pypy3-5.8.0

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/python/
-# Build Deps: libraries/sqlite
-
-OUT_PREFIX=$1
-
-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
-
-ln $OUT_PREFIX/bin/pypy3 $OUT_PREFIX/bin/python

builds/runtimes/python-2.7.13

@@ -13,7 +13,3 @@ 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-3.5.3

@@ -1,18 +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.5.3/Python-3.5.3.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.5.3 src
-cd src
-
-./configure --prefix=$OUT_PREFIX --with-ensurepip=no
-make
-make install
-
-# ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python
-

builds/runtimes/python-3.6.2

@@ -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.2/Python-3.6.2.tgz'
-curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.6.2 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 @@
-bob-builder==0.0.13
+bob-builder==0.0.5

test/fixtures/geos/requirements.txt

@@ -1 +0,0 @@
-django

test/fixtures/nltk/runtime.txt

@@ -1 +0,0 @@
-python-2.7.13

test/fixtures/pylibmc/requirements.txt

@@ -1 +0,0 @@
-pylibmc

test/fixtures/python3/runtime.txt

@@ -0,0 +1 @@
+python-3.6.0

test/run

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+
 testPipenv() {
   compile "pipenv"
   assertCapturedSuccess
@@ -7,7 +8,7 @@ testPipenv() {
 
 testPipenvVersion() {
   compile "pipenv-version"
-  assertCaptured "3.6.2"
+  assertCaptured "3.6.0"
   assertCapturedSuccess
 }
 
@@ -16,11 +17,6 @@ testNoRequirements() {
   assertCapturedError
 }
 
-testGEOS() {
-  BUILD_WITH_GEO_LIBRARIES=1 compile "geos"
-  assertCaptured "geos"
-  assertCapturedSuccess
-}
 
 testNLTK() {
   compile "nltk"
@@ -28,6 +24,7 @@ testNLTK() {
   assertCapturedSuccess
 }
 
+
 testSetupPy() {
   compile "setup-py"
   assertCaptured "maya"
@@ -47,12 +44,6 @@ testPsycopg2() {
   assertCapturedSuccess
 }
 
-testPylibmc() {
-  compile "pylibmc"
-  assertCaptured "pylibmc"
-  assertCapturedSuccess
-}
-
 testPython2() {
   compile "python2"
   assertCaptured "python-2.7.13"
@@ -61,30 +52,11 @@ testPython2() {
 
 testPython3() {
   compile "python3"
-  assertCaptured "python-3.6.2"
+  assertCaptured "python-3.6.0"
   assertCapturedSuccess
 }
 
-testSmartRequirements() {
-  local cache_dir="$(mktmpdir)"
-  compile "requirements-standard" "$cache_dir"
-  assertFile "requests" ".heroku/python/requirements-declared.txt"
-  assertCapturedSuccess
-  compile "psycopg2" "$cache_dir"
-  assertCaptured "Uninstalling requests"
-  assertFile "psycopg2" ".heroku/python/requirements-declared.txt"
-  assertCapturedSuccess
-}
 
-testStackChange() {
-  local cache_dir="$(mktmpdir)"
-  mkdir -p "${cache_dir}/.heroku"
-  echo "different-stack" > "${cache_dir}/.heroku/python-stack"
-  compile "requirements-standard" "$cache_dir"
-  assertCaptured "clearing cache"
-  assertFile "$STACK" ".heroku/python-stack"
-  assertCapturedSuccess
-}
 
 
 pushd $(dirname 0) >/dev/null

test/utils

@@ -93,14 +93,8 @@ assertNotCaptured()
 
 assertCapturedSuccess()
 {
-  assertEquals "Captured exit code -" "0" "${RETURN}"
+  assertEquals "Expected captured exit code to be 0; was <${RETURN}>" "0" "${RETURN}"
-  assertEquals "STD_ERR -" "" "$(cat ${STD_ERR})"
+  assertEquals "Expected STD_ERR to be empty; was <$(cat ${STD_ERR})>" "" "$(cat ${STD_ERR})"
-
-  if [ $RETURN -ne 0 -a -z "$(cat ${STD_ERR})" ]; then
-    # Failing exit code but stderr was empty. Display stdout to help debugging.
-    cat $STD_OUT
-    echo
-  fi
 }
 
 # assertCapturedError [[expectedErrorCode] expectedErrorMsg]

vendor/WEB_CONCURRENCY.sh

@@ -1,29 +0,0 @@
-case $(ulimit -u) in
-
-# Automatic configuration for Gunicorn's Workers setting.
-
-# Standard-1X (+Free, +Hobby) Dyno
-256)
-  export DYNO_RAM=512
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-2}
-  ;;
-
-# Standard-2X Dyno
-512)
-  export DYNO_RAM=1024
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4}
-  ;;
-
-# Performance-M Dyno
-16384)
-  export DYNO_RAM=2560
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-8}
-  ;;
-
-# Performance-L Dyno
-32768)
-  export DYNO_RAM=14336
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-11}
-  ;;
-
-esac

vendor/pip-pop/sp-grep

@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""Usage:
-  sp-grep [-s] <package>...
-
-Options:
-  -h --help     Show this screen.
-"""
-from docopt import docopt
-from pkg_resources import DistributionNotFound, get_distribution
-
-
-def has_any_distribution(names, silent=False):
-    for name in names:
-        try:
-            get_distribution(name)
-        except DistributionNotFound:
-            continue
-
-        if not silent:
-            print('Package {name} found!'.format(name=name))
-
-        exit(0)
-
-    if not silent:
-        print('Not found.')
-
-    exit(1)
-
-
-def main():
-    args = docopt(__doc__, version='sp-grep')
-    has_any_distribution(names=args['<package>'], silent=args['-s'])
-
-
-if __name__ == '__main__':
-    main()

vendor/python.gunicorn.sh

@@ -1,2 +1,38 @@
+if [[ "${WEB_CONCURRENCY:-}" == 0* ]]; then
+  # another buildpack set a default value, with leading zero
+  unset WEB_CONCURRENCY
+fi
+
+case $(ulimit -u) in
+
+# Automatic configuration for Gunicorn's Workers setting.
+# Leading zero padding so a subsequent buildpack can figure out that we set a value, and not the user
+
+# Standard-1X (+Free, +Hobby) Dyno
+256)
+  export DYNO_RAM=512
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-02}
+  ;;
+
+# Standard-2X Dyno
+512)
+  export DYNO_RAM=1024
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-04}
+  ;;
+
+# Performance-M Dyno
+16384)
+  export DYNO_RAM=2560
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-08}
+  ;;
+
+# Performance-L Dyno
+32768)
+  export DYNO_RAM=6656
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-011}
+  ;;
+
+esac
+
 # Automatic configuration for Gunicorn's ForwardedAllowIPS setting.
 export FORWARDED_ALLOW_IPS='*'