From f1e1df2fa11bf67ff7f681b8a13f15fa4a342cca Mon Sep 17 00:00:00 2001
From: Ally Weir <aweir@twig-world.com>
Date: Mon, 21 May 2018 10:52:00 +0100
Subject: [PATCH 1/2] Bump pipenv version

---
 bin/steps/pipenv                       |  2 +-
 test/fixtures/pipenv-lock/Pipfile.lock | 34 +++++++++-----------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index 59aab27..6dec3a1 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -41,7 +41,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
             export PIP_EXTRA_INDEX_URL
         fi
 
-        export PIPENV_VERSION="11.8.2"
+        export PIPENV_VERSION="2018.5.18"
 
         # Install pipenv.
         /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade &> /dev/null
diff --git a/test/fixtures/pipenv-lock/Pipfile.lock b/test/fixtures/pipenv-lock/Pipfile.lock
index e2ff535..7ebe797 100644
--- a/test/fixtures/pipenv-lock/Pipfile.lock
+++ b/test/fixtures/pipenv-lock/Pipfile.lock
@@ -1,27 +1,14 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "397f2c55e3558ea57d292e3fc19b34e483770e5ec02cdedfb1f330680cd26635"
-        },
-        "host-environment-markers": {
-            "implementation_name": "cpython",
-            "implementation_version": "3.6.3",
-            "os_name": "posix",
-            "platform_machine": "x86_64",
-            "platform_python_implementation": "CPython",
-            "platform_release": "16.7.0",
-            "platform_system": "Darwin",
-            "platform_version": "Darwin Kernel Version 16.7.0: Thu Jun 15 17:36:27 PDT 2017; root:xnu-3789.70.16~2/RELEASE_X86_64",
-            "python_full_version": "3.6.3",
-            "python_version": "3.6",
-            "sys_platform": "darwin"
+            "sha256": "09ad9dcae1870ba083f43c5a05ed8943b23bd4c27e61a13ecf4e16d18500ad98"
         },
         "pipfile-spec": 6,
         "requires": {},
         "sources": [
             {
                 "name": "pypi",
-                "url": "https://pypi.python.org/simple",
+                "url": "https://pypi.org/simple",
                 "verify_ssl": true
             }
         ]
@@ -29,22 +16,23 @@
     "default": {
         "delegator.py": {
             "hashes": [
-                "sha256:2575c4adc923ad0b8fdaa433f862b2b7cf21982717fb23cc895fd8f249ea820c",
-                "sha256:495e11ada66648650171a6c9a188df4eb050b235abff8771f41ee8a064eb9ded"
+                "sha256:2d46966a7f484d271b09e2646eae1e9acadc4fdf2cb760c142f073e81c927d8d",
+                "sha256:58f3ea6fe36680e1d828e2e66e52844b826f186409dfee4436e42351b0e699fe"
             ],
-            "version": "==0.0.13"
+            "index": "pypi",
+            "version": "==0.1.0"
         },
         "pexpect": {
             "hashes": [
-                "sha256:f853b52afaf3b064d29854771e2db509ef80392509bde2dd7a6ecf2dfc3f0018",
-                "sha256:3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"
+                "sha256:9783f4644a3ef8528a6f20374eeb434431a650c797ca6d8df0d81e30fffdfa24",
+                "sha256:9f8eb3277716a01faafaba553d629d3d60a1a624c7cf45daa600d2148c30020c"
             ],
-            "version": "==4.2.1"
+            "version": "==4.5.0"
         },
         "ptyprocess": {
             "hashes": [
-                "sha256:e8c43b5eee76b2083a9badde89fd1bbce6c8942d1045146e100b7b5e014f4f1a",
-                "sha256:e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365"
+                "sha256:e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365",
+                "sha256:e8c43b5eee76b2083a9badde89fd1bbce6c8942d1045146e100b7b5e014f4f1a"
             ],
             "version": "==0.5.2"
         }

From 57ec0c38aecbabb95e7375dbf6f27571c3c36929 Mon Sep 17 00:00:00 2001
From: Ally Weir <aweir@twig-world.com>
Date: Thu, 24 May 2018 14:38:14 +0100
Subject: [PATCH 2/2] Fix shellcheck linting issues

---
 bin/steps/collectstatic | 2 +-
 bin/steps/pip-install   | 2 +-
 bin/steps/pip-uninstall | 2 +-
 bin/steps/pipenv        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/steps/collectstatic b/bin/steps/collectstatic
index d99f021..755b927 100755
--- a/bin/steps/collectstatic
+++ b/bin/steps/collectstatic
@@ -11,7 +11,7 @@
 #   - $DEBUG_COLLECTSTATIC: upon failure, print out environment variables.
 
 # shellcheck source=bin/utils
-source $BIN_DIR/utils
+source "$BIN_DIR/utils"
 
 # Location of 'manage.py', if it exists.
 MANAGE_FILE=$(find . -maxdepth 3 -type f -name 'manage.py' -printf '%d\t%P\n' | sort -nk1 | cut -f2 | head -1)
diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index f28a9f9..1589d87 100755
--- a/bin/steps/pip-install
+++ b/bin/steps/pip-install
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # shellcheck source=bin/utils
-source $BIN_DIR/utils
+source "$BIN_DIR/utils"
 
 if [ ! "$SKIP_PIP_INSTALL" ]; then
 
diff --git a/bin/steps/pip-uninstall b/bin/steps/pip-uninstall
index cd97a8d..682b2c9 100755
--- a/bin/steps/pip-uninstall
+++ b/bin/steps/pip-uninstall
@@ -3,7 +3,7 @@
 set +e
 # Install dependencies with Pip.
 # shellcheck source=bin/utils
-source $BIN_DIR/utils
+source "$BIN_DIR/utils"
 
 if [ ! "$SKIP_PIP_INSTALL" ]; then
 
diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index 6dec3a1..38ddf04 100755
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -3,7 +3,7 @@
 # export CLINT_FORCE_COLOR=1
 # export PIPENV_FORCE_COLOR=1
 # shellcheck source=bin/utils
-source $BIN_DIR/utils
+source "$BIN_DIR/utils"
 set -e
 
 if [[ -f Pipfile.lock ]]; then