Commit 73519b35 by Ned Batchelder

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)
parent ff5abb9b
...@@ -5,7 +5,7 @@ setup( ...@@ -5,7 +5,7 @@ setup(
version="0.2", version="0.2",
packages=["calc"], packages=["calc"],
install_requires=[ install_requires=[
"pyparsing==2.0.1", "pyparsing==2.0.7",
"numpy==1.6.2", "numpy==1.6.2",
"scipy==0.14.0", "scipy==0.14.0",
], ],
......
...@@ -5,7 +5,7 @@ setup( ...@@ -5,7 +5,7 @@ setup(
version="0.1.1", version="0.1.1",
packages=["chem"], packages=["chem"],
install_requires=[ install_requires=[
"pyparsing==2.0.1", "pyparsing==2.0.7",
"numpy==1.6.2", "numpy==1.6.2",
"scipy==0.14.0", "scipy==0.14.0",
"nltk==2.0.6", "nltk==2.0.6",
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
numpy==1.6.2 numpy==1.6.2
networkx==1.7 networkx==1.7
sympy==0.7.1 sympy==0.7.1
pyparsing==2.0.1 pyparsing==2.0.7
matplotlib==1.3.1 matplotlib==1.3.1
# We forked NLTK just to make it work with setuptools instead of distribute # We forked NLTK just to make it work with setuptools instead of distribute
......
...@@ -80,7 +80,7 @@ pygments==2.0.1 ...@@ -80,7 +80,7 @@ pygments==2.0.1
pygraphviz==1.1 pygraphviz==1.1
PyJWT==1.4.0 PyJWT==1.4.0
pymongo==2.9.1 pymongo==2.9.1
pyparsing==2.0.1 pyparsing==2.0.7
python-memcached==1.48 python-memcached==1.48
python-openid==2.2.5 python-openid==2.2.5
python-dateutil==2.1 python-dateutil==2.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment