Merge remote-tracking branch 'origin/master'

.travis.yml

 language: bash
-# sudo: required
-addons:
-  apt:
-    sources:
-    - debian-sid    # Grab shellcheck from the Debian repo (o_O)
-    packages:
-    - shellcheck
-services:
-  - docker
-# install: docker pull heroku/cedar:14
+dist: trusty
 jobs:
   include:
     - stage: "Bash linting (shellcheck)"
+      sudo: false
+      addons:
+        apt:
+          sources:
+          - debian-sid    # Grab shellcheck from the Debian repo (o_O)
+          packages:
+          - shellcheck
       script: make check
 
-    - stage: "Heroku-16 Stack Tests"
+    - stage: "Stack Tests"
+      services: docker
+      env: STACK=heroku-16
       script: ./tests.sh
-      env:
-        - STACK=heroku-16
 
-    - stage: "Cedar-14 Stack Tests"
+    - stage: "Stack Tests"
+      services: docker
+      env: STACK=cedar-14
       script: ./tests.sh
-      env:
-        - STACK=cedar-14
\ No newline at end of file

bin/steps/pip-install

@@ -6,7 +6,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     puts-step "Installing requirements with pip"
 
     set +e
-    /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
+    sub-env /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
     PIP_STATUS="${PIPESTATUS[0]}"
     set -e
 
@@ -22,4 +22,4 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
 
     echo
-fi
\ No newline at end of file
+fi

bin/steps/pipenv

@@ -18,4 +18,4 @@ if [[ -f Pipfile ]]; then
         /app/.heroku/python/bin/pip freeze > requirements.txt
 
     fi
-fi
\ No newline at end of file
+fi

bin/utils

@@ -72,7 +72,7 @@ sub-env() {
       done
     fi
 
-    $1
+    "$@"
 
   )
 }

vendor/WEB_CONCURRENCY.sh

@@ -5,25 +5,25 @@ case $(ulimit -u) in
 # Standard-1X (+Free, +Hobby) Dyno
 256)
   export DYNO_RAM=512
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-02}
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-2}
   ;;
 
 # Standard-2X Dyno
 512)
   export DYNO_RAM=1024
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-04}
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4}
   ;;
 
 # Performance-M Dyno
 16384)
   export DYNO_RAM=2560
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-08}
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-8}
   ;;
 
 # Performance-L Dyno
 32768)
-  export DYNO_RAM=6656
-  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-011}
+  export DYNO_RAM=14336
+  export WEB_CONCURRENCY=${WEB_CONCURRENCY:-11}
   ;;
 
-esac
\ No newline at end of file
+esac