From bf378916af26c8ebb944e87955613fe165c20481 Mon Sep 17 00:00:00 2001
From: Ed Morley <edmorley@users.noreply.github.com>
Date: Thu, 10 Aug 2017 20:29:15 +0200
Subject: [PATCH 1/3] Speed up the multi-stage Travis run (#443)

Reduces the impact on Travis runtime caused by #438, by:
* Making the shellcheck job run on the container infra (`sudo: false`)
  which has faster boot times.
* Running the heroku-16 and cedar-14 stack tests in parallel, since
  previously they were separate stages (which are run in series by
  design).

Reduces Travis end-to-end time from ~10 minutes to ~6 minutes.
---
 .travis.yml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6c1b47..3ea83b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,23 @@
 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

From 325a3165e450728ed2dfc9dc097778e42371a18b Mon Sep 17 00:00:00 2001
From: Jeremy Morrell <morrell.jeremy@gmail.com>
Date: Thu, 10 Aug 2017 11:42:45 -0700
Subject: [PATCH 2/3] Remove leading zeros from `WEB_CONCURRENCY` (#446)

* Remove leading zeros from `WEB_CONCURRENCY`

* fix DYNO_RAM (from node buildpack)

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
---
 vendor/WEB_CONCURRENCY.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vendor/WEB_CONCURRENCY.sh b/vendor/WEB_CONCURRENCY.sh
index 69a562a..f1a23ee 100755
--- a/vendor/WEB_CONCURRENCY.sh
+++ b/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

From 0c26eae21406a5e9382beadae4c4f442e7f538c1 Mon Sep 17 00:00:00 2001
From: Samuel Spencer <theodore.therone@gmail.com>
Date: Sat, 12 Aug 2017 16:55:15 +1000
Subject: [PATCH 3/3] Allow environment variables during pip install, fixes
 #416 (#417)

* Allow environment variables during pip install, fixes #416

* shift sub-env command, fix typo

* bash check thingy fixed
---
 bin/steps/pip-install | 4 ++--
 bin/steps/pipenv      | 2 +-
 bin/utils             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index ee7e358..d0941f2 100755
--- a/bin/steps/pip-install
+++ b/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
diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index 23032ad..6ccd3ee 100644
--- a/bin/steps/pipenv
+++ b/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
diff --git a/bin/utils b/bin/utils
index 59273a7..4a06a46 100755
--- a/bin/utils
+++ b/bin/utils
@@ -72,7 +72,7 @@ sub-env() {
       done
     fi
 
-    $1
+    "$@"
 
   )
 }