From 0024f00195e9ddb294e5691aa91aa1a1c6d697b9 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Mon, 2 Mar 2020 11:40:27 -0500 Subject: [PATCH] Constrain django-countries and make upgrade. --- requirements/constraints.txt | 3 +++ requirements/edx-sandbox/py35.txt | 2 +- requirements/edx/base.txt | 16 +++++++--------- requirements/edx/development.txt | 28 +++++++++++++--------------- requirements/edx/django.txt | 2 +- requirements/edx/testing.txt | 18 ++++++++---------- 6 files changed, 33 insertions(+), 36 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c8d8dbf0e3..a1d5016d06 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -79,3 +79,6 @@ wrapt==1.11.* # zipp 2.0.0 requires Python >= 3.6 zipp==1.0.0 + +# It seems like django-countries > 5.5 may cause performance issues for us. +django-countries==5.5 diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 5393a9f971..c3c2514fab 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -11,7 +11,7 @@ cffi==1.14.0 # via -r requirements/edx-sandbox/shared.txt, cryptogr git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx-sandbox/py35.in cryptography==2.8 # via -r requirements/edx-sandbox/shared.txt cycler==0.10.0 # via matplotlib -decorator==4.4.1 # via networkx +decorator==4.4.2 # via networkx kiwisolver==1.1.0 # via matplotlib lxml==4.5.0 # via -r requirements/edx-sandbox/shared.txt markupsafe==1.1.1 # via chem diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 918592b8b3..59ae006d7b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -50,7 +50,7 @@ git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb cryptography==2.8 # via -r requirements/edx/../edx-sandbox/shared.txt, django-fernet-fields, edx-enterprise cssutils==1.0.2 # via pynliner ddt==1.2.2 # via xblock-drag-and-drop-v2, xblock-poll -decorator==4.4.1 # via pycontracts +decorator==4.4.2 # via pycontracts defusedxml==0.5.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/github.in, django-statici18n django-babel-underscore==0.5.2 # via -r requirements/edx/base.in @@ -59,7 +59,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3 django-classy-tags==1.0.0 # via django-sekizai django-config-models==2.0.0 # via -r requirements/edx/base.in, edx-enterprise django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in -django-countries==5.5 # via -r requirements/edx/base.in, edx-enterprise +django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise django-crum==0.7.5 # 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 django-filter==2.2.0 # via -r requirements/edx/base.in, edx-enterprise @@ -85,7 +85,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi django-user-tasks==0.3.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==1.11.28 # via -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-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-oauth2-provider, 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, ora2, rest-condition, super-csv, xss-utils +django==1.11.28 # via -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-wiki, 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, ora2, rest-condition, super-csv, xss-utils djangorestframework-jwt==1.11.0 # via -r requirements/edx/base.in, edx-drf-extensions djangorestframework-xml==1.4.0 # via edx-enterprise djangorestframework==3.9.4 # via -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv @@ -99,7 +99,6 @@ edx-bulk-grades==0.6.6 # via -r requirements/edx/base.in, staff-graded-xblock edx-ccx-keys==1.0.0 # via -r requirements/edx/base.in edx-celeryutils==0.3.2 # via -r requirements/edx/base.in, super-csv edx-completion==3.1.1 # via -r requirements/edx/base.in -edx-django-oauth2-provider==1.3.5 # via edx-organizations, edxval edx-django-release-util==0.3.6 # via -r requirements/edx/base.in edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.in edx-django-utils==3.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client @@ -108,7 +107,7 @@ edx-enterprise==2.4.1 # via -r requirements/edx/base.in edx-i18n-tools==0.5.0 # via ora2 edx-milestones==0.2.6 # via -r requirements/edx/base.in edx-opaque-keys[django]==2.0.1 # 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 -edx-organizations==3.0.0 # via -r requirements/edx/base.in +edx-organizations==4.0.0 # via -r requirements/edx/base.in edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in edx-proctoring==2.3.0 # via -r requirements/edx/base.in, edx-proctoring-proctortrack edx-rbac==1.1.0 # via edx-enterprise @@ -119,7 +118,7 @@ edx-submissions==3.0.4 # via -r requirements/edx/base.in, ora2 edx-tincan-py35==0.0.5 # via edx-enterprise edx-user-state-client==1.1.2 # via -r requirements/edx/base.in edx-when==1.0.2 # via -r requirements/edx/base.in, edx-proctoring -edxval==1.2.3 # via -r requirements/edx/base.in +edxval==1.2.4 # via -r requirements/edx/base.in elasticsearch==1.9.0 # via edx-search enum34==1.1.9 # via edxval event-tracking==0.3.0 # via -r requirements/edx/base.in, edx-proctoring, edx-search @@ -177,7 +176,7 @@ paver==1.3.4 # via -r requirements/edx/paver.txt pbr==5.4.4 # via -r requirements/edx/paver.txt, stevedore pdfminer.six==20200124 # via -r requirements/edx/base.in piexif==1.1.3 # via -r requirements/edx/base.in -pillow==7.0.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations, edxval +pillow==7.0.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations pkgconfig==1.5.1 # via xmlsec polib==1.1.0 # via edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils, edx-drf-extensions @@ -219,7 +218,6 @@ sailthru-client==2.2.3 # via -r requirements/edx/base.in, edx-ace scipy==1.4.1 # via calc, chem semantic-version==2.8.4 # via edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/base.in -shortuuid==0.5.0 # via edx-django-oauth2-provider simplejson==3.17.0 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils six==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, calc, 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, nltk, 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 @@ -227,7 +225,7 @@ social-auth-core==3.2.0 # via -r requirements/edx/base.in, social-auth-app-dja git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail # via -r requirements/edx/github.in sortedcontainers==2.1.0 # via -r requirements/edx/base.in, pdfminer.six soupsieve==2.0 # via beautifulsoup4 -sqlparse==0.3.0 # via -r requirements/edx/base.in +sqlparse==0.3.1 # via -r requirements/edx/base.in staff-graded-xblock==0.7 # via -r requirements/edx/base.in stevedore==1.32.0 # via -r requirements/edx/base.in, -r requirements/edx/paver.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys super-csv==0.9.6 # via -r requirements/edx/base.in, edx-bulk-grades diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ed9847e64f..58bc43fcf8 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -59,7 +59,7 @@ cryptography==2.8 # via -r requirements/edx/testing.txt, django-fernet-f cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner ddt==1.2.2 # via -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll -decorator==4.4.1 # via -r requirements/edx/testing.txt, pycontracts +decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts defusedxml==0.5.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==2.6.0 # via -r requirements/edx/testing.txt distlib==0.3.0 # via -r requirements/edx/testing.txt, virtualenv @@ -70,7 +70,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3 django-classy-tags==1.0.0 # via -r requirements/edx/testing.txt, django-sekizai django-config-models==2.0.0 # via -r requirements/edx/testing.txt, edx-enterprise django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt -django-countries==5.5 # via -r requirements/edx/testing.txt, edx-enterprise +django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise django-crum==0.7.5 # 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 @@ -97,7 +97,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi django-user-tasks==0.3.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==1.11.28 # via -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-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-oauth2-provider, 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, ora2, rest-condition, super-csv, xss-utils +django==1.11.28 # via -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-wiki, 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, ora2, rest-condition, super-csv, xss-utils djangorestframework-jwt==1.11.0 # via -r requirements/edx/testing.txt, edx-drf-extensions djangorestframework-xml==1.4.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-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv @@ -111,7 +111,6 @@ edx-bulk-grades==0.6.6 # via -r requirements/edx/testing.txt, staff-graded-xb edx-ccx-keys==1.0.0 # via -r requirements/edx/testing.txt edx-celeryutils==0.3.2 # via -r requirements/edx/testing.txt, super-csv edx-completion==3.1.1 # via -r requirements/edx/testing.txt -edx-django-oauth2-provider==1.3.5 # via -r requirements/edx/testing.txt, edx-organizations, edxval edx-django-release-util==0.3.6 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/testing.txt edx-django-utils==3.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client @@ -121,7 +120,7 @@ edx-i18n-tools==0.5.0 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.4.1 # via -r requirements/edx/testing.txt edx-milestones==0.2.6 # via -r requirements/edx/testing.txt edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/testing.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 -edx-organizations==3.0.0 # via -r requirements/edx/testing.txt +edx-organizations==4.0.0 # via -r requirements/edx/testing.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt edx-proctoring==2.3.0 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack edx-rbac==1.1.0 # via -r requirements/edx/testing.txt, edx-enterprise @@ -133,7 +132,7 @@ edx-submissions==3.0.4 # 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.1.2 # via -r requirements/edx/testing.txt edx-when==1.0.2 # via -r requirements/edx/testing.txt, edx-proctoring -edxval==1.2.3 # via -r requirements/edx/testing.txt +edxval==1.2.4 # via -r requirements/edx/testing.txt elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search entrypoints==0.3 # via -r requirements/edx/testing.txt, flake8 enum34==1.1.9 # via -r requirements/edx/testing.txt, edxval @@ -158,7 +157,7 @@ httpretty==0.9.7 # 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.5.0 # via -r requirements/edx/testing.txt, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv -importlib-resources==1.0.2 # via -r requirements/edx/testing.txt, virtualenv +importlib-resources==1.1.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.3.1 # via -r requirements/edx/testing.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/testing.txt @@ -213,7 +212,7 @@ paver==1.3.4 # via -r requirements/edx/testing.txt pbr==5.4.4 # via -r requirements/edx/testing.txt, stevedore pdfminer.six==20200124 # via -r requirements/edx/testing.txt piexif==1.1.3 # via -r requirements/edx/testing.txt -pillow==7.0.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations, edxval +pillow==7.0.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations pip-tools==4.5.1 # via -r requirements/edx/pip-tools.txt pkgconfig==1.5.1 # via -r requirements/edx/testing.txt, xmlsec pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox @@ -278,7 +277,6 @@ scipy==1.4.1 # via -r requirements/edx/testing.txt, calc, chem selenium==3.141.0 # via -r requirements/edx/testing.txt, bok-choy semantic-version==2.8.4 # via -r requirements/edx/testing.txt, edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/testing.txt -shortuuid==0.5.0 # via -r requirements/edx/testing.txt, edx-django-oauth2-provider 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.14.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, calc, 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, nltk, 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 @@ -289,15 +287,15 @@ git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef793 sortedcontainers==2.1.0 # via -r requirements/edx/testing.txt, pdfminer.six soupsieve==2.0 # via -r requirements/edx/testing.txt, beautifulsoup4 sphinx==2.4.3 # via edx-sphinx-theme, sphinxcontrib-httpdomain -sphinxcontrib-applehelp==1.0.1 # via sphinx -sphinxcontrib-devhelp==1.0.1 # via sphinx +sphinxcontrib-applehelp==1.0.2 # via sphinx +sphinxcontrib-devhelp==1.0.2 # via sphinx sphinxcontrib-htmlhelp==1.0.3 # via sphinx sphinxcontrib-httpdomain==1.7.0 # via sphinxcontrib-openapi sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-openapi[markdown]==0.6.0 # via -r requirements/edx/development.in -sphinxcontrib-qthelp==1.0.2 # via sphinx -sphinxcontrib-serializinghtml==1.1.3 # via sphinx -sqlparse==0.3.0 # via -r requirements/edx/testing.txt, django-debug-toolbar +sphinxcontrib-qthelp==1.0.3 # via sphinx +sphinxcontrib-serializinghtml==1.1.4 # via sphinx +sqlparse==0.3.1 # via -r requirements/edx/testing.txt, django-debug-toolbar staff-graded-xblock==0.7 # via -r requirements/edx/testing.txt stevedore==1.32.0 # via -r requirements/edx/testing.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys super-csv==0.9.6 # via -r requirements/edx/testing.txt, edx-bulk-grades @@ -329,7 +327,7 @@ xblock-utils==1.2.4 # via -r requirements/edx/testing.txt, edx-sga, lti-co xblock==1.2.9 # via -r requirements/edx/testing.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.3 # via -r requirements/edx/testing.txt, python3-saml xss-utils==0.1.2 # via -r requirements/edx/testing.txt -zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata +zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata, importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt index 84bf6d2104..959fe00f28 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1,2 +1,2 @@ django-oauth-toolkit==1.1.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in -django==1.11.28 # via -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-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-oauth2-provider, 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, ora2, rest-condition, super-csv, xss-utils +django==1.11.28 # via -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-wiki, 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, ora2, rest-condition, super-csv, xss-utils diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 2d6f3ffad2..b8e1e51ae8 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -58,7 +58,7 @@ cryptography==2.8 # via -r requirements/edx/base.txt, django-fernet-fiel cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner ddt==1.2.2 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll -decorator==4.4.1 # via -r requirements/edx/base.txt, pycontracts +decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts defusedxml==0.5.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==2.6.0 # via -r requirements/edx/coverage.txt distlib==0.3.0 # via virtualenv @@ -69,7 +69,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3 django-classy-tags==1.0.0 # via -r requirements/edx/base.txt, django-sekizai django-config-models==2.0.0 # via -r requirements/edx/base.txt, edx-enterprise django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt -django-countries==5.5 # via -r requirements/edx/base.txt, edx-enterprise +django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise django-crum==0.7.5 # 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 django-filter==2.2.0 # via -r requirements/edx/base.txt, edx-enterprise @@ -107,7 +107,6 @@ edx-bulk-grades==0.6.6 # via -r requirements/edx/base.txt, staff-graded-xbloc edx-ccx-keys==1.0.0 # via -r requirements/edx/base.txt edx-celeryutils==0.3.2 # via -r requirements/edx/base.txt, super-csv edx-completion==3.1.1 # via -r requirements/edx/base.txt -edx-django-oauth2-provider==1.3.5 # via -r requirements/edx/base.txt, edx-organizations, edxval edx-django-release-util==0.3.6 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.txt edx-django-utils==3.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client @@ -117,7 +116,7 @@ edx-i18n-tools==0.5.0 # via -r requirements/edx/base.txt, -r requirements/ed edx-lint==1.4.1 # via -r requirements/edx/testing.in edx-milestones==0.2.6 # via -r requirements/edx/base.txt edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/base.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 -edx-organizations==3.0.0 # via -r requirements/edx/base.txt +edx-organizations==4.0.0 # via -r requirements/edx/base.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.txt edx-proctoring==2.3.0 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack edx-rbac==1.1.0 # via -r requirements/edx/base.txt, edx-enterprise @@ -128,7 +127,7 @@ edx-submissions==3.0.4 # 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.1.2 # via -r requirements/edx/base.txt edx-when==1.0.2 # via -r requirements/edx/base.txt, edx-proctoring -edxval==1.2.3 # via -r requirements/edx/base.txt +edxval==1.2.4 # via -r requirements/edx/base.txt elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search entrypoints==0.3 # via flake8 enum34==1.1.9 # via -r requirements/edx/base.txt, edxval @@ -152,7 +151,7 @@ httplib2==0.17.0 # via -r requirements/edx/base.txt, oauth2 httpretty==0.9.7 # via -r requirements/edx/testing.in idna==2.9 # via -r requirements/edx/base.txt, requests importlib-metadata==1.5.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, inflect, path, pluggy, pytest, pytest-randomly, tox, virtualenv -importlib-resources==1.0.2 # via virtualenv +importlib-resources==1.1.0 # via virtualenv inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, jinja2-pluralize inflection==0.3.1 # via -r requirements/edx/base.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/base.txt @@ -204,7 +203,7 @@ paver==1.3.4 # via -r requirements/edx/base.txt pbr==5.4.4 # via -r requirements/edx/base.txt, stevedore pdfminer.six==20200124 # via -r requirements/edx/base.txt piexif==1.1.3 # via -r requirements/edx/base.txt -pillow==7.0.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations, edxval +pillow==7.0.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations pkgconfig==1.5.1 # via -r requirements/edx/base.txt, xmlsec pluggy==0.13.1 # via -r requirements/edx/coverage.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools @@ -266,7 +265,6 @@ scipy==1.4.1 # via -r requirements/edx/base.txt, calc, chem selenium==3.141.0 # via -r requirements/edx/testing.in, bok-choy semantic-version==2.8.4 # via -r requirements/edx/base.txt, edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/base.txt -shortuuid==0.5.0 # via -r requirements/edx/base.txt, edx-django-oauth2-provider 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.14.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, calc, 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, nltk, 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 @@ -275,7 +273,7 @@ social-auth-core==3.2.0 # via -r requirements/edx/base.txt, social-auth-app-dj git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail # via -r requirements/edx/base.txt sortedcontainers==2.1.0 # via -r requirements/edx/base.txt, pdfminer.six soupsieve==2.0 # via -r requirements/edx/base.txt, beautifulsoup4 -sqlparse==0.3.0 # via -r requirements/edx/base.txt +sqlparse==0.3.1 # via -r requirements/edx/base.txt staff-graded-xblock==0.7 # via -r requirements/edx/base.txt stevedore==1.32.0 # via -r requirements/edx/base.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys super-csv==0.9.6 # via -r requirements/edx/base.txt, edx-bulk-grades @@ -306,7 +304,7 @@ xblock-utils==1.2.4 # via -r requirements/edx/base.txt, edx-sga, lti-consu xblock==1.2.9 # via -r requirements/edx/base.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.3 # via -r requirements/edx/base.txt, python3-saml xss-utils==0.1.2 # via -r requirements/edx/base.txt -zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-metadata +zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-metadata, importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools