From 9514f9d3be603b6d4089b81bf596918afbebfef8 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@gmail.com>
Date: Thu, 22 Feb 2018 23:14:10 -0500
Subject: [PATCH 1/3] With wheels this statement is no longer true.

---
 requirements/edx/base.txt | 1 +
 requirements/edx/pre.txt  | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index c88d8614fc..49318c34f6 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -113,6 +113,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
diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt
index 265cd46ad0..2dd0fc294c 100644
--- a/requirements/edx/pre.txt
+++ b/requirements/edx/pre.txt
@@ -8,7 +8,3 @@
 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

From d800ce56734ff12aabe132172f6349011cd9a112 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@gmail.com>
Date: Thu, 22 Feb 2018 23:34:21 -0500
Subject: [PATCH 2/3] Move pyparsing to base.txt

It's unclear why this is in pre.txt
---
 requirements/edx/base.txt | 1 +
 requirements/edx/pre.txt  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 49318c34f6..ae12da7934 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -101,6 +101,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
diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt
index 2dd0fc294c..d084fa6a5c 100644
--- a/requirements/edx/pre.txt
+++ b/requirements/edx/pre.txt
@@ -5,6 +5,5 @@
 #   * @edx/devops - to check system requirements
 
 # Packaging pre-requisites.
-pyparsing==2.0.7
 setuptools==37.0.0
 pip==9.0.1

From 3a4c36b4ef6444afc3106cc40d4b261150fdea8f Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@gmail.com>
Date: Fri, 23 Feb 2018 00:16:01 -0500
Subject: [PATCH 3/3] Remove requirements that should be a part of the venv
 definition.

---
 requirements/edx/pre.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt
index d084fa6a5c..552f6ef8e0 100644
--- a/requirements/edx/pre.txt
+++ b/requirements/edx/pre.txt
@@ -4,6 +4,4 @@
 #   * @edx/ospr - to check licensing
 #   * @edx/devops - to check system requirements
 
-# Packaging pre-requisites.
-setuptools==37.0.0
-pip==9.0.1
+# Empty file left here until all the places that expect it have been updated.