cleanups

bin/steps/pip-install

@@ -1,5 +1,5 @@
 # Install dependencies with Pip.
-puts-cmd "pip install -r requirements.txt"
+puts-step "Installing dependencies with pip"
 
 set +e
 # delete any existing egg links, to uninstall exisisting installations.

bin/steps/pipenv

@@ -2,9 +2,11 @@
 
 if [[ -f Pipfile ]]; then
     if [[ ! -f requirements.txt ]]; then
-        puts-step "Generating 'requirements.txt' with pipenv"
 
-        /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
+        puts-step "Installing pipenv"
+        /app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pipenv.py &> /dev/null
+
+        puts-step "Generating 'requirements.txt' with pipenv"
         /app/.heroku/python/bin/pipenv lock --requirements > requirements.txt 2> /dev/null
 
         pipstrip requirements.txt

bin/steps/pipenv-python-version

@@ -4,19 +4,18 @@ if [[ -f $BUILD_DIR/Pipfile ]]; then
 
     if [[ ! -f $BUILD_DIR/runtime.txt ]]; then
         if [[ ! -f Pipfile.lock ]]; then
-            puts-step "Pipfile.lock not found, creating..."
-            /app/.heroku/python/bin/pipenv lock 2> /dev/null
-        fi
+            puts-warn "Pipfile.lock not found!"
+        else
+            set +e
+            PYTHON=$(cat $BUILD_DIR/Pipfile.lock | jq '._meta.requires.python_version' -r) 2>&1 /dev/null
+            set -e
 
-        set +e
-        PYTHON=$(cat $BUILD_DIR/Pipfile.lock | jq '._meta.requires.python_version' -r)
-        set -e
-
-        if [ "$PYTHON" = 2.7 ]; then
-            echo "python-2.7.13" > $BUILD_DIR/runtime.txt
-        fi
-        if [ "$PYTHON" = 3.6 ]; then
-            echo "python-3.6.0" > $BUILD_DIR/runtime.txt
+            if [ "$PYTHON" = 2.7 ]; then
+                echo "python-2.7.13" > $BUILD_DIR/runtime.txt
+            fi
+            if [ "$PYTHON" = 3.6 ]; then
+                echo "python-3.6.0" > $BUILD_DIR/runtime.txt
+            fi
         fi
     fi
 fi

bin/steps/python

@@ -51,7 +51,7 @@ if [ "$FRESH_PYTHON" ] || pip list -o --format=legacy --disable-pip-version-chec
   TMPTARDIR=$(mktemp -d)
   trap "rm -rf $TMPTARDIR" RETURN
 
-  puts-step "Bootstrapping pip"
+  puts-step "Installing pip"
   /app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py | indent
   /app/.heroku/python/bin/pip install setuptools --upgrade &> /dev/null