From 24e0858902f17e30182534549836366885fa5682 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Tue, 8 Oct 2019 14:08:04 -0700
Subject: [PATCH 1/7] add sqlite tests

---
 test/run-versions | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/run-versions b/test/run-versions
index 6c6617c..30aa46e 100755
--- a/test/run-versions
+++ b/test/run-versions
@@ -4,11 +4,14 @@
 # shellcheck source=bin/default_pythons
 source "bin/default_pythons"
 
+assertCaptured "Installing SQLite3"
+
 testPythonDefault() {
   updateVersion "pythonDefault" $DEFAULT_PYTHON_VERSION
   compile "pythonDefault"
   assertCaptured $DEFAULT_PYTHON_VERSION
   assertNotCaptured "security update"
+  assertCaptured "Installing SQLite3"
   assertCapturedSuccess
 }
 
@@ -18,6 +21,7 @@ testPython2() {
     compile "python2"
     assertCaptured $LATEST_27
     assertNotCaptured "security update"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
 }
 
@@ -25,6 +29,7 @@ testPython2_warn() {
     compile "python2_warn"
     assertCaptured "python-2.7.15"
     assertCaptured "security update!"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
 }
 
@@ -40,6 +45,7 @@ testPython3_4() {
     compile "python3_4"
     assertCaptured $LATEST_34
     assertNotCaptured "security update"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }
@@ -49,6 +55,7 @@ testPython3_4_warn() {
   if [[ $STACK = "cedar-14" ]]; then
     assertCaptured "python-3.4.0"
     assertCaptured "security update!"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   else
     assertCapturedError
@@ -67,6 +74,7 @@ testPython3_5() {
     compile "python3_5"
     assertCaptured $LATEST_35
     assertNotCaptured "security update"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }
@@ -93,6 +101,7 @@ testPython3_6() {
   compile "python3_6"
   assertCaptured $LATEST_36
   assertNotCaptured "security update"
+  assertCaptured "Installing SQLite3"
   assertCapturedSuccess
 }
 
@@ -100,6 +109,7 @@ testPython3_6_warn() {
   compile "python3_6_warn"
   assertCaptured "python-3.6.7"
   assertCaptured "security update!"
+  assertCaptured "Installing SQLite3"
   assertCapturedSuccess
 }
 
@@ -117,6 +127,7 @@ testPython3_7() {
   else
     assertNotCaptured "security update"
     assertCaptured $LATEST_37
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }
@@ -128,6 +139,7 @@ testPython3_7_warn() {
   else
     assertCaptured "python-3.7.1"
     assertCaptured "security update!"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }

From d0fd9ad58aaac53ae440aae64be042b306ae5e9a Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Tue, 8 Oct 2019 14:10:51 -0700
Subject: [PATCH 2/7] Changelog update

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfb9164..9e761a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 # Master
 
+- Sqlite3 Update:
+  - Add Tests
 - Refactor: use variable rather than hardcoded /app
 - Bug fix: pipenv no longer installs twice on CI
 

From 0c78978e9048087ac9e04a146f670b337c7c8c13 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Tue, 8 Oct 2019 14:57:15 -0700
Subject: [PATCH 3/7] don't check python 3.4

---
 test/run-versions | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/run-versions b/test/run-versions
index 30aa46e..77bba54 100755
--- a/test/run-versions
+++ b/test/run-versions
@@ -45,7 +45,6 @@ testPython3_4() {
     compile "python3_4"
     assertCaptured $LATEST_34
     assertNotCaptured "security update"
-    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }

From 00d44d2e34c662fe5c3b012ed94cd8e28aa2cfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Z=C3=BClke?= <dzuelke@gmail.com>
Date: Wed, 9 Oct 2019 15:28:31 +0200
Subject: [PATCH 4/7] Revert "Refactor: $BUILD_DIR"

---
 CHANGELOG.md                    |  1 -
 bin/compile                     | 32 ++++++++++++++++----------------
 bin/steps/collectstatic         |  3 ++-
 bin/steps/gdal                  |  2 +-
 bin/steps/geo-libs              |  2 +-
 bin/steps/mercurial             |  2 +-
 bin/steps/pip-install           |  7 +++----
 bin/steps/pip-uninstall         |  2 +-
 bin/steps/pipenv                | 11 ++++++-----
 bin/steps/pipenv-python-version |  8 ++++----
 bin/steps/python                |  8 ++++----
 builds/libraries/vendor/gdal    |  2 +-
 builds/libraries/vendor/geos    |  2 +-
 builds/libraries/vendor/libffi  |  2 +-
 builds/libraries/vendor/proj    |  2 +-
 15 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfb9164..17ce9c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 # Master
 
-- Refactor: use variable rather than hardcoded /app
 - Bug fix: pipenv no longer installs twice on CI
 
 --------------------------------------------------------------------------------
diff --git a/bin/compile b/bin/compile
index fa5deed..dfc81d1 100755
--- a/bin/compile
+++ b/bin/compile
@@ -90,7 +90,6 @@ export PATH=$PATH:$ROOT_DIR/vendor/:$ROOT_DIR/vendor/pip-pop
 unset GIT_DIR PYTHONHOME PYTHONPATH
 unset RECEIVE_DATA RUN_KEY BUILD_INFO DEPLOY LOG_TOKEN
 unset CYTOKINE_LOG_FILE GEM_PATH
-export PYTHONPATH="$BUILD_DIR"
 
 # Import the utils script, which contains helper functions used throughout the buildpack.
 # shellcheck source=bin/utils
@@ -105,7 +104,7 @@ source "$BIN_DIR/warnings"
 # to `/app`.
 # Symlinks are required, since Python is not a portable installation.
 # More on this topic later.
-mkdir -p "BUILD_DIR/.heroku"
+mkdir -p /app/.heroku
 
 # This buildpack programatically generates (or simply copies) a number of files for
 # buildpack machinery: an export script, and a number of `.profile.d` scripts. This
@@ -123,7 +122,7 @@ export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH EXPORT_PATH
 # Notes on each variable included.
 
 # PATH is relatively obvious, we need to be able to execute 'python'.
-export PATH="$BUILD_DIR/.heroku/python/bin:$BUILD_DIR/.heroku/vendor/bin:$PATH"
+export PATH=/app/.heroku/python/bin:/app/.heroku/vendor/bin:$PATH
 # Tell Python to not buffer it's stdin/stdout.
 export PYTHONUNBUFFERED=1
 # Set the locale to a well-known and expected standard.
@@ -131,11 +130,11 @@ 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)
 # and pip to automatically include these paths when building binaries.
-export C_INCLUDE_PATH="$BUILD_DIR/.heroku/vendor/include:$BUILD_DIR/.heroku/python/include:$C_INCLUDE_PATH"
-export CPLUS_INCLUDE_PATH="$BUILD_DIR/.heroku/vendor/include:$BUILD_DIR/.heroku/python/include:$CPLUS_INCLUDE_PATH"
-export LIBRARY_PATH="$BUILD_DIR/.heroku/vendor/lib:$BUILD_DIR/.heroku/python/lib:$LIBRARY_PATH"
-export LD_LIBRARY_PATH="$BUILD_DIR/.heroku/vendor/lib:$BUILD_DIR/.heroku/python/lib:$LD_LIBRARY_PATH"
-export PKG_CONFIG_PATH="$BUILD_DIR/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH"
+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
+export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH
+export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH
 
 # The Application Code
 # --------------------
@@ -212,16 +211,15 @@ fi
 # Create the directory for .profile.d, if it doesn't exist.
 mkdir -p "$(dirname "$PROFILE_PATH")"
 # Create the directory for editable source code installation, if it doesn't exist.
-mkdir -p "$BUILD_DIR/.heroku/src"
+mkdir -p /app/.heroku/src
 
 # On Heroku CI, builds happen in `/app`. Otherwise, on the Heroku platform,
 # they occur in a temp directory. Beacuse Python is not portable, we must create
 # symlinks to emulate that we are operating in `/app` during the build process.
 # This is (hopefully obviously) because apps end up running from `/app` in production.
-if [[ "$BUILD_DIR" != '/app' ]]; then
+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
-    mkdir -p /app/.heroku
     ln -nsf "$BUILD_DIR/.heroku/python" /app/.heroku/python
     ln -nsf "$BUILD_DIR/.heroku/vendor" /app/.heroku/vendor
     # Note: .heroku/src is copied in later.
@@ -312,7 +310,8 @@ mtime "nltk.download.time" "${start}"
 # and copying it into the proper place (the logical place to do this was early, but it must be done here).
 # In CI, $BUILD_DIR is /app.
 if [[ ! "$BUILD_DIR" == "/app" ]]; then
-  ln -nsf "$BUILD_DIR/.heroku/src" /app/.heroku/src
+  rm -fr "$BUILD_DIR/.heroku/src"
+  deep-cp /app/.heroku/src "$BUILD_DIR/.heroku/src"
 fi
 
 
@@ -344,12 +343,13 @@ set_default_env PYTHONHASHSEED random
 # Tell Python to look for Python modules in the /app dir. Don't change this.
 set_default_env PYTHONPATH "\$HOME"
 
-# Python expects to be in "$BUILD_DIR," if at runtime, it is not, set
+# 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 != "$BUILD_DIR" ]]; then
-    ln -nsf "\$HOME/.heroku/python" "$BUILD_DIR/.heroku/python"
-    ln -nsf "\$HOME/.heroku/vendor" "$BUILD_DIR/.heroku/vendor"
+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
 
diff --git a/bin/steps/collectstatic b/bin/steps/collectstatic
index e44318a..755b927 100755
--- a/bin/steps/collectstatic
+++ b/bin/steps/collectstatic
@@ -30,11 +30,12 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
     puts-step "$ python $MANAGE_FILE collectstatic --noinput"
 
     # Run collectstatic, cleanup some of the noisy output.
-    PYTHONPATH=${PYTHONPATH:-$BUILD_DIR}
+    PYTHONPATH=${PYTHONPATH:-.}
     export PYTHONPATH
 
     # Create a temporary file for collecting the collectstaic logs.
     COLLECTSTATIC_LOG=$(mktemp)
+
     python "$MANAGE_FILE" collectstatic --noinput --traceback 2>&1 | tee "$COLLECTSTATIC_LOG" | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
     COLLECTSTATIC_STATUS="${PIPESTATUS[0]}"
 
diff --git a/bin/steps/gdal b/bin/steps/gdal
index 9c76a0c..03cf81f 100755
--- a/bin/steps/gdal
+++ b/bin/steps/gdal
@@ -12,7 +12,7 @@
 # The location of the pre-compiled cryptography binary.
 VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz"
 
-PKG_CONFIG_PATH="$BUILD_DIR/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Syntax sugar.
 # shellcheck source=bin/utils
diff --git a/bin/steps/geo-libs b/bin/steps/geo-libs
index 54a18e8..ae47dd2 100755
--- a/bin/steps/geo-libs
+++ b/bin/steps/geo-libs
@@ -14,7 +14,7 @@ VENDORED_GDAL="${VENDOR_URL}/libraries/vendor/gdal.tar.gz"
 VENDORED_GEOS="${VENDOR_URL}/libraries/vendor/geos.tar.gz"
 VENDORED_PROJ="${VENDOR_URL}/libraries/vendor/proj.tar.gz"
 
-PKG_CONFIG_PATH="$BUILD_DIR/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
+PKG_CONFIG_PATH="/app/.heroku/vendor/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Syntax sugar.
 # shellcheck source=bin/utils
diff --git a/bin/steps/mercurial b/bin/steps/mercurial
index 482c064..c36cb9a 100755
--- a/bin/steps/mercurial
+++ b/bin/steps/mercurial
@@ -3,7 +3,7 @@
 # Install Mercurial if it appears to be required.
 if [[ -f "requirements.txt" ]]; then
 	if (grep -Fiq "hg+" requirements.txt) then
-		"$BUILD_DIR/.heroku/python/bin/pip" install  mercurial | cleanup | indent
+		/app/.heroku/python/bin/pip install  mercurial | cleanup | indent
 		mcount "steps.mercurial"
 	fi
 fi
diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index 23ff98b..b950fef 100755
--- a/bin/steps/pip-install
+++ b/bin/steps/pip-install
@@ -41,8 +41,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     if [ ! -f "$BUILD_DIR/.heroku/python/bin/pip" ]; then
         exit 1
     fi
-
-    "$BUILD_DIR/.heroku/python/bin/pip" install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src="$BUILD_DIR/.heroku/src" --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
+    /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
 
@@ -55,7 +54,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
 
     # Smart Requirements handling
     cp requirements.txt .heroku/python/requirements-declared.txt
-    "$BUILD_DIR/.heroku/python/bin/pip" freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
+    /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
 
     echo
 
