From 73021673ffe9fc98a5c81540141096cb4eaf9863 Mon Sep 17 00:00:00 2001
From: William Budington <bill@eff.org>
Date: Wed, 20 May 2015 18:56:07 -0700
Subject: [PATCH 1/3] Fix for Vagrantfile: pip install -e ., so we don't break
 on git requirement

---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1d3b48f06..ce2222526 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,7 +10,7 @@ cd /vagrant
 sudo ./bootstrap/ubuntu.sh
 if [ ! -d "venv" ]; then
   virtualenv --no-site-packages -p python2 venv
-  ./venv/bin/pip install -r requirements.txt -e .[dev,docs,testing]
+  ./venv/bin/pip install -e .
 fi
 SETUP_SCRIPT
 

From eebe710884b2326019a851ac9473c531e22cedf4 Mon Sep 17 00:00:00 2001
From: William Budington <bill@eff.org>
Date: Thu, 21 May 2015 16:41:37 -0700
Subject: [PATCH 2/3] Vagrantfile: add git to requirements, and install from
 requirements.txt and dev deps

---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index ce2222526..463ac21c8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,9 +8,10 @@ VAGRANTFILE_API_VERSION = "2"
 $ubuntu_setup_script = <<SETUP_SCRIPT
 cd /vagrant
 sudo ./bootstrap/ubuntu.sh
+sudo apt-get -y --no-install-recommends install git
 if [ ! -d "venv" ]; then
   virtualenv --no-site-packages -p python2 venv
-  ./venv/bin/pip install -e .
+  ./venv/bin/pip install -r requirements.txt -e .[dev,docs,testing]
 fi
 SETUP_SCRIPT
 

From 93c09f19becdf94d060c5677ceac26a09e95e819 Mon Sep 17 00:00:00 2001
From: William Budington <bill@eff.org>
Date: Fri, 22 May 2015 11:23:18 -0700
Subject: [PATCH 3/3] Install git-core for vagrant (smaller dependency) and add
 comment

---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 463ac21c8..7eb2b4cce 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,7 +8,8 @@ VAGRANTFILE_API_VERSION = "2"
 $ubuntu_setup_script = <<SETUP_SCRIPT
 cd /vagrant
 sudo ./bootstrap/ubuntu.sh
-sudo apt-get -y --no-install-recommends install git
+sudo apt-get -y --no-install-recommends install git-core
+# the above is required by the 'git+https' lines of requirements.txt
 if [ ! -d "venv" ]; then
   virtualenv --no-site-packages -p python2 venv
   ./venv/bin/pip install -r requirements.txt -e .[dev,docs,testing]