From 63810f29d3c1c0cc5a0a0fc802a49f4252e48069 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Fri, 10 Mar 2017 11:43:11 -0500
Subject: [PATCH] passing tests
---
bin/steps/pipenv | 4 ++--
bin/steps/python | 4 +++-
test/utils | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index 3ecdc238..a14b2b2d 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -4,8 +4,8 @@ if [[ -f Pipfile ]]; then
if [[ ! -f requirements.txt ]]; then
puts-step "Generating 'requirements.txt' with pipenv"
- pip install pipenv --upgrade &> /dev/null
- pipenv lock --requirements > requirements.txt 2> /dev/null
+ /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
+ /app/.heroku/python/bin/pipenv lock --requirements > requirements.txt 2> /dev/null
pipstrip requirements.txt
fi
diff --git a/bin/steps/python b/bin/steps/python
index dc9c53b4..b88631b4 100755
--- a/bin/steps/python
+++ b/bin/steps/python
@@ -46,7 +46,9 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
trap "rm -rf $TMPTARDIR" RETURN
puts-step "Bootstrapping pip"
- python $ROOT_DIR/vendor/get-pip.py
+ /app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py | indent
+ /app/.heroku/python/bin/pip install setuptools --upgrade &> /dev/null
+
fi
diff --git a/test/utils b/test/utils
index c46d2422..23cb6df4 100644
--- a/test/utils
+++ b/test/utils
@@ -150,6 +150,8 @@ _assertContains()
debug()
{
cat $STD_OUT
+ echo '^^^^^^'
+ cat $STD_ERR
}
assertContains()
--
GitLab