@@ -63,7 +62,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     if [ "$INSTALL_TEST" ]; then
         if [[ -f "$1/requirements-test.txt" ]]; then
             puts-step "Installing test dependencies…"
-            "$BUILD_DIR/.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
+            /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
diff --git a/bin/steps/pip-uninstall b/bin/steps/pip-uninstall
index 7368aa5..2e1ad8d 100755
--- a/bin/steps/pip-uninstall
+++ b/bin/steps/pip-uninstall
@@ -20,7 +20,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
 
     if [[ -s .heroku/python/requirements-stale.txt ]]; then
       puts-step "Uninstalling stale dependencies"
-      "$BUILD_DIR/.heroku/python/bin/pip" uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w --disable-pip-version-check | cleanup | indent
+      /app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w --disable-pip-version-check | cleanup | indent
     fi
   fi
 
diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index f0df80f..c799c7d 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -12,7 +12,7 @@ if [[ -f Pipfile.lock ]]; then
             # Measure that we're using Pipenv.
             mcount "tool.pipenv"
 
-            # Don't skip installation if there are git deps.
+            # Don't skip installation of there are git deps.
             if ! grep -q 'git' Pipfile.lock; then
                 echo "Skipping installation, as Pipfile.lock hasn't changed since last deploy." | indent
 
@@ -58,17 +58,18 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
         # Due to weird old pip behavior and pipenv behavior, pipenv upgrades pip
         # to latest if only --upgrade is specified. Specify upgrade strategy to
         # avoid this eager behavior.
-        "$BUILD_DIR/.heroku/python/bin/pip" install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null
+        /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null
 
         # Install the test dependencies, for CI.
         if [ "$INSTALL_TEST" ]; then
             puts-step "Installing test dependencies…"
-            "$BUILD_DIR/.heroku/python/bin/pipenv" install --dev --system --deploy 2>&1 | cleanup | indent
+            /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
 
         # Install the dependencies.
         elif [[ ! -f Pipfile.lock ]]; then
             puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
-            "$BUILD_DIR/.heroku/python/bin/pipenv" install --system --skip-lock 2>&1 | indent
+            /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"
@@ -76,7 +77,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
             openssl dgst -sha256 Pipfile.lock > .heroku/python/Pipfile.lock.sha256
 
             puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
-            "$BUILD_DIR/.heroku/python/bin/pipenv" install --system --deploy 2>&1 | indent
+            /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
         fi
     fi
 else
diff --git a/bin/steps/pipenv-python-version b/bin/steps/pipenv-python-version
index 0d7c4c9..dcdf3c2 100755
--- a/bin/steps/pipenv-python-version
+++ b/bin/steps/pipenv-python-version
@@ -2,13 +2,13 @@
 
 # Detect Python-version with Pipenv.
 
-if [[ -f "$BUILD_DIR/Pipfile" ]]; then
+if [[ -f $BUILD_DIR/Pipfile ]]; then
 
-    if [[ ! -f "$BUILD_DIR/runtime.txt" ]]; 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."
         fi
-        if [[ -f "$BUILD_DIR/Pipfile.lock" ]]; then
+        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
diff --git a/bin/steps/python b/bin/steps/python
index 7dc9455..2d00754 100755
--- a/bin/steps/python
+++ b/bin/steps/python
@@ -113,11 +113,11 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then
   puts-step "Installing pip"
 
   # Remove old installations.
-  rm -fr "$BUILD_DIR/.heroku/python/lib/python*/site-packages/pip-*"
-  rm -fr "$BUILD_DIR/.heroku/python/lib/python*/site-packages/setuptools-*"
+  rm -fr /app/.heroku/python/lib/python*/site-packages/pip-*
+  rm -fr /app/.heroku/python/lib/python*/site-packages/setuptools-*
 
-  "$BUILD_DIR/.heroku/python/bin/python" "$ROOT_DIR/get-pip.py" pip=="$PIP_UPDATE" &> /dev/null
-  "$BUILD_DIR/.heroku/python/bin/pip" install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null
+  /app/.heroku/python/bin/python "$ROOT_DIR/get-pip.py" pip=="$PIP_UPDATE" &> /dev/null
+  /app/.heroku/python/bin/pip install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null
 fi
 
 set -e
diff --git a/builds/libraries/vendor/gdal b/builds/libraries/vendor/gdal
index 7684a6e..7cb110e 100755
--- a/builds/libraries/vendor/gdal
+++ b/builds/libraries/vendor/gdal
@@ -4,7 +4,7 @@
 OUT_PREFIX=$1
 
 # Use new path, containing autoconf.
