From ab89e49235a98cd9750b8bd5967fa91fc0dd923b Mon Sep 17 00:00:00 2001
From: Alexandre Paroissien
 <34052139+alexandre-paroissien@users.noreply.github.com>
Date: Tue, 24 Sep 2019 15:03:40 +0700
Subject: [PATCH 1/2] Fix pipenv install twice in CI

---
 bin/steps/pipenv | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index a84d549..c799c7d 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -60,10 +60,16 @@ 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.
-        if [[ ! -f Pipfile.lock ]]; then
+        elif [[ ! -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"
@@ -73,12 +79,6 @@ 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 9ab6a56cba9148de5fcc4c81585b7e92efb3aab9 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Tue, 22 Oct 2019 11:29:58 -0700
Subject: [PATCH 2/2] reapply bugfix in preparation for tomorrow's release

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2293998..912d64a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 # Master
 
+- Bugfix: Pipenv no longer installs twice in CI
 - Python 2.7.17 now available on Heroku 18 and 16.
 
 --------------------------------------------------------------------------------