Skip to content
Snippets Groups Projects
Commit 7b26f0df authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files

set -e


Signed-off-by: default avatarKenneth Reitz <me@kennethreitz.org>
parent 96df073b
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# export PIPENV_FORCE_COLOR=1 # export PIPENV_FORCE_COLOR=1
# shellcheck source=bin/utils # shellcheck source=bin/utils
source $BIN_DIR/utils source $BIN_DIR/utils
set -e
if [[ -f Pipfile.lock ]]; then if [[ -f Pipfile.lock ]]; then
if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then if [[ -f .heroku/python/Pipfile.lock.sha256 ]]; then
...@@ -15,7 +15,7 @@ if [[ -f Pipfile.lock ]]; then ...@@ -15,7 +15,7 @@ if [[ -f Pipfile.lock ]]; then
echo "" echo ""
echo " $ heroku config:set PIPENV_ALWAYS_INSTALL=1" | indent echo " $ heroku config:set PIPENV_ALWAYS_INSTALL=1" | indent
SKIP_PIPENV_INSTALL=1 export SKIP_PIPENV_INSTALL=1
fi fi
fi fi
fi fi
...@@ -27,7 +27,6 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then ...@@ -27,7 +27,6 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
# Pipenv support (Generate requriements.txt with pipenv). # Pipenv support (Generate requriements.txt with pipenv).
if [[ -f Pipfile ]]; then if [[ -f Pipfile ]]; then
if [[ ! -f requirements.txt ]]; then if [[ ! -f requirements.txt ]]; then
puts-step "Installing requirements with latest Pipenv…"
# Measure that we're using Pipenv. # Measure that we're using Pipenv.
mcount "tool.pipenv" mcount "tool.pipenv"
...@@ -43,6 +42,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then ...@@ -43,6 +42,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
# Install the dependencies. # Install the dependencies.
if [[ ! -f Pipfile.lock ]]; then if [[ ! -f Pipfile.lock ]]; then
puts-step "Installing dependencies with latest Pipenv…"
/app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
else else
pipenv-to-pip Pipfile.lock > requirements.txt pipenv-to-pip Pipfile.lock > requirements.txt
...@@ -50,6 +50,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then ...@@ -50,6 +50,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
cp requirements.txt .heroku/python/requirements-declared.txt cp requirements.txt .heroku/python/requirements-declared.txt
openssl dgst -sha256 Pipfile.lock > .heroku/python/Pipfile.lock.sha256 openssl dgst -sha256 Pipfile.lock > .heroku/python/Pipfile.lock.sha256
puts-step "Installing dependencies with latest Pipenv…"
/app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment