Reduce requirements complexity.

This reverts commit 0ca5cb9b.

requirements/edx/base.txt

@@ -100,6 +100,7 @@ pyjwkest==1.3.2
 # TODO Replace PyJWT usage with pyjwkest
 PyJWT==1.4.0
 pymongo==2.9.1
+pyparsing==2.0.7
 python-memcached==1.48
 django-memcached-hashring==0.1.2
 python-openid==2.2.5
@@ -113,6 +114,7 @@ PyYAML==3.12
 requests-oauthlib==0.4.1
 rules==1.1.1
 s3transfer==0.1.12
+numpy==1.6.2
 scipy==0.14.0
 Shapely==1.2.16
 singledispatch==3.4.0.2

requirements/edx/pre.txt

@@ -4,11 +4,4 @@
 #   * @edx/ospr - to check licensing
 #   * @edx/devops - to check system requirements
 
-# Packaging pre-requisites.
-pyparsing==2.0.7
-setuptools==37.0.0
-pip==9.0.1
-
-# 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
+# Empty file left here until all the places that expect it have been updated.