From aa4f21ea43c2e6c23b48520af89bad21be5d1bf4 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Fri, 1 Mar 2019 11:27:58 -0500 Subject: [PATCH] Update edx-platform dependencies. Extra constraints needed to be added for pytest-randomly and tornado, both of which have dropped Python 2 support. --- requirements/constraints.txt | 6 +++++ requirements/edx-sandbox/base.txt | 6 ++--- requirements/edx-sandbox/shared.txt | 6 ++--- requirements/edx/base.txt | 18 +++++++------- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 38 ++++++++++++++--------------- requirements/edx/paver.txt | 6 ++--- requirements/edx/testing.txt | 36 +++++++++++++-------------- 8 files changed, 62 insertions(+), 56 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index fddedc888b..550e610fff 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -35,3 +35,9 @@ urllib3<1.24 # See https://github.com/oauthlib/oauthlib/issues/264 for more context requests-oauthlib==1.1.0 oauthlib==2.1.0 + +# pytest-randomly dropped support for Python 2 with 2.0.0, and only supports Python 3.4+ +pytest-randomly<2.0.0 + +# Tornado dropped support for Python 2.7 and 3.4 with version 6.0. Only Python 3.5.2+ is now supported +tornado<6.0 \ No newline at end of file diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 4f3cc682ea..509a36c452 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -10,13 +10,13 @@ common/lib/sandbox-packages common/lib/symmath asn1crypto==0.24.0 backports-abc==0.5 # via tornado -cffi==1.12.1 -cryptography==2.5 +cffi==1.12.2 +cryptography==2.6.1 enum34==1.1.6 futures==3.2.0 ; python_version == "2.7" # via tornado ipaddress==1.0.22 lxml==3.8.0 -markupsafe==1.1.0 +markupsafe==1.1.1 matplotlib==1.3.1 networkx==1.7 nltk==3.4 diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 54cd0c1219..0d307da191 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -9,12 +9,12 @@ -e common/lib/sandbox-packages -e common/lib/symmath asn1crypto==0.24.0 # via cryptography -cffi==1.12.1 # via cryptography -cryptography==2.5 +cffi==1.12.2 # via cryptography +cryptography==2.6.1 enum34==1.1.6 # via cryptography ipaddress==1.0.22 # via cryptography lxml==3.8.0 -markupsafe==1.1.0 +markupsafe==1.1.1 networkx==1.7 nltk==3.4 numpy==1.6.2 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 74c9817d2f..e951a3d55a 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -55,14 +55,14 @@ boto==2.39.0 botocore==1.8.17 celery==3.1.25 certifi==2018.11.29 -cffi==1.12.1 +cffi==1.12.2 chardet==3.0.4 click==7.0 # via user-util coreapi==2.3.3 # via django-rest-swagger, openapi-codec coreschema==0.0.4 # via coreapi -cryptography==2.5 +cryptography==2.6.1 cssutils==1.0.2 # via pynliner -ddt==1.2.0 +ddt==1.2.1 decorator==4.3.2 # via pycontracts defusedxml==0.5.0 django-appconf==1.0.2 # via django-statici18n @@ -120,7 +120,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.1 edx-proctoring-proctortrack==1.0.2 -edx-proctoring==1.5.15 +edx-proctoring==1.5.16 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.1.1 @@ -128,7 +128,7 @@ edx-user-state-client==1.0.4 edxval==1.1.25 elasticsearch==1.9.0 # via edx-search enum34==1.1.6 -event-tracking==0.2.7 +event-tracking==0.2.8 feedparser==5.1.3 firebase-token-generator==1.3.2 fs-s3fs==0.1.8 @@ -147,7 +147,7 @@ ipaddress==1.0.22 isodate==0.6.0 # via python3-saml itypes==1.1.0 # via coreapi jinja2==2.10 # via coreschema -jmespath==0.9.3 # via boto3, botocore +jmespath==0.9.4 # via boto3, botocore jsondiff==1.1.1 # via edx-enterprise jsonfield==2.0.2 kombu==3.0.37 # via celery @@ -160,7 +160,7 @@ mailsnake==1.6.4 mako==1.0.2 markdown==2.6.11 markey==0.8 # via django-babel-underscore -markupsafe==1.1.0 +markupsafe==1.1.1 maxminddb==1.4.1 # via geoip2 mock==1.0.1 mongoengine==0.10.0 @@ -176,7 +176,7 @@ openapi-codec==1.3.2 # via django-rest-swagger path.py==8.2.1 pathtools==0.1.2 paver==1.3.4 -pbr==5.1.2 +pbr==5.1.3 pdfminer==20140328 piexif==1.0.2 pillow==5.4.1 @@ -228,7 +228,7 @@ sorl-thumbnail==12.3 sortedcontainers==2.1.0 soupsieve==1.8 # via beautifulsoup4 sqlparse==0.2.4 -stevedore==1.30.0 +stevedore==1.30.1 sympy==0.7.1 tincan==0.0.5 # via edx-enterprise unicodecsv==0.14.1 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 0be086ff78..2932a4724a 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -9,6 +9,6 @@ diff-cover==0.9.8 inflect==2.1.0 # via jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover jinja2==2.10 # via diff-cover, jinja2-pluralize -markupsafe==1.1.0 # via jinja2 +markupsafe==1.1.1 # via jinja2 pygments==2.3.1 # via diff-cover six==1.11.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 99fbae50e3..4be3a220f1 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -66,21 +66,21 @@ botocore==1.8.17 caniusepython3==7.0.0 celery==3.1.25 certifi==2018.11.29 -cffi==1.12.1 +cffi==1.12.2 chardet==3.0.4 click-log==0.1.8 click==7.0 code-annotations==0.2.4 colorama==0.4.1 -configparser==3.7.1 +configparser==3.7.3 constantly==15.1.0 coreapi==2.3.3 coreschema==0.0.4 coverage==4.4 -cryptography==2.5 +cryptography==2.6.1 cssselect==1.0.3 cssutils==1.0.2 -ddt==1.2.0 +ddt==1.2.1 decorator==4.3.2 defusedxml==0.5.0 dicttoxml==1.7.4 @@ -143,7 +143,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.1 edx-proctoring-proctortrack==1.0.2 -edx-proctoring==1.5.15 +edx-proctoring==1.5.16 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-sphinx-theme==1.4.0 @@ -153,7 +153,7 @@ edxval==1.1.25 elasticsearch==1.9.0 entrypoints==0.3 enum34==1.1.6 -event-tracking==0.2.7 +event-tracking==0.2.8 execnet==1.5.0 extras==1.0.0 factory_boy==2.8.1 @@ -163,7 +163,7 @@ filelock==3.0.10 firebase-token-generator==1.3.2 fixtures==3.0.0 flake8-polyfill==1.0.2 -flake8==3.7.6 +flake8==3.7.7 flask==1.0.2 freezegun==0.3.11 fs-s3fs==0.1.8 @@ -188,12 +188,12 @@ incremental==17.5.0 inflect==2.1.0 ipaddress==1.0.22 isodate==0.6.0 -isort==4.3.4 +isort==4.3.9 itsdangerous==1.1.0 itypes==1.1.0 jinja2-pluralize==0.3.0 jinja2==2.10 -jmespath==0.9.3 +jmespath==0.9.4 jsondiff==1.1.1 jsonfield==2.0.2 kombu==3.0.37 @@ -209,11 +209,11 @@ mako==1.0.2 mando==0.6.4 markdown==2.6.11 markey==0.8 -markupsafe==1.1.0 +markupsafe==1.1.1 maxminddb==1.4.1 mccabe==0.6.1 mock==1.0.1 -modernize==0.6.1 +modernize==0.7 mongoengine==0.10.0 more-itertools==5.0.0 moto==0.3.1 @@ -233,17 +233,17 @@ path.py==8.2.1 pathlib2==2.3.3 pathtools==0.1.2 paver==1.3.4 -pbr==5.1.2 +pbr==5.1.3 pdfminer==20140328 piexif==1.0.2 pillow==5.4.1 pip-tools==3.4.0 pkgconfig==1.4.0 -pluggy==0.8.1 +pluggy==0.9.0 polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 -py==1.7.0 +py==1.8.0 pyasn1-modules==0.2.4 pyasn1==0.4.5 pycodestyle==2.5.0 @@ -252,7 +252,7 @@ pycountry==18.12.8 pycparser==2.19 pycryptodomex==3.4.7 pydispatcher==2.0.5 -pyflakes==2.1.0 +pyflakes==2.1.1 pygments==2.3.1 pygraphviz==1.5 pyhamcrest==1.9.0 @@ -272,7 +272,7 @@ pysqlite==2.8.3 pysrt==1.1.1 pytest-attrib==0.1.3 pytest-cov==2.6.1 -pytest-django==3.4.7 +pytest-django==3.4.8 pytest-forked==1.0.2 pytest-randomly==1.2.3 pytest-xdist==1.26.1 @@ -323,10 +323,10 @@ sphinx==1.8.4 sphinxcontrib-websupport==1.1.0 # via sphinx splinter==0.9.0 sqlparse==0.2.4 -stevedore==1.30.0 +stevedore==1.30.1 sure==1.4.11 sympy==0.7.1 -testfixtures==6.5.2 +testfixtures==6.6.0 testtools==2.3.0 text-unidecode==1.2 tincan==0.0.5 @@ -344,7 +344,7 @@ uritemplate==3.0.0 urllib3==1.23 urlobject==2.4.3 user-util==0.1.5 -virtualenv==16.4.0 +virtualenv==16.4.3 voluptuous==0.11.5 vulture==1.0 w3lib==1.20.0 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index aef06f419d..7a31d6f1fc 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -11,19 +11,19 @@ edx-opaque-keys==0.4.4 idna==2.8 # via requests lazy==1.1 libsass==0.10.0 -markupsafe==1.1.0 +markupsafe==1.1.1 mock==1.0.1 path.py==8.2.1 pathtools==0.1.2 # via watchdog paver==1.3.4 -pbr==5.1.2 # via stevedore +pbr==5.1.3 # via stevedore psutil==1.2.1 pymongo==2.9.1 python-memcached==1.48 pyyaml==3.13 # via watchdog requests==2.21.0 six==1.11.0 -stevedore==1.30.0 +stevedore==1.30.1 urllib3==1.23 # via requests watchdog==0.9.0 wrapt==1.10.5 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index a2e25572ef..d264978a02 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -64,21 +64,21 @@ botocore==1.8.17 caniusepython3==7.0.0 celery==3.1.25 certifi==2018.11.29 -cffi==1.12.1 +cffi==1.12.2 chardet==3.0.4 click-log==0.1.8 # via edx-lint click==7.0 code-annotations==0.2.4 colorama==0.4.1 # via radon -configparser==3.7.1 # via entrypoints, flake8, pylint +configparser==3.7.3 # via entrypoints, flake8, pylint constantly==15.1.0 # via twisted coreapi==2.3.3 coreschema==0.0.4 coverage==4.4 -cryptography==2.5 +cryptography==2.6.1 cssselect==1.0.3 cssutils==1.0.2 -ddt==1.2.0 +ddt==1.2.1 decorator==4.3.2 defusedxml==0.5.0 dicttoxml==1.7.4 # via moto @@ -139,7 +139,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.1 edx-proctoring-proctortrack==1.0.2 -edx-proctoring==1.5.15 +edx-proctoring==1.5.16 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.1.1 @@ -148,7 +148,7 @@ edxval==1.1.25 elasticsearch==1.9.0 entrypoints==0.3 # via flake8 enum34==1.1.6 -event-tracking==0.2.7 +event-tracking==0.2.8 execnet==1.5.0 # via pytest-xdist extras==1.0.0 # via python-subunit, testtools factory_boy==2.8.1 @@ -158,7 +158,7 @@ filelock==3.0.10 # via tox firebase-token-generator==1.3.2 fixtures==3.0.0 # via testtools flake8-polyfill==1.0.2 # via radon -flake8==3.7.6 # via flake8-polyfill +flake8==3.7.7 # via flake8-polyfill flask==1.0.2 # via moto freezegun==0.3.11 fs-s3fs==0.1.8 @@ -182,12 +182,12 @@ incremental==17.5.0 # via twisted inflect==2.1.0 ipaddress==1.0.22 isodate==0.6.0 -isort==4.3.4 +isort==4.3.9 itsdangerous==1.1.0 # via flask itypes==1.1.0 jinja2-pluralize==0.3.0 jinja2==2.10 -jmespath==0.9.3 +jmespath==0.9.4 jsondiff==1.1.1 jsonfield==2.0.2 kombu==3.0.37 @@ -203,7 +203,7 @@ mako==1.0.2 mando==0.6.4 # via radon markdown==2.6.11 markey==0.8 -markupsafe==1.1.0 +markupsafe==1.1.1 maxminddb==1.4.1 mccabe==0.6.1 # via flake8, pylint mock==1.0.1 @@ -226,16 +226,16 @@ path.py==8.2.1 pathlib2==2.3.3 # via pytest, pytest-django pathtools==0.1.2 paver==1.3.4 -pbr==5.1.2 +pbr==5.1.3 pdfminer==20140328 piexif==1.0.2 pillow==5.4.1 pkgconfig==1.4.0 -pluggy==0.8.1 # via pytest, tox +pluggy==0.9.0 # via pytest, tox polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 -py==1.7.0 # via pytest, tox +py==1.8.0 # via pytest, tox pyasn1-modules==0.2.4 # via service-identity pyasn1==0.4.5 # via pyasn1-modules, service-identity pycodestyle==2.5.0 @@ -244,7 +244,7 @@ pycountry==18.12.8 pycparser==2.19 pycryptodomex==3.4.7 pydispatcher==2.0.5 # via scrapy -pyflakes==2.1.0 # via flake8 +pyflakes==2.1.1 # via flake8 pygments==2.3.1 pygraphviz==1.5 pyhamcrest==1.9.0 # via twisted @@ -263,7 +263,7 @@ pysqlite==2.8.3 pysrt==1.1.1 pytest-attrib==0.1.3 pytest-cov==2.6.1 -pytest-django==3.4.7 +pytest-django==3.4.8 pytest-forked==1.0.2 # via pytest-xdist pytest-randomly==1.2.3 pytest-xdist==1.26.1 @@ -310,10 +310,10 @@ sortedcontainers==2.1.0 soupsieve==1.8 splinter==0.9.0 sqlparse==0.2.4 -stevedore==1.30.0 +stevedore==1.30.1 sure==1.4.11 sympy==0.7.1 -testfixtures==6.5.2 +testfixtures==6.6.0 testtools==2.3.0 # via fixtures, python-subunit text-unidecode==1.2 # via faker tincan==0.0.5 @@ -331,7 +331,7 @@ uritemplate==3.0.0 urllib3==1.23 urlobject==2.4.3 # via pa11ycrawler user-util==0.1.5 -virtualenv==16.4.0 # via tox +virtualenv==16.4.3 # via tox voluptuous==0.11.5 w3lib==1.20.0 # via parsel, scrapy watchdog==0.9.0