From 34508bfc3513f2b2dc0f8adb97cb0b61a155a4a4 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 17 Oct 2019 16:44:58 -0700
Subject: [PATCH 1/2] Temporarily Revert "Fix pipenv install twice in CI"

This reverts commit c410fd36a66e74d9b159b98c0dc8d6cc616e5c01.

This is a temporary revert in order to release new python binaries first
and then roll this change out in a separate release. This keeps releases
smaller and better organized in case we need to roll back.
---
 bin/steps/pipenv | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index c799c7d..a84d549 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -60,16 +60,10 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
         # avoid this eager behavior.
         /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…"
-            /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
-
         # Install the dependencies.
-        elif [[ ! -f Pipfile.lock ]]; then
+        if [[ ! -f Pipfile.lock ]]; then
             puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
             /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"
@@ -79,6 +73,12 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
             puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
             /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
         fi
+
+        # Install the test dependencies, for CI.
+        if [ "$INSTALL_TEST" ]; then
+            puts-step "Installing test dependencies…"
+            /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
+        fi
     fi
 else
     export SKIP_PIP_INSTALL=1

From ec56074c18647e912dcd614dfbab503882e46bff Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 17 Oct 2019 16:49:31 -0700
Subject: [PATCH 2/2] CHANGELOG

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2265d6..20228cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,6 @@
 - Sqlite3 Update:
   - Add Tests
   - Test for Pysqlite
-- Bug fix: pipenv no longer installs twice on CI
 - Add support for staging binary testing
 --------------------------------------------------------------------------------