From f9e54dc3f69c1a922657567d6a0efe2d00d47340 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Tue, 13 Mar 2018 22:02:29 -0400
Subject: [PATCH] don't skip Pipenv installation if there are git deps (#656)
---
bin/steps/pipenv | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index 7f9e3e55..a274211c 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -9,15 +9,18 @@ set -e
if [[ -f Pipfile.lock ]]; then
if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then
if [[ $(openssl dgst -sha256 Pipfile.lock) == $(cat .heroku/python/Pipfile.lock.sha256) ]]; then
- if [[ ! "$PIPENV_ALWAYS_INSTALL" ]]; then
+ # Measure that we're using Pipenv.
+ mcount "tool.pipenv"
+
+ # 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
- # echo "To disable this functionality, run the following command:"
- # echo ""
- # echo " $ heroku config:set PIPENV_ALWAYS_INSTALL=1" | indent
+
mcount "tool.pipenv"
export SKIP_PIPENV_INSTALL=1
export SKIP_PIP_INSTALL=1
fi
+
fi
fi
fi
--
GitLab