From 8d791b5823acce6a6311ceefe2ec6914f0d33d86 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Tue, 24 Jan 2017 20:42:25 -0500
Subject: [PATCH] Use latest pyparsing 2.0.x to avoid setuptools entanglement

With 2.0.1, and setuptools 34.0.2, errors happen like:

File "/edx/app/edxapp/venvs/edxapp-sandbox/local/lib/python2.7/site-packages/packaging/requirements.py", line 59, in <module>
    MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
TypeError: __call__() takes exactly 2 arguments (1 given)

(cherry picked from commit 73519b3547359a0b791e39d4665f51ac66449a17)
---
 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 b4f97e5f16..9354bb7b83 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.1",
+        "pyparsing==2.0.7",
         "numpy==1.6.2",
         "scipy==0.14.0",
     ],
diff --git a/common/lib/chem/setup.py b/common/lib/chem/setup.py
index c15c026197..b53a3f7c43 100644
--- a/common/lib/chem/setup.py
+++ b/common/lib/chem/setup.py
@@ -5,7 +5,7 @@ setup(
     version="0.1.1",
     packages=["chem"],
     install_requires=[
-        "pyparsing==2.0.1",
+        "pyparsing==2.0.7",
         "numpy==1.6.2",
         "scipy==0.14.0",
         "nltk==2.0.6",
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
index 5e59e1fe92..efa01d17ae 100644
--- a/requirements/edx-sandbox/base.txt
+++ b/requirements/edx-sandbox/base.txt
@@ -7,7 +7,7 @@
 numpy==1.6.2
 networkx==1.7
 sympy==0.7.1
-pyparsing==2.0.1
+pyparsing==2.0.7
 matplotlib==1.3.1
 
 # We forked NLTK just to make it work with setuptools instead of distribute
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index f5bb4b96df..40d9840c90 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -81,7 +81,7 @@ pygments==2.0.1
 pygraphviz==1.1
 PyJWT==1.4.0
 pymongo==2.9.1
-pyparsing==2.0.1
+pyparsing==2.0.7
 python-memcached==1.48
 python-openid==2.2.5
 python-dateutil==2.1