diff --git a/conf/locale/babel_underscore.cfg b/conf/locale/babel_underscore.cfg index 0769f65f28..9f75e777b1 100644 --- a/conf/locale/babel_underscore.cfg +++ b/conf/locale/babel_underscore.cfg @@ -3,4 +3,4 @@ input_encoding = utf-8 [extractors] -underscore = django_babel_underscore:extract +underscore = enmerkar_underscore:extract diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 2001c7b1cc..b9b2f22943 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -27,7 +27,7 @@ pyparsing==2.2.0 # via -r requirements/edx-sandbox/py35.in, chem, matpl python-dateutil==2.4.0 # via -c requirements/edx-sandbox/../constraints.txt, matplotlib pytz==2020.1 # via matplotlib random2==1.0.1 # via -r requirements/edx-sandbox/py35.in -regex==2020.5.14 # via -r requirements/edx-sandbox/shared.txt, nltk +regex==2020.6.8 # via -r requirements/edx-sandbox/shared.txt, nltk scipy==1.2.1 # via -r requirements/edx-sandbox/py35.in, chem, openedx-calc six==1.15.0 # via -r requirements/edx-sandbox/shared.txt, chem, cryptography, cycler, matplotlib, openedx-calc, python-dateutil sympy==1.4 # via -r requirements/edx-sandbox/py35.in, symmath diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 75895559eb..9b7a259baf 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -11,6 +11,6 @@ joblib==0.14.1 # via -c requirements/edx-sandbox/../constraints.txt, lxml==4.5.0 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/shared.in nltk==3.5 # via -r requirements/edx-sandbox/shared.in pycparser==2.20 # via cffi -regex==2020.5.14 # via nltk +regex==2020.6.8 # via nltk six==1.15.0 # via cryptography tqdm==4.46.1 # via nltk diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 3046d664e4..f2749757cd 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -159,4 +159,5 @@ web-fragments # Provides the ability to render fragments o XBlock # Courseware component architecture xblock-utils # Provides utilities used by the Discussion XBlock xss-utils # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations +enmerkar-underscore # Implements a underscore extractor for django-babel. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 2f5607c84c..104c85bfc9 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -26,7 +26,7 @@ aniso8601==8.0.0 # via edx-tincan-py35 anyjson==0.3.3 # via kombu appdirs==1.4.4 # via fs attrs==19.3.0 # via -r requirements/edx/base.in, edx-ace -babel==2.8.0 # via -r requirements/edx/base.in, django-babel, django-babel-underscore +babel==2.8.0 # via -r requirements/edx/base.in, enmerkar, enmerkar-underscore beautifulsoup4==4.9.1 # via pynliner billiard==3.3.0.23 # via celery bleach==3.1.5 # via -r requirements/edx/base.in, edx-enterprise, lti-consumer-xblock, ora2 @@ -35,7 +35,7 @@ boto==2.39.0 # via -r requirements/edx/base.in, django-ses, edxval, botocore==1.8.17 # via -r requirements/edx/base.in, boto3, s3transfer bridgekeeper==0.8 # via -r requirements/edx/base.in celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise -certifi==2020.4.5.1 # via -r requirements/edx/paver.txt, requests +certifi==2020.4.5.2 # via -r requirements/edx/paver.txt, requests cffi==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, cryptography chardet==3.0.4 # via -r requirements/edx/paver.txt, pdfminer.six, pysrt, requests chem==1.2.0 # via -r requirements/edx/base.in @@ -49,10 +49,8 @@ cryptography==2.9.2 # via -r requirements/edx/../edx-sandbox/shared.txt, d cssutils==1.0.2 # via pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via pycontracts -defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.7.0rc1 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n -git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/github.in -git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/github.in django-celery==3.3.1 # via -r requirements/edx/base.in django-classy-tags==1.0.0 # via django-sekizai django-config-models==2.0.2 # via -r requirements/edx/base.in, edx-enterprise @@ -61,14 +59,14 @@ django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r req django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise django-crum==0.7.6 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring, edx-rbac, super-csv django-fernet-fields==0.6 # via -r requirements/edx/base.in, edx-enterprise, edxval -django-filter==2.2.0 # via -r requirements/edx/base.in, edx-enterprise +django-filter==2.3.0 # via -r requirements/edx/base.in, edx-enterprise django-ipware==2.1.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring django-js-asset==1.2.2 # via django-mptt django-method-override==1.0.4 # via -r requirements/edx/base.in django-model-utils==4.0.0 # via -r requirements/edx/base.in, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv django-mptt==0.11.0 # via -r requirements/edx/base.in, django-wiki django-multi-email-field==0.6.1 # via edx-enterprise -django-mysql==3.5.0 # via -r requirements/edx/base.in +django-mysql==3.6.0 # via -r requirements/edx/base.in django-oauth-toolkit==1.3.2 # via -r requirements/edx/base.in django-object-actions==2.0.0 # via edx-enterprise django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in @@ -84,7 +82,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi django-user-tasks==1.1.0 # via -r requirements/edx/base.in django-waffle==0.18.0 # via -r requirements/edx/base.in, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring django-webpack-loader==0.7.0 # via -r requirements/edx/base.in, edx-proctoring -django==2.2.13 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils +django==2.2.13 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, code-annotations, django-appconf, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, enmerkar, enmerkar-underscore, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils djangorestframework-xml==2.0.0 # via edx-enterprise djangorestframework==3.9.4 # via -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv docopt==0.6.2 # via xmodule @@ -102,7 +100,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.in edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in edx-django-utils==3.2.3 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.0.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.2.21 # via -r requirements/edx/base.in +edx-enterprise==3.2.22 # via -r requirements/edx/base.in edx-i18n-tools==0.5.3 # via ora2 edx-milestones==0.3.0 # via -r requirements/edx/base.in edx-opaque-keys[django]==2.1.0 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule @@ -113,12 +111,14 @@ edx-rbac==1.2.1 # via edx-enterprise edx-rest-api-client==5.2.1 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring edx-search==1.3.4 # via -r requirements/edx/base.in edx-sga==0.11.0 # via -r requirements/edx/base.in -edx-submissions==3.1.9 # via -r requirements/edx/base.in, ora2 +edx-submissions==3.1.10 # via -r requirements/edx/base.in, ora2 edx-tincan-py35==0.0.5 # via edx-enterprise edx-user-state-client==1.2.0 # via -r requirements/edx/base.in -edx-when==1.2.4 # via -r requirements/edx/base.in, edx-proctoring +edx-when==1.2.7 # via -r requirements/edx/base.in, edx-proctoring edxval==1.3.5 # via -r requirements/edx/base.in elasticsearch==1.9.0 # via edx-search +enmerkar-underscore==1.0.0 # via -r requirements/edx/base.in +enmerkar==0.7.1 # via enmerkar-underscore enum34==1.1.10 # via edxval event-tracking==0.3.2 # via -r requirements/edx/base.in, edx-proctoring, edx-search fs-s3fs==0.1.8 # via -r requirements/edx/base.in, django-pyfs @@ -131,8 +131,8 @@ help-tokens==1.1.2 # via -r requirements/edx/base.in html5lib==1.0.1 # via -r requirements/edx/base.in, ora2 icalendar==4.0.6 # via -r requirements/edx/base.in idna==2.9 # via -r requirements/edx/paver.txt, requests -importlib-metadata==1.6.0 # via -r requirements/edx/paver.txt, path -inflection==0.4.0 # via drf-yasg +importlib-metadata==1.6.1 # via -r requirements/edx/paver.txt, path +inflection==0.5.0 # via drf-yasg ipaddress==1.0.23 # via -r requirements/edx/base.in isodate==0.6.0 # via python3-saml itypes==1.2.0 # via coreapi @@ -152,7 +152,7 @@ lxml==4.5.0 # via -c requirements/edx/../constraints.txt, -r requi mailsnake==1.6.4 # via -r requirements/edx/base.in mako==1.0.2 # via -r requirements/edx/base.in, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-wiki, staff-graded-xblock, xblock-poll -markey==0.8 # via django-babel-underscore +markey==0.8 # via enmerkar-underscore markupsafe==1.1.1 # via -r requirements/edx/paver.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via geoip2 mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, xblock-drag-and-drop-v2, xblock-poll @@ -205,7 +205,7 @@ pyyaml==5.3.1 # via -r requirements/edx/base.in, code-annotations, e random2==1.0.1 # via -r requirements/edx/base.in recommender-xblock==1.4.8 # via -r requirements/edx/base.in redis==2.10.6 # via -r requirements/edx/base.in -regex==2020.5.14 # via -r requirements/edx/../edx-sandbox/shared.txt, nltk +regex==2020.6.8 # via -r requirements/edx/../edx-sandbox/shared.txt, nltk requests-oauthlib==1.3.0 # via -r requirements/edx/base.in, social-auth-core requests==2.23.0 # via -r requirements/edx/paver.txt, analytics-python, coreapi, django-oauth-toolkit, edx-analytics-data-api-client, edx-bulk-grades, edx-drf-extensions, edx-enterprise, edx-rest-api-client, geoip2, mailsnake, pyjwkest, python-swiftclient, requests-oauthlib, sailthru-client, slumber, social-auth-core rest-condition==1.0.3 # via -r requirements/edx/base.in, edx-drf-extensions @@ -219,11 +219,11 @@ scipy==1.4.1 # via chem, openedx-calc semantic-version==2.8.5 # via edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/base.in simplejson==3.17.0 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils -six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, cryptography, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock +six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, crowdsourcehinter-xblock, cryptography, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client social-auth-core==3.3.3 # via -r requirements/edx/base.in, social-auth-app-django sorl-thumbnail==12.6.3 # via -r requirements/edx/base.in -sortedcontainers==2.1.0 # via -r requirements/edx/base.in, pdfminer.six +sortedcontainers==2.2.2 # via -r requirements/edx/base.in, pdfminer.six soupsieve==2.0.1 # via beautifulsoup4 sqlparse==0.3.1 # via -r requirements/edx/base.in, django staff-graded-xblock==0.8 # via -r requirements/edx/base.in @@ -239,7 +239,7 @@ urllib3==1.25.9 # via -r requirements/edx/paver.txt, elasticsearch, ge user-util==0.2 # via -r requirements/edx/base.in voluptuous==0.11.7 # via ora2 watchdog==0.10.2 # via -r requirements/edx/paver.txt -web-fragments==0.3.2 # via -r requirements/edx/base.in, staff-graded-xblock, xblock, xblock-utils +web-fragments==0.3.2 # via -r requirements/edx/base.in, crowdsourcehinter-xblock, staff-graded-xblock, xblock, xblock-utils webencodings==0.5.1 # via bleach, html5lib webob==1.8.6 # via xblock, xmodule wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 401ca2084c..daa9bae6e4 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,7 +6,7 @@ # coverage==5.1 # via -r requirements/edx/coverage.in diff-cover==3.0.1 # via -r requirements/edx/coverage.in -importlib-metadata==1.6.0 # via inflect, pluggy +importlib-metadata==1.6.1 # via inflect, pluggy inflect==3.0.2 # via -c requirements/edx/../constraints.txt, jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover jinja2==2.11.2 # via diff-cover, jinja2-pluralize diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 4ce0db8e6b..c7fe351fb7 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -29,7 +29,7 @@ apipkg==1.5 # via -r requirements/edx/testing.txt, execnet appdirs==1.4.4 # via -r requirements/edx/testing.txt, fs, virtualenv astroid==2.3.3 # via -r requirements/edx/testing.txt, pylint, pylint-celery attrs==19.3.0 # via -r requirements/edx/testing.txt, edx-ace, jsonschema, pytest -babel==2.8.0 # via -r requirements/edx/testing.txt, django-babel, django-babel-underscore, sphinx +babel==2.8.0 # via -r requirements/edx/testing.txt, enmerkar, enmerkar-underscore, sphinx beautifulsoup4==4.9.1 # via -r requirements/edx/testing.txt, pynliner billiard==3.3.0.23 # via -r requirements/edx/testing.txt, celery bleach==3.1.5 # via -r requirements/edx/testing.txt, edx-enterprise, lti-consumer-xblock, ora2 @@ -39,7 +39,7 @@ boto==2.39.0 # via -r requirements/edx/testing.txt, django-ses, edx botocore==1.8.17 # via -r requirements/edx/testing.txt, boto3, s3transfer bridgekeeper==0.8 # via -r requirements/edx/testing.txt celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise -certifi==2020.4.5.1 # via -r requirements/edx/testing.txt, requests +certifi==2020.4.5.2 # via -r requirements/edx/testing.txt, requests cffi==1.14.0 # via -r requirements/edx/testing.txt, cryptography chardet==3.0.4 # via -r requirements/edx/testing.txt, pdfminer.six, pysrt, requests chem==1.2.0 # via -r requirements/edx/testing.txt @@ -51,18 +51,17 @@ contextlib2==0.6.0.post1 # via -r requirements/edx/testing.txt coreapi==2.3.3 # via -r requirements/edx/testing.txt, drf-yasg coreschema==0.0.4 # via -r requirements/edx/testing.txt, coreapi, drf-yasg coverage==5.1 # via -r requirements/edx/testing.txt, pytest-cov +git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.txt crowdsourcehinter-xblock==0.6 # via -r requirements/edx/testing.txt cryptography==2.9.2 # via -r requirements/edx/testing.txt, django-fernet-fields, edx-enterprise, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts -defusedxml==0.6.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.7.0rc1 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==3.0.1 # via -r requirements/edx/testing.txt distlib==0.3.0 # via -r requirements/edx/testing.txt, virtualenv django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n -git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/testing.txt -git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/testing.txt django-celery==3.3.1 # via -r requirements/edx/testing.txt django-classy-tags==1.0.0 # via -r requirements/edx/testing.txt, django-sekizai django-config-models==2.0.2 # via -r requirements/edx/testing.txt, edx-enterprise @@ -72,14 +71,14 @@ django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requi django-crum==0.7.6 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv django-debug-toolbar==2.2 # via -r requirements/edx/development.in django-fernet-fields==0.6 # via -r requirements/edx/testing.txt, edx-enterprise, edxval -django-filter==2.2.0 # via -r requirements/edx/testing.txt, edx-enterprise +django-filter==2.3.0 # via -r requirements/edx/testing.txt, edx-enterprise django-ipware==2.1.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring django-js-asset==1.2.2 # via -r requirements/edx/testing.txt, django-mptt django-method-override==1.0.4 # via -r requirements/edx/testing.txt django-model-utils==4.0.0 # via -r requirements/edx/testing.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv django-mptt==0.11.0 # via -r requirements/edx/testing.txt, django-wiki django-multi-email-field==0.6.1 # via -r requirements/edx/testing.txt, edx-enterprise -django-mysql==3.5.0 # via -r requirements/edx/testing.txt +django-mysql==3.6.0 # via -r requirements/edx/testing.txt django-oauth-toolkit==1.3.2 # via -r requirements/edx/testing.txt django-object-actions==2.0.0 # via -r requirements/edx/testing.txt, edx-enterprise django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt @@ -95,7 +94,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi django-user-tasks==1.1.0 # via -r requirements/edx/testing.txt django-waffle==0.18.0 # via -r requirements/edx/testing.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring django-webpack-loader==0.7.0 # via -r requirements/edx/testing.txt, edx-proctoring -django==2.2.13 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils +django==2.2.13 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, code-annotations, django-appconf, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, enmerkar, enmerkar-underscore, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils djangorestframework-xml==2.0.0 # via -r requirements/edx/testing.txt, edx-enterprise djangorestframework==3.9.4 # via -r requirements/edx/testing.txt, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv docopt==0.6.2 # via -r requirements/edx/testing.txt, xmodule @@ -113,7 +112,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt edx-django-utils==3.2.3 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.0.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.2.21 # via -r requirements/edx/testing.txt +edx-enterprise==3.2.22 # via -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.4.1 # via -r requirements/edx/testing.txt edx-milestones==0.3.0 # via -r requirements/edx/testing.txt @@ -126,12 +125,14 @@ edx-rest-api-client==5.2.1 # via -r requirements/edx/testing.txt, edx-enterpris edx-search==1.3.4 # via -r requirements/edx/testing.txt edx-sga==0.11.0 # via -r requirements/edx/testing.txt edx-sphinx-theme==1.5.0 # via -r requirements/edx/development.in -edx-submissions==3.1.9 # via -r requirements/edx/testing.txt, ora2 +edx-submissions==3.1.10 # via -r requirements/edx/testing.txt, ora2 edx-tincan-py35==0.0.5 # via -r requirements/edx/testing.txt, edx-enterprise edx-user-state-client==1.2.0 # via -r requirements/edx/testing.txt -edx-when==1.2.4 # via -r requirements/edx/testing.txt, edx-proctoring +edx-when==1.2.7 # via -r requirements/edx/testing.txt, edx-proctoring edxval==1.3.5 # via -r requirements/edx/testing.txt elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search +enmerkar-underscore==1.0.0 # via -r requirements/edx/testing.txt +enmerkar==0.7.1 # via -r requirements/edx/testing.txt, enmerkar-underscore enum34==1.1.10 # via -r requirements/edx/testing.txt, edxval event-tracking==0.3.2 # via -r requirements/edx/testing.txt, edx-proctoring, edx-search execnet==1.7.1 # via -r requirements/edx/testing.txt, pytest-xdist @@ -139,7 +140,7 @@ factory-boy==2.8.1 # via -c requirements/edx/../constraints.txt, -r requi faker==4.1.0 # via -r requirements/edx/testing.txt, factory-boy filelock==3.0.12 # via -r requirements/edx/testing.txt, tox, virtualenv flake8-polyfill==1.0.2 # via -r requirements/edx/testing.txt, radon -flake8==3.8.2 # via -r requirements/edx/testing.txt, flake8-polyfill +flake8==3.8.3 # via -r requirements/edx/testing.txt, flake8-polyfill freezegun==0.3.12 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt fs-s3fs==0.1.8 # via -r requirements/edx/testing.txt, django-pyfs fs==2.0.18 # via -r requirements/edx/testing.txt, django-pyfs, fs-s3fs, xblock @@ -153,10 +154,10 @@ httpretty==0.9.7 # via -c requirements/edx/../constraints.txt, -r requi icalendar==4.0.6 # via -r requirements/edx/testing.txt idna==2.9 # via -r requirements/edx/testing.txt, requests imagesize==1.2.0 # via sphinx -importlib-metadata==1.6.0 # via -r requirements/edx/testing.txt, flake8, importlib-resources, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv +importlib-metadata==1.6.1 # via -r requirements/edx/testing.txt, flake8, importlib-resources, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv importlib-resources==1.5.0 # via -r requirements/edx/testing.txt, virtualenv inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, jinja2-pluralize -inflection==0.4.0 # via -r requirements/edx/testing.txt, drf-yasg +inflection==0.5.0 # via -r requirements/edx/testing.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/testing.txt isodate==0.6.0 # via -r requirements/edx/testing.txt, python3-saml isort==4.3.21 # via -r requirements/edx/testing.txt, pylint @@ -182,7 +183,7 @@ mailsnake==1.6.4 # via -r requirements/edx/testing.txt mako==1.0.2 # via -r requirements/edx/testing.txt, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils mando==0.6.4 # via -r requirements/edx/testing.txt, radon markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-wiki, staff-graded-xblock, xblock-poll -markey==0.8 # via -r requirements/edx/testing.txt, django-babel-underscore +markey==0.8 # via -r requirements/edx/testing.txt, enmerkar-underscore markupsafe==1.1.1 # via -r requirements/edx/testing.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via -r requirements/edx/testing.txt, geoip2 mccabe==0.6.1 # via -r requirements/edx/testing.txt, flake8, pylint @@ -260,7 +261,7 @@ radon==4.1.0 # via -r requirements/edx/testing.txt random2==1.0.1 # via -r requirements/edx/testing.txt recommender-xblock==1.4.8 # via -r requirements/edx/testing.txt redis==2.10.6 # via -r requirements/edx/testing.txt -regex==2020.5.14 # via -r requirements/edx/testing.txt, nltk +regex==2020.6.8 # via -r requirements/edx/testing.txt, nltk requests-oauthlib==1.3.0 # via -r requirements/edx/testing.txt, social-auth-core requests==2.23.0 # via -r requirements/edx/testing.txt, analytics-python, coreapi, django-oauth-toolkit, edx-analytics-data-api-client, edx-bulk-grades, edx-drf-extensions, edx-enterprise, edx-rest-api-client, geoip2, mailsnake, pyjwkest, python-swiftclient, requests-oauthlib, sailthru-client, slumber, social-auth-core, sphinx, transifex-client rest-condition==1.0.3 # via -r requirements/edx/testing.txt, edx-drf-extensions @@ -276,14 +277,14 @@ semantic-version==2.8.5 # via -r requirements/edx/testing.txt, edx-drf-extensi shapely==1.7.0 # via -r requirements/edx/testing.txt simplejson==3.17.0 # via -r requirements/edx/testing.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.txt -six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock +six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock slumber==0.7.1 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client snowballstemmer==2.0.0 # via sphinx social-auth-core==3.3.3 # via -r requirements/edx/testing.txt, social-auth-app-django sorl-thumbnail==12.6.3 # via -r requirements/edx/testing.txt -sortedcontainers==2.1.0 # via -r requirements/edx/testing.txt, pdfminer.six +sortedcontainers==2.2.2 # via -r requirements/edx/testing.txt, pdfminer.six soupsieve==2.0.1 # via -r requirements/edx/testing.txt, beautifulsoup4 -sphinx==3.0.4 # via edx-sphinx-theme, sphinxcontrib-httpdomain +sphinx==3.1.0 # via edx-sphinx-theme, sphinxcontrib-httpdomain sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx sphinxcontrib-htmlhelp==1.0.3 # via sphinx @@ -301,13 +302,12 @@ testfixtures==6.14.1 # via -r requirements/edx/testing.txt, edx-enterprise text-unidecode==1.3 # via -r requirements/edx/testing.txt, faker, python-slugify toml==0.10.1 # via -r requirements/edx/testing.txt, tox tox-battery==0.6.1 # via -r requirements/edx/testing.txt -tox==3.15.1 # via -r requirements/edx/testing.txt, tox-battery +tox==3.15.2 # via -r requirements/edx/testing.txt, tox-battery tqdm==4.46.1 # via -r requirements/edx/testing.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.txt -git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.txt +unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/testing.txt @@ -315,8 +315,8 @@ virtualenv==20.0.21 # via -r requirements/edx/testing.txt, tox voluptuous==0.11.7 # via -r requirements/edx/testing.txt, ora2 vulture==1.5 # via -r requirements/edx/development.in watchdog==0.10.2 # via -r requirements/edx/testing.txt -wcwidth==0.2.3 # via -r requirements/edx/testing.txt, pytest -web-fragments==0.3.2 # via -r requirements/edx/testing.txt, staff-graded-xblock, xblock, xblock-utils +wcwidth==0.2.4 # via -r requirements/edx/testing.txt, pytest +web-fragments==0.3.2 # via -r requirements/edx/testing.txt, crowdsourcehinter-xblock, staff-graded-xblock, xblock, xblock-utils webencodings==0.5.1 # via -r requirements/edx/testing.txt, bleach, html5lib webob==1.8.6 # via -r requirements/edx/testing.txt, xblock, xmodule wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, astroid diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt index 2191351d5b..bc97368c7b 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1 +1 @@ -django==2.2.13 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils +django==2.2.13 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, code-annotations, django-appconf, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, enmerkar, enmerkar-underscore, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 0bcaee9ba0..6fee8dceed 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -61,14 +61,6 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 # The latest 2.0.0 release doesn't yet support Django 2.2, this commit from master does -e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit -# Underscore template extractor for django-babel/enmerkar -# This fork adds django>1.11 and django<3 compatibility. -git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 - -# Internationalization utilities -# Our django-babel-underscore fork above does not yet work with the newer enmerkar PyPI releases (BOM-1637) -git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 - # Forked to get Django 2.2 support from unreleased master branch from social-app-django repo. # This can be removed once an official social-auth-app-django Pypi release with Django 2.2 support is available in the future. -e git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 1321da6e83..b96b12c8f5 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,11 +4,11 @@ # # make upgrade # -certifi==2020.4.5.1 # via requests +certifi==2020.4.5.2 # via requests chardet==3.0.4 # via requests edx-opaque-keys==2.1.0 # via -r requirements/edx/paver.in idna==2.9 # via requests -importlib-metadata==1.6.0 # via path +importlib-metadata==1.6.1 # via path lazy==1.4 # via -r requirements/edx/paver.in libsass==0.10.0 # via -r requirements/edx/paver.in markupsafe==1.1.1 # via -r requirements/edx/paver.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 7a4349a53f..87c450d3f6 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -28,7 +28,7 @@ apipkg==1.5 # via execnet appdirs==1.4.4 # via -r requirements/edx/base.txt, fs, virtualenv astroid==2.3.3 # via pylint, pylint-celery attrs==19.3.0 # via -r requirements/edx/base.txt, edx-ace, pytest -babel==2.8.0 # via -r requirements/edx/base.txt, django-babel, django-babel-underscore +babel==2.8.0 # via -r requirements/edx/base.txt, enmerkar, enmerkar-underscore beautifulsoup4==4.9.1 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, pynliner billiard==3.3.0.23 # via -r requirements/edx/base.txt, celery bleach==3.1.5 # via -r requirements/edx/base.txt, edx-enterprise, lti-consumer-xblock, ora2 @@ -38,7 +38,7 @@ boto==2.39.0 # via -r requirements/edx/base.txt, django-ses, edxval botocore==1.8.17 # via -r requirements/edx/base.txt, boto3, s3transfer bridgekeeper==0.8 # via -r requirements/edx/base.txt celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise -certifi==2020.4.5.1 # via -r requirements/edx/base.txt, requests +certifi==2020.4.5.2 # via -r requirements/edx/base.txt, requests cffi==1.14.0 # via -r requirements/edx/base.txt, cryptography chardet==3.0.4 # via -r requirements/edx/base.txt, pdfminer.six, pysrt, requests chem==1.2.0 # via -r requirements/edx/base.txt @@ -50,18 +50,17 @@ contextlib2==0.6.0.post1 # via -r requirements/edx/base.txt coreapi==2.3.3 # via -r requirements/edx/base.txt, drf-yasg coreschema==0.0.4 # via -r requirements/edx/base.txt, coreapi, drf-yasg coverage==5.1 # via -r requirements/edx/coverage.txt, pytest-cov +git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.in crowdsourcehinter-xblock==0.6 # via -r requirements/edx/base.txt cryptography==2.9.2 # via -r requirements/edx/base.txt, django-fernet-fields, edx-enterprise, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts -defusedxml==0.6.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.7.0rc1 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==3.0.1 # via -r requirements/edx/coverage.txt distlib==0.3.0 # via virtualenv django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n -git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/base.txt -git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/base.txt django-celery==3.3.1 # via -r requirements/edx/base.txt django-classy-tags==1.0.0 # via -r requirements/edx/base.txt, django-sekizai django-config-models==2.0.2 # via -r requirements/edx/base.txt, edx-enterprise @@ -70,14 +69,14 @@ django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r req django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise django-crum==0.7.6 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv django-fernet-fields==0.6 # via -r requirements/edx/base.txt, edx-enterprise, edxval -django-filter==2.2.0 # via -r requirements/edx/base.txt, edx-enterprise +django-filter==2.3.0 # via -r requirements/edx/base.txt, edx-enterprise django-ipware==2.1.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring django-js-asset==1.2.2 # via -r requirements/edx/base.txt, django-mptt django-method-override==1.0.4 # via -r requirements/edx/base.txt django-model-utils==4.0.0 # via -r requirements/edx/base.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv django-mptt==0.11.0 # via -r requirements/edx/base.txt, django-wiki django-multi-email-field==0.6.1 # via -r requirements/edx/base.txt, edx-enterprise -django-mysql==3.5.0 # via -r requirements/edx/base.txt +django-mysql==3.6.0 # via -r requirements/edx/base.txt django-oauth-toolkit==1.3.2 # via -r requirements/edx/base.txt django-object-actions==2.0.0 # via -r requirements/edx/base.txt, edx-enterprise django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt @@ -110,7 +109,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt edx-django-utils==3.2.3 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.0.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.2.21 # via -r requirements/edx/base.txt +edx-enterprise==3.2.22 # via -r requirements/edx/base.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2 edx-lint==1.4.1 # via -r requirements/edx/testing.in edx-milestones==0.3.0 # via -r requirements/edx/base.txt @@ -122,12 +121,14 @@ edx-rbac==1.2.1 # via -r requirements/edx/base.txt, edx-enterprise edx-rest-api-client==5.2.1 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring edx-search==1.3.4 # via -r requirements/edx/base.txt edx-sga==0.11.0 # via -r requirements/edx/base.txt -edx-submissions==3.1.9 # via -r requirements/edx/base.txt, ora2 +edx-submissions==3.1.10 # via -r requirements/edx/base.txt, ora2 edx-tincan-py35==0.0.5 # via -r requirements/edx/base.txt, edx-enterprise edx-user-state-client==1.2.0 # via -r requirements/edx/base.txt -edx-when==1.2.4 # via -r requirements/edx/base.txt, edx-proctoring +edx-when==1.2.7 # via -r requirements/edx/base.txt, edx-proctoring edxval==1.3.5 # via -r requirements/edx/base.txt elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search +enmerkar-underscore==1.0.0 # via -r requirements/edx/base.txt +enmerkar==0.7.1 # via -r requirements/edx/base.txt, enmerkar-underscore enum34==1.1.10 # via -r requirements/edx/base.txt, edxval event-tracking==0.3.2 # via -r requirements/edx/base.txt, edx-proctoring, edx-search execnet==1.7.1 # via pytest-xdist @@ -135,7 +136,7 @@ factory-boy==2.8.1 # via -c requirements/edx/../constraints.txt, -r requi faker==4.1.0 # via factory-boy filelock==3.0.12 # via tox, virtualenv flake8-polyfill==1.0.2 # via radon -flake8==3.8.2 # via flake8-polyfill +flake8==3.8.3 # via flake8-polyfill freezegun==0.3.12 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in fs-s3fs==0.1.8 # via -r requirements/edx/base.txt, django-pyfs fs==2.0.18 # via -r requirements/edx/base.txt, django-pyfs, fs-s3fs, xblock @@ -148,10 +149,10 @@ html5lib==1.0.1 # via -r requirements/edx/base.txt, ora2 httpretty==0.9.7 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in icalendar==4.0.6 # via -r requirements/edx/base.txt idna==2.9 # via -r requirements/edx/base.txt, requests -importlib-metadata==1.6.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, flake8, importlib-resources, inflect, path, pluggy, pytest, pytest-randomly, tox, virtualenv +importlib-metadata==1.6.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, flake8, importlib-resources, inflect, path, pluggy, pytest, pytest-randomly, tox, virtualenv importlib-resources==1.5.0 # via virtualenv inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, jinja2-pluralize -inflection==0.4.0 # via -r requirements/edx/base.txt, drf-yasg +inflection==0.5.0 # via -r requirements/edx/base.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/base.txt isodate==0.6.0 # via -r requirements/edx/base.txt, python3-saml isort==4.3.21 # via -r requirements/edx/testing.in, pylint @@ -175,7 +176,7 @@ mailsnake==1.6.4 # via -r requirements/edx/base.txt mako==1.0.2 # via -r requirements/edx/base.txt, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils mando==0.6.4 # via radon markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-wiki, staff-graded-xblock, xblock-poll -markey==0.8 # via -r requirements/edx/base.txt, django-babel-underscore +markey==0.8 # via -r requirements/edx/base.txt, enmerkar-underscore markupsafe==1.1.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via -r requirements/edx/base.txt, geoip2 mccabe==0.6.1 # via flake8, pylint @@ -249,7 +250,7 @@ radon==4.1.0 # via -r requirements/edx/testing.in random2==1.0.1 # via -r requirements/edx/base.txt recommender-xblock==1.4.8 # via -r requirements/edx/base.txt redis==2.10.6 # via -r requirements/edx/base.txt -regex==2020.5.14 # via -r requirements/edx/base.txt, nltk +regex==2020.6.8 # via -r requirements/edx/base.txt, nltk requests-oauthlib==1.3.0 # via -r requirements/edx/base.txt, social-auth-core requests==2.23.0 # via -r requirements/edx/base.txt, analytics-python, coreapi, django-oauth-toolkit, edx-analytics-data-api-client, edx-bulk-grades, edx-drf-extensions, edx-enterprise, edx-rest-api-client, geoip2, mailsnake, pyjwkest, python-swiftclient, requests-oauthlib, sailthru-client, slumber, social-auth-core, transifex-client rest-condition==1.0.3 # via -r requirements/edx/base.txt, edx-drf-extensions @@ -265,11 +266,11 @@ semantic-version==2.8.5 # via -r requirements/edx/base.txt, edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/base.txt simplejson==3.17.0 # via -r requirements/edx/base.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.in -six==1.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock +six==1.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock slumber==0.7.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client social-auth-core==3.3.3 # via -r requirements/edx/base.txt, social-auth-app-django sorl-thumbnail==12.6.3 # via -r requirements/edx/base.txt -sortedcontainers==2.1.0 # via -r requirements/edx/base.txt, pdfminer.six +sortedcontainers==2.2.2 # via -r requirements/edx/base.txt, pdfminer.six soupsieve==2.0.1 # via -r requirements/edx/base.txt, beautifulsoup4 sqlparse==0.3.1 # via -r requirements/edx/base.txt, django staff-graded-xblock==0.8 # via -r requirements/edx/base.txt @@ -280,21 +281,20 @@ testfixtures==6.14.1 # via -r requirements/edx/base.txt, -r requirements/ed text-unidecode==1.3 # via -r requirements/edx/base.txt, faker, python-slugify toml==0.10.1 # via tox tox-battery==0.6.1 # via -r requirements/edx/testing.in -tox==3.15.1 # via -r requirements/edx/testing.in, tox-battery +tox==3.15.2 # via -r requirements/edx/testing.in, tox-battery tqdm==4.46.1 # via -r requirements/edx/base.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in typed-ast==1.4.1 # via astroid unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.in -git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.in +unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/base.txt virtualenv==20.0.21 # via tox voluptuous==0.11.7 # via -r requirements/edx/base.txt, ora2 watchdog==0.10.2 # via -r requirements/edx/base.txt -wcwidth==0.2.3 # via pytest -web-fragments==0.3.2 # via -r requirements/edx/base.txt, staff-graded-xblock, xblock, xblock-utils +wcwidth==0.2.4 # via pytest +web-fragments==0.3.2 # via -r requirements/edx/base.txt, crowdsourcehinter-xblock, staff-graded-xblock, xblock, xblock-utils webencodings==0.5.1 # via -r requirements/edx/base.txt, bleach, html5lib webob==1.8.6 # via -r requirements/edx/base.txt, xblock, xmodule wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, astroid diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index a9987ce0be..ace44bd929 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2020.4.5.1 # via requests +certifi==2020.4.5.2 # via requests chardet==3.0.4 # via requests idna==2.9 # via requests requests==2.23.0 # via -r scripts/xblock/requirements.in