From ba55465a2b3daa7c83d46e25cb2422215a4c4788 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 2 Dec 2019 15:16:31 -0500 Subject: [PATCH 1/3] Version bump sqlite --- CHANGELOG.md | 1 + bin/steps/sqlite3 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2132849..0926b54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Update Python3 and Python2 base formula - Update Python formulas 3.6.x, 3.7.x, 3.5.x, and 2.7.17-2.7.9 - Test staged binaries on Travis +- Bug fix: Sqlite3 version bump -------------------------------------------------------------------------------- diff --git a/bin/steps/sqlite3 b/bin/steps/sqlite3 index 3faae6e..da63d9c 100755 --- a/bin/steps/sqlite3 +++ b/bin/steps/sqlite3 @@ -7,9 +7,9 @@ sqlite3_version() { if [ "$STACK" = "cedar-14" ]; then SQLITE3_VERSION="3.8.2-1ubuntu2.2" elif [ "$STACK" = "heroku-16" ]; then - SQLITE3_VERSION="3.11.0-1ubuntu1.2" + SQLITE3_VERSION="3.11.0-1ubuntu1.3" else - SQLITE3_VERSION=${SQLITE3_VERSION:-$(dpkg -s libsqlite3-0 | grep Version | sed 's/Version: //')} + SQLITE3_VERSION="3.22.0-1ubuntu0.2" fi export SQLITE3_VERSION From d166ee88d7d7ecb793e42506d858e6e771684045 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 2 Dec 2019 15:22:03 -0500 Subject: [PATCH 2/3] add tracking for sqlite install success or failure --- bin/steps/sqlite3 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/steps/sqlite3 b/bin/steps/sqlite3 index da63d9c..8a91e91 100755 --- a/bin/steps/sqlite3 +++ b/bin/steps/sqlite3 @@ -83,7 +83,14 @@ buildpack_sqlite3_install() { # only install if the sqlite3 version has changed if [ "$INSTALLED_SQLITE3_VERSION" != "$SQLITE3_VERSION" ]; then puts-step "Installing SQLite3" - sqlite3_install "$BUILD_DIR/.heroku/python" "$SQLITE3_VERSION" + + if sqlite3_install "$BUILD_DIR/.heroku/python" "$SQLITE3_VERSION" ; then + echo "Sqlite3 successfully installed." + mcount "success.python.sqlite3" + else + echo "Sqlite3 failed to install." + mcount "failure.python.sqlite3" + fi # save version installed mkdir -p "$CACHE_DIR/.heroku/" From 475af5a1f8b9e67d26a97951f53ec7a6fa33212e Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 2 Dec 2019 15:57:05 -0500 Subject: [PATCH 3/3] test that sqlite installs properly --- test/run-deps | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/run-deps b/test/run-deps index bd03fa7..29d7f8f 100755 --- a/test/run-deps +++ b/test/run-deps @@ -46,6 +46,13 @@ testPysqlite() { assertCapturedSuccess } +testSqliteInstall() { + compile "pythonDefault" + assertCaptured "Sqlite3 successfully installed." + assertNotCaptured "Sqlite3 failed to install." + assertCapturedSuccess +} + testCffi() { compile "cffi" assertCaptured "cffi"