From 135e9acf5fb33572bb16e1fba52c8a63f02dd17f Mon Sep 17 00:00:00 2001 From: Alex Dusenbery Date: Mon, 25 Jan 2021 09:09:02 -0500 Subject: [PATCH] Update edx-enterprise to 3.17.11 and edx-rbac to 1.4.1; Adds an optional applies_to_all_contexts field to the SystemWideRoleAssignment model. --- ...deroleassignment_applies_to_all_contexts.py | 18 ++++++++++++++++++ requirements/constraints.txt | 2 +- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/testing.txt | 4 ++-- 5 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 openedx/core/djangoapps/system_wide_roles/migrations/0003_systemwideroleassignment_applies_to_all_contexts.py diff --git a/openedx/core/djangoapps/system_wide_roles/migrations/0003_systemwideroleassignment_applies_to_all_contexts.py b/openedx/core/djangoapps/system_wide_roles/migrations/0003_systemwideroleassignment_applies_to_all_contexts.py new file mode 100644 index 0000000000..7ee845f115 --- /dev/null +++ b/openedx/core/djangoapps/system_wide_roles/migrations/0003_systemwideroleassignment_applies_to_all_contexts.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.17 on 2021-01-21 21:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('system_wide_roles', '0002_add_system_wide_student_support_role'), + ] + + operations = [ + migrations.AddField( + model_name='systemwideroleassignment', + name='applies_to_all_contexts', + field=models.BooleanField(default=False, help_text='If true, indicates that the user is effectively assigned their role for any and all contexts. Defaults to False.'), + ), + ] diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 31fbe26903..f53830396c 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -37,7 +37,7 @@ django-storages<1.9 # 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.17.10 +edx-enterprise==3.17.11 # 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 a7d7f04b17..18104959e5 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -98,7 +98,7 @@ edx-django-release-util==1.0.0 # via -r requirements/edx/base.in edx-django-sites-extensions==3.0.0 # via -r requirements/edx/base.in edx-django-utils==3.13.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2, super-csv edx-drf-extensions==6.4.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.17.10 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +edx-enterprise==3.17.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in edx-event-routing-backends==4.0.1 # 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 @@ -106,7 +106,7 @@ edx-opaque-keys[django]==2.1.1 # via -r requirements/edx/paver.txt, edx-bulk-gr edx-organizations==6.7.1 # via -r requirements/edx/base.in edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in edx-proctoring==2.5.13 # via -r requirements/edx/base.in, edx-proctoring-proctortrack -edx-rbac==1.3.4 # via edx-enterprise +edx-rbac==1.4.1 # via edx-enterprise edx-rest-api-client==5.3.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring edx-search==3.0.0 # via -r requirements/edx/base.in edx-sga==0.13.1 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 0673bdd29f..7a58fcad13 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -109,7 +109,7 @@ edx-django-release-util==1.0.0 # via -r requirements/edx/testing.txt edx-django-sites-extensions==3.0.0 # via -r requirements/edx/testing.txt edx-django-utils==3.13.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2, super-csv edx-drf-extensions==6.4.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.17.10 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +edx-enterprise==3.17.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-event-routing-backends==4.0.1 # via -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 edx-lint==3.0 # via -r requirements/edx/testing.txt @@ -118,7 +118,7 @@ edx-opaque-keys[django]==2.1.1 # via -r requirements/edx/testing.txt, edx-bulk- edx-organizations==6.7.1 # via -r requirements/edx/testing.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt edx-proctoring==2.5.13 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack -edx-rbac==1.3.4 # via -r requirements/edx/testing.txt, edx-enterprise +edx-rbac==1.4.1 # via -r requirements/edx/testing.txt, edx-enterprise edx-rest-api-client==5.3.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring edx-search==3.0.0 # via -r requirements/edx/testing.txt edx-sga==0.13.1 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4464aa3c3e..5ee06da97d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -106,7 +106,7 @@ edx-django-release-util==1.0.0 # via -r requirements/edx/base.txt edx-django-sites-extensions==3.0.0 # via -r requirements/edx/base.txt edx-django-utils==3.13.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2, super-csv edx-drf-extensions==6.4.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.17.10 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +edx-enterprise==3.17.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt edx-event-routing-backends==4.0.1 # 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==3.0 # via -r requirements/edx/testing.in @@ -115,7 +115,7 @@ edx-opaque-keys[django]==2.1.1 # via -r requirements/edx/base.txt, edx-bulk-gra edx-organizations==6.7.1 # via -r requirements/edx/base.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.txt edx-proctoring==2.5.13 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack -edx-rbac==1.3.4 # via -r requirements/edx/base.txt, edx-enterprise +edx-rbac==1.4.1 # via -r requirements/edx/base.txt, edx-enterprise edx-rest-api-client==5.3.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring edx-search==3.0.0 # via -r requirements/edx/base.txt edx-sga==0.13.1 # via -r requirements/edx/base.txt