From b14772055c16688983030cf4fb6a1e37b16f47f2 Mon Sep 17 00:00:00 2001 From: Binod Pant Date: Thu, 6 Aug 2020 12:25:44 -0400 Subject: [PATCH] Canvas integrated_channel from enterpise v3.4.40 (#24699) --- cms/envs/common.py | 1 + lms/envs/common.py | 1 + requirements/constraints.txt | 2 +- requirements/edx/base.txt | 8 ++++---- requirements/edx/development.txt | 8 ++++---- requirements/edx/testing.txt | 8 ++++---- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index 50f406e6e8..258d72994c 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1661,6 +1661,7 @@ OPTIONAL_APPS = ( ('integrated_channels.sap_success_factors', None), ('integrated_channels.xapi', None), ('integrated_channels.cornerstone', None), + ('integrated_channels.canvas', None), ) diff --git a/lms/envs/common.py b/lms/envs/common.py index 27b82867d0..09cc70b8cd 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3178,6 +3178,7 @@ OPTIONAL_APPS = [ ('integrated_channels.sap_success_factors', None), ('integrated_channels.cornerstone', None), ('integrated_channels.xapi', None), + ('integrated_channels.canvas', None), # Required by the Enterprise App ('django_object_actions', None), # https://github.com/crccheck/django-object-actions diff --git a/requirements/constraints.txt b/requirements/constraints.txt index fe6f8980b6..eaccb4f8f7 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -40,7 +40,7 @@ drf-yasg<1.17.1 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.4.38 +edx-enterprise==3.4.40 # Upgrading to 2.12.0 breaks several test classes due to API changes, need to update our code accordingly factory-boy==2.8.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4195413c51..041eb123e7 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -55,7 +55,7 @@ django-config-models==2.0.2 # via -r requirements/edx/base.in, edx-enterprise django-cookies-samesite==0.6.6 # via -r requirements/edx/base.in django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in 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-crum==0.7.7 # 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.3.0 # via -r requirements/edx/base.in, edx-enterprise django-ipware==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise, edx-proctoring @@ -97,9 +97,9 @@ edx-celeryutils==0.5.1 # via -r requirements/edx/base.in, super-csv edx-completion==3.2.4 # via -r requirements/edx/base.in 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.5.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.6.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.4.38 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +edx-enterprise==3.4.40 # via -c requirements/edx/../constraints.txt, -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.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 @@ -245,7 +245,7 @@ wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requi 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-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 +xblock==1.3.1 # via -c requirements/edx/../constraints.txt, -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 xss-utils==0.1.3 # via -r requirements/edx/base.in zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, importlib-metadata diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a10f4a0452..34e40b2c25 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -65,7 +65,7 @@ django-config-models==2.0.2 # via -r requirements/edx/testing.txt, edx-enterpri django-cookies-samesite==0.6.6 # via -r requirements/edx/testing.txt django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise -django-crum==0.7.6 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv +django-crum==0.7.7 # 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.3.0 # via -r requirements/edx/testing.txt, edx-enterprise @@ -108,9 +108,9 @@ edx-celeryutils==0.5.1 # via -r requirements/edx/testing.txt, super-csv edx-completion==3.2.4 # via -r requirements/edx/testing.txt 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.5.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.6.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.4.38 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +edx-enterprise==3.4.40 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.5.0 # via -r requirements/edx/testing.txt edx-milestones==0.3.0 # via -r requirements/edx/testing.txt @@ -319,7 +319,7 @@ wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requi 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-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 +xblock==1.3.1 # via -c requirements/edx/../constraints.txt, -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 xss-utils==0.1.3 # via -r requirements/edx/testing.txt zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata, importlib-resources diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 744b7e2edd..ab2fa95300 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -64,7 +64,7 @@ django-config-models==2.0.2 # via -r requirements/edx/base.txt, edx-enterprise django-cookies-samesite==0.6.6 # via -r requirements/edx/base.txt django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt 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-crum==0.7.7 # 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.3.0 # via -r requirements/edx/base.txt, edx-enterprise django-ipware==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise, edx-proctoring @@ -105,9 +105,9 @@ edx-celeryutils==0.5.1 # via -r requirements/edx/base.txt, super-csv edx-completion==3.2.4 # via -r requirements/edx/base.txt 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.5.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.6.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.4.38 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +edx-enterprise==3.4.40 # via -c requirements/edx/../constraints.txt, -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.5.0 # via -r requirements/edx/testing.in edx-milestones==0.3.0 # via -r requirements/edx/base.txt @@ -297,7 +297,7 @@ wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requi 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-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 +xblock==1.3.1 # via -c requirements/edx/../constraints.txt, -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 xss-utils==0.1.3 # 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, importlib-resources