Merge pull request #2094 from edx/ned/make-numpy-and-scipy-both-install

Put numpy into a pre.txt so that everything will actually install.

rakefiles/prereqs.rake

@@ -31,6 +31,7 @@ task :install_python_prereqs => "ws:migrate" do
     unchanged = 'Python requirements unchanged, nothing to install'
     when_changed(unchanged, ['requirements/**/*'], [site_packages_dir]) do
         ENV['PIP_DOWNLOAD_CACHE'] ||= '.pip_download_cache'
+        sh('pip install --exists-action w -r requirements/edx/pre.txt')
         sh('pip install --exists-action w -r requirements/edx/base.txt')
         sh('pip install --exists-action w -r requirements/edx/post.txt')
         # requirements/private.txt is used to install our libs as

requirements/edx/base.txt

@@ -29,7 +29,6 @@ mako==0.7.3
 Markdown==2.2.1
 networkx==1.7
 nltk==2.0.4
-numpy==1.6.2
 paramiko==1.9.0
 path.py==3.0.1
 Pillow==1.7.8
@@ -43,6 +42,7 @@ python-openid==2.2.5
 pytz==2012h
 PyYAML==3.10
 requests==0.14.2
+scipy==0.11.0
 Shapely==1.2.16
 sorl-thumbnail==11.12
 South==0.7.6

requirements/edx/post.txt

-
-# This must be installed after distribute 0.6.28
-MySQL-python==1.2.4c1
-
-# This must be installed after numpy
-scipy==0.11.0
+# This must be installed after distribute has been updated.
+MySQL-python==1.2.4

requirements/edx/pre.txt

+# 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