From 2cf5f4ed24bf1a99b6274db4dbb664b37a22267f Mon Sep 17 00:00:00 2001
From: Martyn Inglis <martyn.inglis@digital.cabinet-office.gov.uk>
Date: Mon, 11 Jul 2016 10:22:59 +0100
Subject: [PATCH 1/3] updated bootstrap

---
 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 7d0e0b604..635a3e122 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -22,7 +22,7 @@ function display_result {
 
 if [ ! $VIRTUAL_ENV ]; then
   virtualenv ./venv
-  . ./venv/bin/activate
+  virtualenv -p python3 ./venv
 fi
 
 

From 7e7f221461c484451ce54b938119c09848c6dc6c Mon Sep 17 00:00:00 2001
From: minglis <minglis@users.noreply.github.com>
Date: Tue, 12 Jul 2016 13:28:03 +0100
Subject: [PATCH 2/3] Update bootstrap.sh

---
 scripts/bootstrap.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 635a3e122..bf0ccbf64 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -20,6 +20,10 @@ function display_result {
   fi
 }
 
+ if [ ! $VIRTUAL_ENV ]; then
+  virtualenv -p python3 ./venv
+  . ./venv/bin/activate
+
 if [ ! $VIRTUAL_ENV ]; then
   virtualenv ./venv
   virtualenv -p python3 ./venv

From f034f99b8d37633279d0239d698003f93fffc73b Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leohemsted@gmail.com>
Date: Fri, 15 Jul 2016 10:24:44 +0100
Subject: [PATCH 3/3] Update bootstrap.sh

force python3 when creating virtualenv
---
 scripts/bootstrap.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index bf0ccbf64..5c924e59b 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -20,13 +20,9 @@ function display_result {
   fi
 }
 
- if [ ! $VIRTUAL_ENV ]; then
+if [ ! $VIRTUAL_ENV ]; then
   virtualenv -p python3 ./venv
   . ./venv/bin/activate
-
-if [ ! $VIRTUAL_ENV ]; then
-  virtualenv ./venv
-  virtualenv -p python3 ./venv
 fi