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 c61145cb34..2fe75b78d8 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.2.0 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.