Upgrade pip

2015-01-30 09:27:08 -05:00
parent 4b6c62a85b
commit 03594aa3f4
2 changed files with 3 additions and 1 deletions
--- 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
--- 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