From 03594aa3f47d2ad5a85060b5dcbe36cfd87b0fcc Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Fri, 30 Jan 2015 09:27:08 -0500
Subject: [PATCH] Upgrade pip

---
 requirements/edx/base.txt | 1 -
 requirements/edx/pre.txt  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 96ecd2ae87..9c65b119fb 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -58,7 +58,6 @@ oauthlib==0.6.3
 paramiko==1.9.0
 path.py==3.0.1
 Pillow==2.7.0
-pip>=1.4
 polib==1.0.3
 pycrypto>=2.6
 pygments==2.0.1
diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt
index 363fb2d247..036f0b1e64 100644
--- a/requirements/edx/pre.txt
+++ b/requirements/edx/pre.txt
@@ -7,3 +7,6 @@
 # Numpy and scipy can't be installed in the same pip run.
 # Install numpy before other things to help resolve the problem.
 numpy==1.6.2
+
+# Needed to make sure that options in base.txt are allowed
+pip==6.0.7