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)
This commit is contained in:
Ned Batchelder
2017-01-24 20:42:25 -05:00
parent 041fede334
commit 8d791b5823
4 changed files with 4 additions and 4 deletions

View File

@@ -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",
],

View File

@@ -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",

View File

@@ -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

View File

@@ -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