From d9c0d1cb7f3f230ccfcaeb396993ef8fc3782bc2 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 12 Jun 2018 12:28:55 -0400 Subject: [PATCH] Don't upgrade py2neo to 4.0.0 It seems to have broken tests. --- requirements/edx/base.in | 2 +- requirements/edx/base.txt | 19 +++---------------- requirements/edx/development.txt | 9 ++------- requirements/edx/testing.txt | 23 +++++++++-------------- 4 files changed, 15 insertions(+), 38 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index d62719ccf5..09ba84dcfa 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -107,7 +107,7 @@ oauthlib==2.0.1 # OAuth specification support for authentica pdfminer # Used in shoppingcart for extracting/parsing pdf text piexif==1.0.2 # Exif image metadata manipulation, used in the profile_images app Pillow==3.4 # Image manipulation library; used for course assets, profile images, invoice PDFs, etc. -py2neo # Used to communicate with Neo4j, which is used internally for modulestore inspection +py2neo<4.0.0 # Used to communicate with Neo4j, which is used internally for modulestore inspection PyContracts==1.7.1 pycountry==1.20 pycryptodomex==3.4.7 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 19b5b1055d..c836c8812a 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -48,7 +48,6 @@ appdirs==1.4.3 # via fs argh==0.26.2 argparse==1.4.0 asn1crypto==0.24.0 -atomicwrites==1.1.5 # via pytest attrs==17.4.0 babel==1.3 beautifulsoup==3.2.1 # via pynliner @@ -58,11 +57,9 @@ boto3==1.4.8 boto==2.39.0 botocore==1.8.17 celery==3.1.25 -certifi==2018.4.16 # via urllib3 cffi==1.11.5 charade==1.0.3 # via pysrt -click==6.7 # via py2neo, user-util -colorama==0.3.9 # via py2neo +click==6.7 # via user-util coreapi==2.3.3 # via django-rest-swagger, openapi-codec coreschema==0.0.4 # via coreapi cryptography==2.2.2 @@ -138,7 +135,6 @@ feedparser==5.1.3 firebase-token-generator==1.3.2 fs-s3fs==0.1.8 fs==2.0.18 -funcsigs==1.0.2 # via pytest future==0.16.0 # via pyjwkest futures==3.2.0 ; python_version == "2.7" glob2==0.3 @@ -169,10 +165,7 @@ markey==0.8 # via django-babel-underscore markupsafe==1.0 mock==1.0.1 mongoengine==0.10.0 -more-itertools==4.2.0 # via pytest mysql-python==1.2.5 -neo4j-driver==1.6.0 # via py2neo -neotime==1.0.0 # via neo4j-driver networkx==1.7 newrelic==3.2.2.94 nltk==3.3.0 @@ -188,12 +181,9 @@ pbr==4.0.4 pdfminer==20140328 piexif==1.0.2 pillow==3.4.0 -pluggy==0.6.0 # via pytest polib==1.1.0 # via edx-i18n-tools -prompt_toolkit==1.0.15 # via py2neo psutil==1.2.1 -py2neo==4.0.0 -py==1.5.3 # via pytest +py2neo==3.1.2 pycontracts==1.7.1 pycountry==1.20 pycparser==2.18 @@ -204,10 +194,8 @@ pyjwkest==1.3.2 pyjwt==1.5.2 pymongo==2.9.1 pynliner==0.5.2 -pyopenssl==18.0.0 # via urllib3 pyparsing==2.2.0 pysrt==0.4.7 -pytest==3.6.1 # via py2neo python-dateutil==2.4.0 python-levenshtein==0.12.0 python-memcached==1.48 @@ -239,11 +227,10 @@ stevedore==1.10.0 sympy==0.7.1 unicodecsv==0.14.1 uritemplate==3.0.0 # via coreapi -urllib3[secure]==1.23 # via elasticsearch, py2neo +urllib3==1.23 # via elasticsearch user-util==0.1.3 voluptuous==0.11.1 watchdog==0.8.3 -wcwidth==0.1.7 # via prompt-toolkit web-fragments==0.2.2 webob==1.8.2 # via xblock wrapt==1.10.5 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a739982db4..666e121d1c 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -68,7 +68,6 @@ boto3==1.4.8 boto==2.39.0 botocore==1.8.17 celery==3.1.25 -certifi==2018.4.16 cffi==1.11.5 charade==1.0.3 click-log==0.1.8 @@ -215,8 +214,6 @@ more-itertools==4.2.0 moto==0.3.1 mysql-python==1.2.5 needle==0.5.0 -neo4j-driver==1.6.0 -neotime==1.0.0 networkx==1.7 newrelic==3.2.2.94 nltk==3.3.0 @@ -239,9 +236,8 @@ pillow==3.4.0 pip-tools==2.0.2 pluggy==0.6.0 polib==1.1.0 -prompt_toolkit==1.0.15 psutil==1.2.1 -py2neo==4.0.0 +py2neo==3.1.2 py==1.5.3 pyasn1-modules==0.2.1 pyasn1==0.4.3 @@ -333,7 +329,7 @@ unicodecsv==0.14.1 unidecode==1.0.22 unittest2==1.1.0 uritemplate==3.0.0 -urllib3[secure]==1.23 +urllib3==1.23 urlobject==2.4.3 user-util==0.1.3 virtualenv==16.0.0 @@ -341,7 +337,6 @@ voluptuous==0.11.1 vulture==0.27 w3lib==1.19.0 watchdog==0.8.3 -wcwidth==0.1.7 web-fragments==0.2.2 webob==1.8.2 werkzeug==0.14.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index bc7e6a0a56..9341bc03a7 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -51,7 +51,7 @@ argh==0.26.2 argparse==1.4.0 asn1crypto==0.24.0 astroid==1.5.2 # via edx-lint, pylint, pylint-celery, pylint-plugin-utils -atomicwrites==1.1.5 +atomicwrites==1.1.5 # via pytest attrs==17.4.0 babel==1.3 backports.functools-lru-cache==1.5 # via astroid, pylint @@ -65,12 +65,11 @@ boto3==1.4.8 boto==2.39.0 botocore==1.8.17 celery==3.1.25 -certifi==2018.4.16 cffi==1.11.5 charade==1.0.3 click-log==0.1.8 # via edx-lint click==6.7 -colorama==0.3.9 +colorama==0.3.9 # via radon configparser==3.5.0 # via flake8, pylint constantly==15.1.0 # via twisted coreapi==2.3.3 @@ -161,7 +160,7 @@ flask==1.0.2 # via moto freezegun==0.3.10 fs-s3fs==0.1.8 fs==2.0.18 -funcsigs==1.0.2 +funcsigs==1.0.2 # via pytest future==0.16.0 futures==3.2.0 ; python_version == "2.7" fuzzywuzzy==0.16.0 @@ -203,12 +202,10 @@ markupsafe==1.0 mccabe==0.6.1 # via flake8, pylint mock==1.0.1 mongoengine==0.10.0 -more-itertools==4.2.0 +more-itertools==4.2.0 # via pytest moto==0.3.1 mysql-python==1.2.5 needle==0.5.0 # via bok-choy -neo4j-driver==1.6.0 -neotime==1.0.0 networkx==1.7 newrelic==3.2.2.94 nltk==3.3.0 @@ -227,12 +224,11 @@ pbr==4.0.4 pdfminer==20140328 piexif==1.0.2 pillow==3.4.0 -pluggy==0.6.0 +pluggy==0.6.0 # via pytest, tox polib==1.1.0 -prompt_toolkit==1.0.15 psutil==1.2.1 -py2neo==4.0.0 -py==1.5.3 +py2neo==3.1.2 +py==1.5.3 # via pytest, tox pyasn1-modules==0.2.1 # via service-identity pyasn1==0.4.3 # via pyasn1-modules, service-identity pycodestyle==2.3.1 @@ -252,7 +248,7 @@ pylint-plugin-utils==0.2.6 # via pylint-celery, pylint-django pylint==1.7.1 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils pymongo==2.9.1 pynliner==0.5.2 -pyopenssl==18.0.0 +pyopenssl==18.0.0 # via scrapy, service-identity pyparsing==2.2.0 pyquery==1.4.0 pysqlite==2.8.3 @@ -316,14 +312,13 @@ unicodecsv==0.14.1 unidecode==1.0.22 # via python-slugify unittest2==1.1.0 # via testtools uritemplate==3.0.0 -urllib3[secure]==1.23 +urllib3==1.23 urlobject==2.4.3 # via pa11ycrawler user-util==0.1.3 virtualenv==16.0.0 # via tox voluptuous==0.11.1 w3lib==1.19.0 # via parsel, scrapy watchdog==0.8.3 -wcwidth==0.1.7 web-fragments==0.2.2 webob==1.8.2 werkzeug==0.14.1 # via flask