-export PATH="$BUILD_DIR/.heroku/python/bin/:$PATH"
+export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 
diff --git a/builds/libraries/vendor/geos b/builds/libraries/vendor/geos
index 0e95ff4..3c7bcab 100755
--- a/builds/libraries/vendor/geos
+++ b/builds/libraries/vendor/geos
@@ -4,7 +4,7 @@
 OUT_PREFIX=$1
 
 # Use new path, containing autoconf.
-export PATH="$BUILD_DIR.heroku/python/bin/:$PATH"
+export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 
diff --git a/builds/libraries/vendor/libffi b/builds/libraries/vendor/libffi
index 55e6e39..5955371 100755
--- a/builds/libraries/vendor/libffi
+++ b/builds/libraries/vendor/libffi
@@ -9,7 +9,7 @@ if [[ $S3_PREFIX == "heroku-16" ]]; then
 fi
 
 # Use new path, containing autoconf.
-export PATH="$BUILD_DIR/.heroku/python/bin/:$PATH"
+export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 
diff --git a/builds/libraries/vendor/proj b/builds/libraries/vendor/proj
index 7596263..7f11578 100755
--- a/builds/libraries/vendor/proj
+++ b/builds/libraries/vendor/proj
@@ -4,7 +4,7 @@
 OUT_PREFIX=$1
 
 # Use new path, containing autoconf.
-export PATH="$BUILD_DIR/.heroku/python/bin/:$PATH"
+export PATH="/app/.heroku/python/bin/:$PATH"
 hash -r
 
 

From 950572132ccbfe6e5ff217a94976b590e626cece Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Wed, 9 Oct 2019 13:57:06 -0700
Subject: [PATCH 5/7] remove test for sqlite on older versions of python 3.4

---
 test/run-versions | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/run-versions b/test/run-versions
index 77bba54..9e30b1c 100755
--- a/test/run-versions
+++ b/test/run-versions
@@ -54,7 +54,6 @@ testPython3_4_warn() {
   if [[ $STACK = "cedar-14" ]]; then
     assertCaptured "python-3.4.0"
     assertCaptured "security update!"
-    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   else
     assertCapturedError

From 4a4a6a1df0b2db42ec4dfffffae62088ef97b2e7 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 10 Oct 2019 13:05:45 -0700
Subject: [PATCH 6/7] add pysqlite test for python 2.7.16

---
 test/fixtures/pysqlite/requirements.txt | 1 +
 test/fixtures/pysqlite/runtime.txt      | 1 +
 test/run-deps                           | 6 ++++++
 3 files changed, 8 insertions(+)
 create mode 100644 test/fixtures/pysqlite/requirements.txt
 create mode 100644 test/fixtures/pysqlite/runtime.txt

diff --git a/test/fixtures/pysqlite/requirements.txt b/test/fixtures/pysqlite/requirements.txt
new file mode 100644
index 0000000..f94c50e
--- /dev/null
+++ b/test/fixtures/pysqlite/requirements.txt
@@ -0,0 +1 @@
+pysqlite
diff --git a/test/fixtures/pysqlite/runtime.txt b/test/fixtures/pysqlite/runtime.txt
new file mode 100644
index 0000000..d42956d
--- /dev/null
+++ b/test/fixtures/pysqlite/runtime.txt
@@ -0,0 +1 @@
+python-2.7.16
diff --git a/test/run-deps b/test/run-deps
index a02d9ca..bd03fa7 100755
--- a/test/run-deps
+++ b/test/run-deps
@@ -40,6 +40,12 @@ testPsycopg2() {
   assertCapturedSuccess
 }
 
+testPysqlite() {
+  compile "pysqlite"
+  assertCaptured "pysqlite"
+  assertCapturedSuccess
+}
+
 testCffi() {
   compile "cffi"
   assertCaptured "cffi"

From 91a0be91e1b1ae1bcaac36955770e096989d00a7 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 10 Oct 2019 13:08:27 -0700
Subject: [PATCH 7/7] Changelog Changelog Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17ce9c6..1a2ef96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 # Master
 
+- Test for Pysqlite install
 - Bug fix: pipenv no longer installs twice on CI
 
 --------------------------------------------------------------------------------