diff --git a/requirements/edx/base.in b/requirements/edx/base.in index ff532c7bef..d263a12622 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -66,7 +66,7 @@ django-splash django-statici18n django-storages django-user-tasks -django-waffle==0.18.0 +django-waffle django-webpack-loader # Used to wire webpack bundles into the django asset pipeline djangorestframework==3.9.4 edx-ace diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 098666a73e..8f8676c225 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -79,7 +79,7 @@ django-splash==0.2.9 # via -r requirements/edx/base.in django-statici18n==1.9.0 # via -r requirements/edx/base.in django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edxval 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-waffle==1.0.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-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 @@ -99,7 +99,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.3.9 # via -r requirements/edx/base.in +edx-enterprise==3.3.11 # 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 @@ -114,7 +114,7 @@ edx-submissions==3.1.11 # 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.8 # via -r requirements/edx/base.in, edx-proctoring -edxval==1.3.6 # via -r requirements/edx/base.in +edxval==1.3.7 # 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 @@ -238,7 +238,7 @@ uritemplate==3.0.1 # via coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/paver.txt, elasticsearch, geoip2, requests 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 +watchdog==0.10.3 # via -r requirements/edx/paver.txt 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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index cc5c6a1957..c6270e000f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -50,7 +50,6 @@ 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 @@ -91,7 +90,7 @@ django-splash==0.2.9 # via -r requirements/edx/testing.txt django-statici18n==1.9.0 # via -r requirements/edx/testing.txt django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edxval 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-waffle==1.0.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-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 @@ -111,7 +110,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.3.9 # via -r requirements/edx/testing.txt +edx-enterprise==3.3.11 # 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 @@ -128,7 +127,7 @@ edx-submissions==3.1.11 # 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.8 # via -r requirements/edx/testing.txt, edx-proctoring -edxval==1.3.6 # via -r requirements/edx/testing.txt +edxval==1.3.7 # 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 @@ -217,7 +216,7 @@ pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pyt polib==1.1.0 # via -r requirements/edx/testing.txt, edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/testing.txt, edx-django-utils py2neo==3.1.2 # via -r requirements/edx/testing.txt -py==1.8.2 # via -r requirements/edx/testing.txt, pytest, tox +py==1.9.0 # via -r requirements/edx/testing.txt, pytest, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.txt, flake8 pycontracts==1.8.14 # via -r requirements/edx/testing.txt, edx-user-state-client pycountry==19.8.18 # via -r requirements/edx/testing.txt @@ -241,7 +240,7 @@ pysrt==1.1.2 # via -r requirements/edx/testing.txt, edxval pytest-attrib==0.1.3 # via -r requirements/edx/testing.txt pytest-cov==2.10.0 # via -r requirements/edx/testing.txt pytest-django==3.8.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt -pytest-forked==1.1.3 # via -r requirements/edx/testing.txt, pytest-xdist +pytest-forked==1.2.0 # via -r requirements/edx/testing.txt, pytest-xdist pytest-json-report==1.2.1 # via -r requirements/edx/testing.txt pytest-metadata==1.8.0 # via -r requirements/edx/testing.txt, pytest-json-report pytest-randomly==3.4.0 # via -r requirements/edx/testing.txt @@ -310,14 +309,15 @@ tqdm==4.46.1 # via -r requirements/edx/testing.txt, nltk transifex-client==0.13.10 # via -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, coverage-pytest-plugin +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 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 virtualenv==20.0.25 # 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 +watchdog==0.10.3 # via -r requirements/edx/testing.txt wcwidth==0.2.5 # 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 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index f46f83f3fe..e6f4230380 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -25,6 +25,6 @@ requests==2.24.0 # via -r requirements/edx/paver.in six==1.15.0 # via edx-opaque-keys, libsass, mock, paver, python-memcached, stevedore stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in, edx-opaque-keys urllib3==1.25.9 # via requests -watchdog==0.10.2 # via -r requirements/edx/paver.in +watchdog==0.10.3 # via -r requirements/edx/paver.in wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in zipp==1.0.0 # via -c requirements/edx/../constraints.txt, importlib-metadata diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 62ce2e059f..13cce4b78d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -49,7 +49,6 @@ 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 @@ -89,7 +88,7 @@ django-splash==0.2.9 # via -r requirements/edx/base.txt django-statici18n==1.9.0 # via -r requirements/edx/base.txt django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edxval django-user-tasks==1.1.0 # via -r requirements/edx/base.txt -django-waffle==0.18.0 # via -r requirements/edx/base.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring +django-waffle==1.0.0 # via -r requirements/edx/base.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring django-webpack-loader==0.7.0 # via -r requirements/edx/base.txt, edx-proctoring djangorestframework-xml==2.0.0 # via -r requirements/edx/base.txt, edx-enterprise djangorestframework==3.9.4 # via -r requirements/edx/base.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 @@ -108,7 +107,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.3.9 # via -r requirements/edx/base.txt +edx-enterprise==3.3.11 # 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 @@ -124,7 +123,7 @@ edx-submissions==3.1.11 # 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.8 # via -r requirements/edx/base.txt, edx-proctoring -edxval==1.3.6 # via -r requirements/edx/base.txt +edxval==1.3.7 # 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 @@ -208,7 +207,7 @@ pluggy==0.13.1 # via -r requirements/edx/coverage.txt, diff-cover, py polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/base.txt, edx-django-utils py2neo==3.1.2 # via -r requirements/edx/base.txt -py==1.8.2 # via pytest, tox +py==1.9.0 # via pytest, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.in, flake8 pycontracts==1.8.14 # via -r requirements/edx/base.txt, edx-user-state-client pycountry==19.8.18 # via -r requirements/edx/base.txt @@ -231,7 +230,7 @@ pysrt==1.1.2 # via -r requirements/edx/base.txt, edxval pytest-attrib==0.1.3 # via -r requirements/edx/testing.in pytest-cov==2.10.0 # via -r requirements/edx/testing.in pytest-django==3.8.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in -pytest-forked==1.1.3 # via pytest-xdist +pytest-forked==1.2.0 # via pytest-xdist pytest-json-report==1.2.1 # via -r requirements/edx/testing.in pytest-metadata==1.8.0 # via -r requirements/edx/testing.in, pytest-json-report pytest-randomly==3.4.0 # via -r requirements/edx/testing.in @@ -289,13 +288,14 @@ tqdm==4.46.1 # via -r requirements/edx/base.txt, nltk transifex-client==0.13.10 # via -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, coverage-pytest-plugin +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 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.25 # via tox voluptuous==0.11.7 # via -r requirements/edx/base.txt, ora2 -watchdog==0.10.2 # via -r requirements/edx/base.txt +watchdog==0.10.3 # via -r requirements/edx/base.txt wcwidth==0.2.5 # 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