From 64040c2dee907580067f16564298da18fa803f9e Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Thu, 1 Mar 2018 13:40:40 -0500
Subject: [PATCH 1/2] Reduce requirements complexity.

This reverts commit 0ca5cb9b74a612542831c0ff02ff7bbcaf844122.
---
 requirements/edx/base.txt | 2 ++
 requirements/edx/pre.txt  | 9 +--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index b1013b3c2d..c089924af3 100644
--- a/requirements/edx/base.txt
+++ b/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
diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt
index 265cd46ad0..552f6ef8e0 100644
--- a/requirements/edx/pre.txt
+++ b/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.

From 041059f740c841c1a3719c3cded027571fc1fca9 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Thu, 1 Mar 2018 13:47:31 -0500
Subject: [PATCH 2/2] Update the other requirements to use pyparsing 2.2.0 as
 well.

---
 common/lib/calc/setup.py          | 2 +-
 common/lib/chem/setup.py          | 2 +-
 requirements/edx-sandbox/base.txt | 2 +-
 requirements/edx/base.txt         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/calc/setup.py b/common/lib/calc/setup.py
index 9354bb7b83..d62dd9b6eb 100644
--- a/common/lib/calc/setup.py
+++ b/common/lib/calc/setup.py
@@ -5,7 +5,7 @@ setup(
     version="0.2",
     packages=["calc"],
     install_requires=[
-        "pyparsing==2.0.7",
+        "pyparsing==2.2.0",
         "numpy==1.6.2",
         "scipy==0.14.0",
     ],
diff --git a/common/lib/chem/setup.py b/common/lib/chem/setup.py
index c421877153..9affb3d665 100644
--- a/common/lib/chem/setup.py
+++ b/common/lib/chem/setup.py
@@ -5,7 +5,7 @@ setup(
     version="0.1.2",
     packages=["chem"],
     install_requires=[
-        "pyparsing==2.0.7",
+        "pyparsing==2.2.0",
         "numpy==1.6.2",
         "scipy==0.14.0",
         "nltk==3.2.5",
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
index 75796afe1f..5852d1a74b 100644
--- a/requirements/edx-sandbox/base.txt
+++ b/requirements/edx-sandbox/base.txt
@@ -12,5 +12,5 @@ nltk==3.2.5
 numpy==1.6.2
 networkx==1.7
 sympy==0.7.1
-pyparsing==2.0.7
+pyparsing==2.2.0
 cryptography==1.9
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index c089924af3..78a3b8f18b 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -100,7 +100,7 @@ pyjwkest==1.3.2
 # TODO Replace PyJWT usage with pyjwkest
 PyJWT==1.4.0
 pymongo==2.9.1
-pyparsing==2.0.7
+pyparsing==2.2.0
 python-memcached==1.48
 django-memcached-hashring==0.1.2
 python-openid==2.2.5