From 6fedb15cc4b9ef90f59d73fd06aa4e419c0fc43c Mon Sep 17 00:00:00 2001 From: Farhanah Sheets Date: Mon, 15 Jun 2020 16:48:12 -0400 Subject: [PATCH] Revert "BOM-1703 : Ora2 Upgrade (#24221)" This reverts commit f3161468a3f4558542d6279f01025ee318125480. --- requirements/edx/base.in | 1 - requirements/edx/base.txt | 15 +++++++-------- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 23 +++++++++++------------ requirements/edx/django.txt | 2 +- requirements/edx/github.in | 1 + requirements/edx/paver.txt | 2 +- requirements/edx/testing.txt | 19 +++++++++---------- 8 files changed, 31 insertions(+), 34 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 6e97df7a2d..f2749757cd 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -114,7 +114,6 @@ newrelic # New Relic agent for performance monitoring nodeenv # Utility for managing Node.js environments; we use this for deployments and testing oauthlib # OAuth specification support for authenticating via LTI or other Open edX services openedx-calc # Library supporting mathematical calculations for Open edX -ora2 pdfminer.six # Used in shoppingcart for extracting/parsing pdf text piexif # Exif image metadata manipulation, used in the profile_images app Pillow # Image manipulation library; used for course assets, profile images, invoice PDFs, etc. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8cf12938e5..6ee2eaf5fd 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -49,7 +49,7 @@ 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.7.0rc1 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.6.0 # 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 django-celery==3.3.1 # via -r requirements/edx/base.in django-classy-tags==1.0.0 # via django-sekizai @@ -66,7 +66,7 @@ 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.7.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 @@ -82,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-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, xblock-sdk, 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 @@ -100,14 +100,14 @@ 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.4 # via -r requirements/edx/base.in +edx-enterprise==3.3.2 # 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 edx-organizations==5.2.0 # via -r requirements/edx/base.in edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in edx-proctoring==2.4.2 # via -r requirements/edx/base.in, edx-proctoring-proctortrack -edx-rbac==1.3.0 # via edx-enterprise +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 @@ -158,7 +158,7 @@ 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 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/github.in mongoengine==0.10.0 # via -r requirements/edx/base.in -more-itertools==8.4.0 # via -r requirements/edx/paver.txt, zipp +more-itertools==8.3.0 # via -r requirements/edx/paver.txt, zipp mpmath==1.1.0 # via sympy mysqlclient==1.4.6 # via -r requirements/edx/base.in newrelic==5.14.0.142 # via -r requirements/edx/base.in, edx-django-utils @@ -167,7 +167,7 @@ nodeenv==1.4.0 # via -r requirements/edx/base.in numpy==1.18.5 # via chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/base.in -ora2==2.8.2 # via -r requirements/edx/base.in +git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/github.in packaging==20.4 # via bleach, drf-yasg path.py==12.4.0 # via edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py @@ -245,7 +245,6 @@ webob==1.8.6 # via xblock, xmodule wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/github.in git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/github.in -xblock-sdk==0.2.0 # via ora2 xblock-utils==2.1.1 # via -r requirements/edx/base.in, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive xblock==1.3.1 # via -r requirements/edx/base.in, 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.8 # via python3-saml diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 316c7dff8a..daa9bae6e4 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -11,7 +11,7 @@ inflect==3.0.2 # via -c requirements/edx/../constraints.txt, jinja2-p jinja2-pluralize==0.3.0 # via diff-cover jinja2==2.11.2 # via diff-cover, jinja2-pluralize markupsafe==1.1.1 # via jinja2 -more-itertools==8.4.0 # via zipp +more-itertools==8.3.0 # via zipp pluggy==0.13.1 # via diff-cover pygments==2.6.1 # via diff-cover six==1.15.0 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ba9903c113..08cff1ada7 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -58,7 +58,7 @@ 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.7.0rc1 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.6.0 # 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 @@ -78,7 +78,7 @@ 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.7.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 @@ -94,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-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, xblock-sdk, 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 @@ -112,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.3.4 # via -r requirements/edx/testing.txt +edx-enterprise==3.3.2 # 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 @@ -120,7 +120,7 @@ edx-opaque-keys[django]==2.1.0 # via -r requirements/edx/testing.txt, edx-bulk- edx-organizations==5.2.0 # via -r requirements/edx/testing.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt edx-proctoring==2.4.2 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack -edx-rbac==1.3.0 # via -r requirements/edx/testing.txt, edx-enterprise +edx-rbac==1.2.1 # via -r requirements/edx/testing.txt, edx-enterprise edx-rest-api-client==5.2.1 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring edx-search==1.3.4 # via -r requirements/edx/testing.txt edx-sga==0.11.0 # via -r requirements/edx/testing.txt @@ -157,7 +157,7 @@ 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.1 # via -r requirements/edx/testing.txt, flake8, importlib-resources, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv -importlib-resources==2.0.1 # via -r requirements/edx/testing.txt, 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.5.0 # via -r requirements/edx/testing.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/testing.txt @@ -193,7 +193,7 @@ mistune==0.8.4 # via m2r mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/testing.txt mongoengine==0.10.0 # via -r requirements/edx/testing.txt -more-itertools==8.4.0 # via -r requirements/edx/testing.txt, pytest, zipp +more-itertools==8.3.0 # via -r requirements/edx/testing.txt, pytest, zipp mpmath==1.1.0 # via -r requirements/edx/testing.txt, sympy mysqlclient==1.4.6 # via -r requirements/edx/testing.txt newrelic==5.14.0.142 # via -r requirements/edx/testing.txt, edx-django-utils @@ -202,7 +202,7 @@ nodeenv==1.4.0 # via -r requirements/edx/testing.txt numpy==1.18.5 # via -r requirements/edx/testing.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/testing.txt -ora2==2.8.2 # via -r requirements/edx/testing.txt +git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/testing.txt packaging==20.4 # via -r requirements/edx/testing.txt, bleach, drf-yasg, pytest, sphinx, tox path.py==12.4.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, path.py @@ -240,7 +240,7 @@ pyquery==1.4.1 # via -r requirements/edx/testing.txt pyrsistent==0.16.0 # via jsonschema 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-cov==2.9.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-json-report==1.2.1 # via -r requirements/edx/testing.txt @@ -287,7 +287,7 @@ social-auth-core==3.3.3 # via -r requirements/edx/testing.txt, social-auth-app sorl-thumbnail==12.6.3 # via -r requirements/edx/testing.txt 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.1.1 # 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 @@ -314,7 +314,7 @@ unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest 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.23 # via -r requirements/edx/testing.txt, tox +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 @@ -325,7 +325,6 @@ 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 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/testing.txt git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/testing.txt -xblock-sdk==0.2.0 # via -r requirements/edx/testing.txt, ora2 xblock-utils==2.1.1 # via -r requirements/edx/testing.txt, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive xblock==1.3.1 # 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.8 # via -r requirements/edx/testing.txt, python3-saml diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt index c9501ad0a9..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-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, xblock-sdk, 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 d71b3e601c..6fee8dceed 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -68,6 +68,7 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 # Our libraries: -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock +git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 -e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock -e git+https://github.com/edx/DoneXBlock.git@2.0.2#egg=done-xblock -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index d126eb9a8f..b96b12c8f5 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -13,7 +13,7 @@ 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 mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in -more-itertools==8.4.0 # via zipp +more-itertools==8.3.0 # via zipp path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in pathtools==0.1.2 # via watchdog paver==1.3.4 # via -r requirements/edx/paver.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ab0d412053..ea0088d39c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -57,7 +57,7 @@ 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.7.0rc1 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.6.0 # 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 @@ -76,7 +76,7 @@ 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.7.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 @@ -109,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.3.4 # via -r requirements/edx/base.txt +edx-enterprise==3.3.2 # 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 @@ -117,7 +117,7 @@ edx-opaque-keys[django]==2.1.0 # via -r requirements/edx/base.txt, edx-bulk-gra edx-organizations==5.2.0 # via -r requirements/edx/base.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.txt edx-proctoring==2.4.2 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack -edx-rbac==1.3.0 # via -r requirements/edx/base.txt, edx-enterprise +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 @@ -152,7 +152,7 @@ httpretty==0.9.7 # via -c requirements/edx/../constraints.txt, -r requi icalendar==4.0.6 # via -r requirements/edx/base.txt idna==2.9 # via -r requirements/edx/base.txt, requests 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==2.0.1 # via 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.5.0 # via -r requirements/edx/base.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/base.txt @@ -185,7 +185,7 @@ mccabe==0.6.1 # via flake8, pylint mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, xblock-drag-and-drop-v2, xblock-poll git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/base.txt mongoengine==0.10.0 # via -r requirements/edx/base.txt -more-itertools==8.4.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, pytest, zipp +more-itertools==8.3.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, pytest, zipp mpmath==1.1.0 # via -r requirements/edx/base.txt, sympy mysqlclient==1.4.6 # via -r requirements/edx/base.txt newrelic==5.14.0.142 # via -r requirements/edx/base.txt, edx-django-utils @@ -194,7 +194,7 @@ nodeenv==1.4.0 # via -r requirements/edx/base.txt numpy==1.18.5 # via -r requirements/edx/base.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/base.txt -ora2==2.8.2 # via -r requirements/edx/base.txt +git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/base.txt packaging==20.4 # via -r requirements/edx/base.txt, bleach, drf-yasg, pytest, tox path.py==12.4.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, path.py @@ -230,7 +230,7 @@ pyparsing==2.4.7 # via -r requirements/edx/base.txt, chem, openedx-calc pyquery==1.4.1 # via -r requirements/edx/testing.in 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-cov==2.9.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-json-report==1.2.1 # via -r requirements/edx/testing.in @@ -293,7 +293,7 @@ unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest- 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.23 # via tox +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.4 # via pytest @@ -303,7 +303,6 @@ 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 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/base.txt git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/base.txt -xblock-sdk==0.2.0 # via -r requirements/edx/base.txt, ora2 xblock-utils==2.1.1 # via -r requirements/edx/base.txt, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive xblock==1.3.1 # 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.8 # via -r requirements/edx/base.txt, python3-saml