Release v185 (#1114)

Closes @W-8381914@.

.travis.yml

@@ -23,10 +23,6 @@ jobs:
 
 env:
   jobs:
-    - STACK=cedar-14 TEST_CMD=test/run-deps
-    - STACK=cedar-14 TEST_CMD=test/run-versions
-    - STACK=cedar-14 TEST_CMD=test/run-features
-
     - STACK=heroku-16 TEST_CMD=test/run-deps
     - STACK=heroku-16 TEST_CMD=test/run-versions
     - STACK=heroku-16 TEST_CMD=test/run-features

CHANGELOG.md

@@ -3,6 +3,19 @@
 ## Unreleased
 
 
+## v185 (2020-11-12)
+
+- Error if the unsupported `BUILD_WITH_GEO_LIBRARIES` env var is set (#1115).
+- Remove deprecated GDAL/GEOS/PROJ support (#1113).
+- Remove vendored `jq` binary (#1112).
+- Remove redundant Mercurial install step (#1111).
+- Remove support for the Cedar-14 stack (#1110).
+
+## v184 (2020-10-21)
+
+- Vendor buildpack-stdlib instead of fetching from S3 (#1100).
+- Fix metric names for metrics emitted within `sub_env` (#1099).
+
 ## v183 (2020-10-12)
 
 - Add support for Heroku-20 (#968).

Gemfile.lock

@@ -3,13 +3,13 @@ GEM
   specs:
     diff-lcs (1.4.4)
     erubis (2.7.0)
-    excon (0.76.0)
+    excon (0.78.0)
     heroics (0.1.1)
       erubis (~> 2.0)
       excon
       moneta
       multi_json (>= 1.9.2)
-    heroku_hatchet (7.3.1)
+    heroku_hatchet (7.3.3)
       excon (~> 0)
       platform-api (~> 3)
       rrrretry (~> 1)
@@ -28,21 +28,21 @@ GEM
     rake (13.0.1)
     rate_throttle_client (0.1.2)
     rrrretry (1.0.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.3)
+    rspec-support (3.10.0)
     thor (1.0.1)
     threaded (0.0.4)
 

Makefile

@@ -2,22 +2,17 @@
 .PHONY: check test builder-image buildenv deploy-runtimes tools
 
 STACK ?= heroku-18
-STACKS ?= cedar-14 heroku-16 heroku-18
+STACKS ?= heroku-16 heroku-18 heroku-20
 TEST_CMD ?= test/run-versions && test/run-features && test/run-deps
 ENV_FILE ?= builds/dockerenv.default
 BUILDER_IMAGE_PREFIX := heroku-python-build
 
-ifeq ($(STACK),cedar-14)
-	# Cedar-14 doesn't have a build image varient.
-	STACK_IMAGE_TAG := heroku/cedar:14
-else
-	# Converts a stack name of `heroku-NN` to its build Docker image tag of `heroku/heroku:NN-build`.
-	STACK_IMAGE_TAG := heroku/$(subst -,:,$(STACK))-build
-endif
+# Converts a stack name of `heroku-NN` to its build Docker image tag of `heroku/heroku:NN-build`.
+STACK_IMAGE_TAG := heroku/$(subst -,:,$(STACK))-build
 
 check:
 	@shellcheck -x bin/compile bin/detect bin/release bin/test-compile bin/utils bin/warnings bin/default_pythons
-	@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/collectstatic bin/steps/eggpath-fix  bin/steps/eggpath-fix2 bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/python
 	@shellcheck -x bin/steps/hooks/*
 
 test:

NOTICE

@@ -1,27 +1,5 @@
 This buildpack includes some vendorized packages to ease installation.
 
-jq license
-----------
-
-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:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 shunit2 license
 ---------------
 

bin/compile

@@ -15,10 +15,8 @@
 # Fail fast and fail hard.
 set -eo pipefail
 
-# Boostrap the Buildpack Standard Library.
-# Disable unused env var warning since shellcheck doesn't know about the stdlib.
-# shellcheck disable=2034
-BPLOG_PREFIX="buildpack.python"
+# Used by buildpack-stdlib's metrics features.
+export BPLOG_PREFIX="buildpack.python"
 export BUILDPACK_LOG_FILE=${BUILDPACK_LOG_FILE:-/dev/null}
 
 [ "$BUILDPACK_XTRACE" ] && set -o xtrace
@@ -41,16 +39,8 @@ export BUILD_DIR CACHE_DIR ENV_DIR
 # The user can provide BUILDPACK_S3_BASE_URL to specify a custom target.
 # Note: this is designed for non-Heroku use, as it does not use the user-provided
 # environment variable mechanism (the ENV_DIR).
-if [[ "${STACK}" == "cedar-14" ]]; then
-  # Since Cedar-14 is EOL on 2020-11-02 it's not worth migrating it to the new bucket.
-  DEFAULT_S3_BASE_URL='https://lang-python.s3.amazonaws.com'
-else
-  DEFAULT_S3_BASE_URL='https://heroku-buildpack-python.s3.amazonaws.com'
-fi
-S3_BASE_URL="${BUILDPACK_S3_BASE_URL:-${DEFAULT_S3_BASE_URL}}"
+S3_BASE_URL="${BUILDPACK_S3_BASE_URL:-"https://heroku-buildpack-python.s3.amazonaws.com"}"
 # This has to be exported since it's used by the geo-libs step which is run in a subshell.
-# TODO: Stop exporting once the geo-libs step is removed or no longer uses `sub_env`.
-export S3_BASE_URL
 
 # Default Python Versions
 # shellcheck source=bin/default_pythons
@@ -68,7 +58,8 @@ PYPY27="pypy2.7"
 PYPY36="pypy3.6"
 
 # Which stack is used (for binary downloading), if none is provided (e.g. outside of Heroku)?
-DEFAULT_PYTHON_STACK="cedar-14"
+# TODO: Remove this and require that STACK be set explicitly.
+DEFAULT_PYTHON_STACK="heroku-18"
 
 # Common Problem Warnings:
 # This section creates a temporary file in which to stick the output of `pip install`.
@@ -105,6 +96,31 @@ source "$BIN_DIR/utils"
 # shellcheck source=bin/warnings
 source "$BIN_DIR/warnings"
 
+if [[ "${STACK}" == "cedar-14" ]]; then
+  mcount "failure.unsupported.cedar-14"
+  puts-warn "The Cedar-14 stack is no longer supported by the latest release of this buildpack."
+  puts-warn
+  puts-warn "Please switch to the Cedar-14 support branch by using this buildpack URL:"
+  puts-warn "https://github.com/heroku/heroku-buildpack-python#cedar-14"
+  puts-warn
+  puts-warn "For instructions on how to change the buildpacks used by an app, see:"
+  puts-warn "https://devcenter.heroku.com/articles/buildpacks#setting-a-buildpack-on-an-application"
+  exit 1
+fi
+
+if [[ -f "${ENV_DIR}/BUILD_WITH_GEO_LIBRARIES" ]]; then
+  mcount "failure.unsupported.BUILD_WITH_GEO_LIBRARIES"
+  puts-warn "The Python buildpack's BUILD_WITH_GEO_LIBRARIES functonality is no longer supported:"
+  puts-warn "https://help.heroku.com/D5INLB1A/python-s-build_with_geo_libraries-legacy-feature-is-now-deprecated"
+  puts-warn
+  puts-warn "For GDAL, GEOS and PROJ support, use the Geo buildpack alongside the Python buildpack:"
+  puts-warn "https://github.com/heroku/heroku-geo-buildpack"
+  puts-warn
+  puts-warn "To remove this error message, unset the BUILD_WITH_GEO_LIBRARIES variable using:"
+  puts-warn "heroku config:unset BUILD_WITH_GEO_LIBRARIES"
+  exit 1
+fi
+
 # Make the directory in which we will create symlinks from the temporary build directory
 # to `/app`.
 # Symlinks are required, since Python is not a portable installation.
@@ -133,8 +149,9 @@ export PYTHONUNBUFFERED=1
 # Set the locale to a well-known and expected standard.
 export LANG=en_US.UTF-8
 # `~/.heroku/vendor` is an place where the buildpack may stick pre-build binaries for known
-# C dependencies (e.g. libmemcached on cedar-14). This section configures Python (GCC, more specifically)
+# C dependencies. This section configures Python (GCC, more specifically)
 # and pip to automatically include these paths when building binaries.
+# TODO: Stop adding .heroku/vendor here now that the buildpack no longer vendors anything.
 export C_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$C_INCLUDE_PATH
 export CPLUS_INCLUDE_PATH=/app/.heroku/vendor/include:/app/.heroku/python/include:$CPLUS_INCLUDE_PATH
 export LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LIBRARY_PATH
@@ -174,8 +191,6 @@ cp -R "$CACHE_DIR/.heroku/python-stack" .heroku/ &> /dev/null || true
 cp -R "$CACHE_DIR/.heroku/python-version" .heroku/ &> /dev/null || true
 # A plain text file which contains the current sqlite3 version being used (used for cache busting).
 cp -R "$CACHE_DIR/.heroku/python-sqlite3-version" .heroku/ &> /dev/null || true
-# Any pre-compiled binaries, provided by the buildpack.
-cp -R "$CACHE_DIR/.heroku/vendor" .heroku/ &> /dev/null || true
 # "editable" installations of code repositories, via pip or pipenv.
 if [[ -d "$CACHE_DIR/.heroku/src" ]]; then
   cp -R "$CACHE_DIR/.heroku/src" .heroku/ &> /dev/null || true
@@ -261,27 +276,6 @@ fi
 # shellcheck source=bin/steps/eggpath-fix
 source "$BIN_DIR/steps/eggpath-fix"
 
-# Mercurial support.
-# If a customer appears to be using mercurial for dependency resolution, we install it first.
-# Note: this only applies to pip, not pipenv. This can likely be removed, over time. Measure it first.
-# shellcheck source=bin/steps/mercurial
-source "$BIN_DIR/steps/mercurial"
-
-# Pylibmc support.
-# On cedar-14, libmemcached was not available. The buildpack provides its own version, instead.
-# shellcheck source=bin/steps/pylibmc
-source "$BIN_DIR/steps/pylibmc"
-
-# Support for Geo libraries. This is deprecated functionality, only functional on cedar-14.
-# It is undocumented.
-# shellcheck source=bin/steps/geo-libs
-sub_env "$BIN_DIR/steps/geo-libs"
-
-# GDAL support.
-# This is part of the Geo support.
-# shellcheck source=bin/steps/gdal
-source "$BIN_DIR/steps/gdal"
-
 # SQLite3 support.
 # This sets up and installs sqlite3 dev headers and the sqlite3 binary but not the
 # libsqlite3-0 library since that exists on the stack image.
@@ -379,7 +373,6 @@ mkdir -p "$CACHE_DIR/.heroku"
 cp -R .heroku/python "$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/vendor "$CACHE_DIR/.heroku/" &> /dev/null || true
 if [[ -d .heroku/src ]]; then
   cp -R .heroku/src "$CACHE_DIR/.heroku/" &> /dev/null || true
 fi

bin/steps/gdal

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-# This script serves as the GDAL 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 cryptography binary.
-VENDORED_GDAL="${S3_BASE_URL}/${STACK}/libraries/vendor/gdal.tar.gz"
-
-PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-# Syntax sugar.
-# shellcheck source=bin/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
-
-  if [[ ! -f ".heroku/vendor/bin/gdalserver" && "${STACK}" == 'heroku-20' ]]; then
-    puts-warn "The buildpack's built-in GDAL functonality is not supported on Heroku-20."
-    puts-warn "Please use this buildpack instead: https://github.com/heroku/heroku-geo-buildpack"
-
-  elif [[ ! -f ".heroku/vendor/bin/gdalserver" ]]; then
-    puts-warn "The vendored GDAL package in the Heroku Python Buildpack now deprecated."
-    puts-warn "To enable GDAL use an alternative buildpack is available here - https://github.com/heroku/heroku-geo-buildpack"
-
-    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
-    mcount "steps.vendor.gdal"
-  fi
-
-  GDAL=$(pwd)/vendor
-  export GDAL
-fi

bin/steps/geo-libs

@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-
-# This script serves as the GDAL 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 cryptography binary.
-VENDORED_GDAL="${S3_BASE_URL}/${STACK}/libraries/vendor/gdal.tar.gz"
-VENDORED_GEOS="${S3_BASE_URL}/${STACK}/libraries/vendor/geos.tar.gz"
-VENDORED_PROJ="${S3_BASE_URL}/${STACK}/libraries/vendor/proj.tar.gz"
-
-PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-# Syntax sugar.
-# shellcheck source=bin/utils
-source "$BIN_DIR/utils"
-
-if [[ "$BUILD_WITH_GEO_LIBRARIES" && "${STACK}" == 'heroku-20' ]]; then
-  puts-warn "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality is not supported on Heroku-20."
-  puts-warn "Please use this buildpack for GDAL, GEOS and PROJ: https://github.com/heroku/heroku-geo-buildpack"
-  puts-warn "To hide this message, unset the BUILD_WITH_GEO_LIBRARIES variable using: heroku config:unset BUILD_WITH_GEO_LIBRARIES"
-elif [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
-  mcount "buildvar.BUILD_WITH_GEO_LIBRARIES"
-
-  puts-warn "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated."
-  puts-warn "An alternative buildpack to enable GDAL, GEOS and PROJ use is available here - https://github.com/heroku/heroku-geo-buildpack"
-
-  if [ ! -f ".heroku/vendor/bin/proj" ]; 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_GEOS" -s | tar zxv -C .heroku/vendor &> /dev/null
-    curl "$VENDORED_PROJ" -s | tar zxv -C .heroku/vendor &> /dev/null
-
-    mcount "steps.vendor.geo_libs"
-    # Copy libjasper from build image to slug.
-    if [[ "$STACK" == "heroku-16" ]]; then
-      cp /usr/lib/x86_64-linux-gnu/libjasper.so* ".heroku/vendor/lib/."
-      mcount "steps.vendor.libjasper"
-    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,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Install Mercurial if it appears to be required.
-if [[ -f "requirements.txt" ]]; then
-	if (grep -Fiq "hg+" requirements.txt) then
-		/app/.heroku/python/bin/pip install  mercurial | cleanup | indent
-		mcount "steps.mercurial"
-	fi
-fi

bin/steps/pylibmc

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-# This script serves as the Pylibmc 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`](/).
-
-if [[ "$STACK" != "cedar-14" ]]; 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="${S3_BASE_URL}/${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
-
-  if [ ! -d ".heroku/vendor/lib/sasl2" ]; 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
-    mcount "steps.vendor.pylibmc"
-  fi
-
-  LIBMEMCACHED=$(pwd)/vendor
-  export LIBMEMCACHED
-fi

bin/utils

@@ -2,12 +2,13 @@
 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
-fi
-# shellcheck source=/dev/null
-source /tmp/stdlib.sh
+# This is necessary since this script is sometimes sourced from
+# subshells that don't have the variables from bin/compile.
+# Remove this once we no longer wrap all the things in `sub_env`.
+BIN_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+ROOT_DIR=$(dirname "${BIN_DIR}")
+# shellcheck source=vendor/buildpack-stdlib_v8.sh
+source "${ROOT_DIR}/vendor/buildpack-stdlib_v8.sh"
 
 if [ "$(uname)" == Darwin ]; then
     sed() { command sed -l "$@"; }

bin/warnings

@@ -12,16 +12,6 @@ old-platform() {
   fi
 }
 
-pylibmc-missing() {
-  if grep -qi 'fatal error: libmemcached/memcached.h: No such file or directory' "$WARNINGS_LOG"; then
-    echo
-    puts-warn "Hello! There was a problem with your build related to libmemcache."
-    puts-warn "The Python library 'pylibmc' must be explicitly specified in 'requirements.txt' in order to build correctly."
-    puts-warn "Once you do that, everything should work as expected.   -- Much Love, Heroku."
-    mcount 'warnings.libmemcache'
-  fi
-}
-
 scipy-included() {
   if grep -qi 'running setup.py install for scipy' "$WARNINGS_LOG"; then
     echo
@@ -56,11 +46,22 @@ six-included() {
   fi
 }
 
+gdal-missing() {
+  if grep -qi 'Could not find gdal-config' "$WARNINGS_LOG"; then
+    mcount 'warnings.gdal'
+    echo
+    puts-warn "Hello! Package installation failed since the GDAL library was not found."
+    puts-warn "For GDAL, GEOS and PROJ support, use the Geo buildpack alongside the Python buildpack:"
+    puts-warn "https://github.com/heroku/heroku-geo-buildpack"
+    puts-warn "  -- Much Love, Heroku."
+  fi
+}
+
 show-warnings() {
   old-platform
-  pylibmc-missing
   scipy-included
   distribute-included
   six-included
+  gdal-missing
 }
 

builds/cedar-14.Dockerfile

@@ -1,21 +0,0 @@
-FROM heroku/cedar:14
-
-ENV WORKSPACE_DIR="/app/builds" \
-    S3_BUCKET="lang-python" \
-    S3_PREFIX="cedar-14/" \
-    STACK="cedar-14"
-
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-        libsqlite3-dev \
-        python3-pip \
-        realpath \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app
-
-COPY requirements.txt /app/
-# Can't use `--disable-pip-version-check --no-cache-dir` since not supported by Ubuntu 14.04's pip.
-RUN pip3 install -r /app/requirements.txt
-
-COPY . /app

builds/libraries/vendor/gdal

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/vendor/
-
-OUT_PREFIX=$1
-
-# Use new path, containing autoconf.
-export PATH="/app/.heroku/python/bin/:$PATH"
-hash -r
-
-
-echo "Building gdal…"
-
-VERSION="2.2.1"
-SOURCE_TARBALL="http://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}.tar.gz"
-
-curl -L $SOURCE_TARBALL | tar zx
-
-pushd "gdal-${VERSION}"
-./configure --prefix=$OUT_PREFIX --enable-static=no  &&
-make
-make install
-
-# Cleanup
-popd

builds/libraries/vendor/geos

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/vendor/
-
-OUT_PREFIX=$1
-
-# Use new path, containing autoconf.
-export PATH="/app/.heroku/python/bin/:$PATH"
-hash -r
-
-
-echo "Building geos…"
-
-VERSION=3.6.2
-
-SOURCE_TARBALL="http://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
-
-curl -L $SOURCE_TARBALL | tar xj
-
-pushd "geos-${VERSION}"
-./configure --prefix=$OUT_PREFIX --enable-static=no &&
-make
-make install
-
-# Cleanup
-popd

builds/libraries/vendor/libmemcache

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/vendor/
-
-OUT_PREFIX=$1
-
-if [[ $S3_PREFIX != "cedar-14" ]]; then
-    echo "libmemcached only needs to be built for cedar-14, since newer stacks include it in the base image"
-    exit 1
-fi
-
-# fail hard
-set -o pipefail
-# fail harder
-set -eux
-
-DEFAULT_VERSION="1.0.18"
-dep_version=${VERSION:-$DEFAULT_VERSION}
-dep_dirname=libmemcached-${dep_version}
-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…"
-
-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
-tar xzf cyrus-sasl-2.1.26.tar.gz
-
-pushd cyrus-sasl-2.1.26
-./configure --prefix=${OUT_PREFIX} --with-plugindir=${OUT_PREFIX}lib/sasl2 --with-configdir=${OUT_PREFIX}lib/sasl2
-
-make -s -j 9
-make install -s
-popd
-
-echo "-----> Building libmemcached ${dep_version}…"
-
-curl -L ${dep_url} | tar xz
-pushd ${dep_dirname}
-CPPFLAGS=-I${OUT_PREFIX}/include LDFLAGS=-L${OUT_PREFIX}/lib ./configure --prefix=${OUT_PREFIX} --without-memcached
-make -s -j 9
-make install -s
-popd
-
-echo "-----> Done."

builds/libraries/vendor/proj

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Build Path: /app/.heroku/vendor/
-
-OUT_PREFIX=$1
-
-# Use new path, containing autoconf.
-export PATH="/app/.heroku/python/bin/:$PATH"
-hash -r
-
-
-echo "Building gdal…"
-
-VERSION=4.9.3
-SOURCE_TARBALL="http://download.osgeo.org/proj/proj-${VERSION}.tar.gz"
-
-curl -L $SOURCE_TARBALL | tar zx
-
-pushd "proj-${VERSION}"
-./configure --prefix=$OUT_PREFIX --enable-static=no
-make
-make install
-
-# Cleanup
-popd

test/fixtures/gdal/requirements.txt

@@ -0,0 +1 @@
+gdal

test/fixtures/geos/requirements.txt

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

test/fixtures/requirements-mercurial/requirements.txt

@@ -0,0 +1 @@
+hg+https://www.mercurial-scm.org/repo/python-hglib/#egg=python-hglib

test/run-deps

@@ -17,18 +17,18 @@ testCollectstatic() {
   assertCaptured "collectstatic"
 }
 
-testGEOS() {
+testBuildWithGeoLibrariesWarning() {
   local env_dir="$(mktmpdir)"
   echo '1' > "${env_dir}/BUILD_WITH_GEO_LIBRARIES"
-  compile 'geos' '' "${env_dir}"
-  if [[ $STACK == "heroku-20" ]]; then
-    assertCaptured " !     The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality is not supported on Heroku-20."
-  else
-    assertCaptured " !     The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated."
-  fi
-  # This should assertCapturedError on Heroku-20, but the test doesn't actually
-  # install anything that uses GEOS so succeeds (see W-8145375)
-  assertCapturedSuccess
+  compile 'gdal' '' "${env_dir}"
+  assertCaptured " !     The Python buildpack's BUILD_WITH_GEO_LIBRARIES functonality is no longer supported"
+  assertCapturedError
+}
+
+testGDALWarning() {
+  compile 'gdal'
+  assertCaptured " !     Hello! Package installation failed since the GDAL library was not found."
+  assertCapturedError
 }
 
 testNLTK() {
@@ -74,6 +74,12 @@ testPylibmc() {
   assertCapturedSuccess
 }
 
+testMercurial() {
+  compile "requirements-mercurial"
+  assertCaptured "Cloning hg"
+  assertCapturedSuccess
+}
+
 pushd $(dirname 0) >/dev/null
 popd >/dev/null
 

test/run-features

@@ -80,10 +80,6 @@ testPipenvPythonVersion2_7() {
 }
 
 testPipenvPythonFullVersion() {
-  # Python 3.7+ requires newer libssl than is present on Cedar-14.
-  if [[ "${STACK}" = "cedar-14" ]]; then
-    return
-  fi
   compile "pipenv-full-version"
   assertCaptured "3.7.8"
   # Can't use `assertCapturedSuccess` since stderr contains:
@@ -116,6 +112,7 @@ testHooks() {
   local expected_env_vars=(
     _
     BIN_DIR
+    BPLOG_PREFIX
     BUILD_DIR
     BUILDPACK_LOG_FILE
     CACHE_DIR
@@ -134,12 +131,11 @@ testHooks() {
     PROFILE_PATH
     PWD
     PYTHONUNBUFFERED
-    S3_BASE_URL
     SHLVL
     SOME_APP_CONFIG_VAR
     STACK
   )
-  if [[ "${STACK}" == "cedar-14" || "${STACK}" == "heroku-16" ]]; then
+  if [[ "${STACK}" == "heroku-16" ]]; then
     # Remove "OLDPWD" from expected_env_vars since for bash <4.4 it's not exported to subshells:
     # https://github.com/heroku/heroku-buildpack-python/pull/1011#issuecomment-665117835
     read -ra expected_env_vars <<< "${expected_env_vars[@]/OLDPWD/}"

test/run-versions

@@ -112,10 +112,6 @@ testPython3_6_warn() {
 }
 
 testPython3_7() {
-  # Python 3.7+ requires newer libssl than is present on Cedar-14.
-  if [[ "${STACK}" = "cedar-14" ]]; then
-    return
-  fi
   compile "python3_7"
   assertCaptured "Installing ${LATEST_37}"
   assertNotCaptured "security update"
@@ -125,10 +121,6 @@ testPython3_7() {
 }
 
 testPython3_7_warn() {
-  # Python 3.7+ requires newer libssl than is present on Cedar-14.
-  if [[ "${STACK}" = "cedar-14" ]]; then
-    return
-  fi
   compile "python3_7_warn"
   assertCaptured "Installing python-3.7.8"
   assertCaptured "security update!"
@@ -137,10 +129,6 @@ testPython3_7_warn() {
 }
 
 testPython3_8() {
-  # Python 3.7+ requires newer libssl than is present on Cedar-14.
-  if [[ "${STACK}" = "cedar-14" ]]; then
-    return
-  fi
   compile "python3_8"
   assertCaptured "Installing ${LATEST_38}"
   assertNotCaptured "security update"
@@ -150,10 +138,6 @@ testPython3_8() {
 }
 
 testPython3_8_warn() {
-  # Python 3.7+ requires newer libssl than is present on Cedar-14.
-  if [[ "${STACK}" = "cedar-14" ]]; then
-    return
-  fi
   compile "python3_8_warn"
   assertCaptured "Installing python-3.8.5"
   assertCaptured "security update!"
@@ -162,10 +146,6 @@ testPython3_8_warn() {
 }
 
 testPython3_9() {
-  # Cedar-14 is EOL, so we're not building new major Python versions for it.
-  if [[ "${STACK}" = "cedar-14" ]]; then
-    return
-  fi
   compile "python3_9"
   assertCaptured "Installing ${LATEST_39}"
   assertNotCaptured "security update"
@@ -175,10 +155,6 @@ testPython3_9() {
 }
 
 testPython3_9_warn() {
-  # Cedar-14 is EOL, so we're not building new major Python versions for it.
-  if [[ "${STACK}" = "cedar-14" ]]; then
-    return
-  fi
   # Can't test the version warning until there is at least one old version of Python 3.9.
   if [[ "${LATEST_39}" = "python-3.9.0" ]]; then
     return

vendor/buildpack-stdlib_v8.sh

@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+
+# From:
+# https://raw.githubusercontent.com/heroku/buildpack-stdlib/v8/stdlib.sh
+
+# Buildpack defaults
+# ---------------
+
+export BUILDPACK_LOG_FILE="${BUILDPACK_LOG_FILE:-/dev/null}"
+
+# Standard Output
+# ---------------
+
+# Buildpack Steps.
+puts_step() {
+  if [[ "$*" == "-" ]]; then
+    read -r output
+  else
+    output=$*
+  fi
+  echo -e "\\e[1m\\e[36m=== $output\\e[0m"
+  unset output
+}
+
+# Buildpack Error.
+puts_error() {
+  if [[ "$*" == "-" ]]; then
+    read -r output
+  else
+    output=$*
+  fi
+  echo -e "\\e[1m\\e[31m=!= $output\\e[0m"
+}
+
+# Buildpack Warning.
+puts_warn() {
+  if [[ "$*" == "-" ]]; then
+    read -r output
+  else
+    output=$*
+  fi
+  echo -e "\\e[1m\\e[33m=!= $output\\e[0m"
+}
+
+# Is verbose set?
+is_verbose() {
+  if [[ -n $BUILDPACK_VERBOSE ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# Buildpack Verbose.
+puts_verbose() {
+  if is_verbose; then
+    if [[ "$*" == "-" ]]; then
+      read -r output
+    else
+      output=$*
+    fi
+    echo "$output"
+    unset output
+  fi
+}
+
+# Buildpack Utilities
+# -------------------
+
+# Usage: $ set-env key value
+# NOTICE: Expects PROFILE_PATH & EXPORT_PATH to be set!
+set_env() {
+  # TODO: automatically create profile path directory if it doesn't exist.
+  echo "export $1=$2" >> "$PROFILE_PATH"
+  echo "export $1=$2" >> "$EXPORT_PATH"
+}
+
+# Usage: $ set-default-env key value
+# NOTICE: Expects PROFILE_PATH & EXPORT_PATH to be set!
+set_default_env() {
+  echo "export $1=\${$1:-$2}" >> "$PROFILE_PATH"
+  echo "export $1=\${$1:-$2}" >> "$EXPORT_PATH"
+}
+
+# Usage: $ un-set-env key
+# NOTICE: Expects PROFILE_PATH to be set!
+un_set_env() {
+  echo "unset $1" >> "$PROFILE_PATH"
+}
+
+# Usage: $ _env-blacklist pattern
+# Outputs a regex of default blacklist env vars.
+_env_blacklist() {
+  local regex=${1:-''}
+  if [ -n "$regex" ]; then
+    regex="|$regex"
+  fi
+  echo "^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH$regex)$"
+}
+
+# Usage: $ export-env ENV_DIR WHITELIST BLACKLIST
+# Exports the environment variables defined in the given directory.
+export_env() {
+  local env_dir=${1:-$ENV_DIR}
+  local whitelist=${2:-''}
+  local blacklist
+  blacklist="$(_env_blacklist "$3")"
+  if [ -d "$env_dir" ]; then
+    # Environment variable names won't contain characters affected by:
+    # shellcheck disable=SC2045
+    for e in $(ls "$env_dir"); do
+      echo "$e" | grep -E "$whitelist" | grep -qvE "$blacklist" &&
+      export "$e=$(cat "$env_dir/$e")"
+      :
+    done
+  fi
+}
+
+# Usage: $ sub-env command
+# Runs a subshell of specified command with user-provided config.
+# NOTICE: Expects ENV_DIR to be set. WHITELIST & BLACKLIST are optional.
+# Examples:
+#    WHITELIST=${2:-''}
+#    BLACKLIST=${3:-'^(GIT_DIR|PYTHONHOME|LD_LIBRARY_PATH|LIBRARY_PATH|PATH)$'}
+sub_env() {
+  (
+    # TODO: Fix https://github.com/heroku/buildpack-stdlib/issues/37
+    # shellcheck disable=SC2153
+    export_env "$ENV_DIR" "$WHITELIST" "$BLACKLIST"
+
+    "$@"
+  )
+}
+
+# Logging
+# -------
+
+# Notice: These functions expect BPLOG_PREFIX and BUILDPACK_LOG_FILE to be defined (BUILDPACK_LOG_FILE can point to /dev/null if not provided by the buildpack).
+# Example: BUILDPACK_LOG_FILE=${BUILDPACK_LOG_FILE:-/dev/null}; BPLOG_PREFIX="buildpack.go"
+
+# Returns now, in milleseconds. Useful for logging.
+# Example: $ let start=$(nowms); sleep 30; mtime "glide.install.time" "${start}"
+nowms() {
+  date +%s%3N
+}
+
+# Log arbitrary data to the logfile (e.g. a packaging file).
+# Usage: $ bplog "$(<${vendorJSON})
+bplog() {
+  echo -n "${@}" | awk 'BEGIN {printf "msg=\""; f="%s"} {gsub(/"/, "\\\"", $0); printf f, $0} {if (NR == 1) f="\\n%s" } END { print "\"" }' >> "${BUILDPACK_LOG_FILE}"
+}
+
+# Measures time elapsed for a specific build step.
+# Usage: $ let start=$(nowms); mtime "glide.install.time" "${start}"
+# https://github.com/heroku/engineering-docs/blob/master/guides/logs-as-data.md#distributions-measure
+mtime() {
+  local key="${BPLOG_PREFIX}.${1}"
+  local start="${2}"
+  local end="${3:-$(nowms)}"
+  echo "${key} ${start} ${end}" | awk '{ printf "measure#%s=%.3f\n", $1, ($3 - $2)/1000 }' >> "${BUILDPACK_LOG_FILE}"
+}
+
+# Logs a count for a specific built step.
+# Usage: $ mcount "tool.govendor"
+# https://github.com/heroku/engineering-docs/blob/master/guides/logs-as-data.md#counting-count
+mcount() {
+  local k="${BPLOG_PREFIX}.${1}"
+  local v="${2:-1}"
+  echo "count#${k}=${v}" >> "${BUILDPACK_LOG_FILE}"
+}
+
+# Logs a measure for a specific build step.
+# Usage: $ mmeasure "tool.installed_dependencies" 42
+# https://github.com/heroku/engineering-docs/blob/master/guides/logs-as-data.md#distributions-measure
+mmeasure() {
+  local k="${BPLOG_PREFIX}.${1}"
+  local v="${2}"
+  echo "measure#${k}=${v}" >> "${BUILDPACK_LOG_FILE}"
+}
+
+# Logs a unuique measurement build step.
+# Usage: $ munique "versions.count" 2.7.13
+# https://github.com/heroku/engineering-docs/blob/master/guides/logs-as-data.md#uniques-unique
+munique() {
+  local k="${BPLOG_PREFIX}.${1}"
+  local v="${2}"
+  echo "unique#${k}=${v}" >> "${BUILDPACK_LOG_FILE}"
+}
+
+# Measures when an exit path to the buildpack is reached, given a name, then exits 1.
+# Usage: $ mcount-exi "binExists"
+mcount_exit() {
+  mcount "error.${1}"
+  exit 1
+}