From 6d13b2c8175cfdf407d2dc913bd7ba65da9b5e9d Mon Sep 17 00:00:00 2001 From: Alex Dusenbery Date: Wed, 3 Feb 2021 15:53:46 -0500 Subject: [PATCH] edx-enterprise version 3.17.21 Introduce and use a roles_api module, use the roles API in receivers that want to create or delete role assignments. For new learners and admins, associate their user-role with the customer to which they are linked. Does not yet specify the enterprise_customer for deletions. We want to maintain current behavior on deletes until we do a data backfill of that field. So for now, we'll continue to delete all assignments held by the deleted user. Install django-cache-memoize, so that we can memoize roles (not assignments) in the Django cache. --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 3 ++- requirements/edx/development.txt | 7 ++++--- requirements/edx/testing.txt | 7 ++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 10ea62c039..07d2a62f42 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -34,7 +34,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.20 +edx-enterprise==3.17.21 # 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 5507fe8111..8b5c6c71d5 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -48,6 +48,7 @@ ddt==1.4.1 # via xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via pycontracts 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-cache-memoize==0.1.7 # via edx-enterprise django-celery-results==2.0.1 # via -r requirements/edx/base.in django-classy-tags==2.0.0 # via django-sekizai django-config-models==2.1.1 # via -r requirements/edx/base.in, edx-enterprise, edx-event-routing-backends @@ -98,7 +99,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.20 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +edx-enterprise==3.17.21 # 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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 939010c447..2c010f9a97 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -58,6 +58,7 @@ defusedxml==0.6.0 # via -r requirements/edx/testing.txt, djangorestframe diff-cover==4.2.1 # via -r requirements/edx/testing.txt distlib==0.3.1 # via -r requirements/edx/testing.txt, virtualenv django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n +django-cache-memoize==0.1.7 # via -r requirements/edx/testing.txt, edx-enterprise django-celery-results==2.0.1 # via -r requirements/edx/testing.txt django-classy-tags==2.0.0 # via -r requirements/edx/testing.txt, django-sekizai django-config-models==2.1.1 # via -r requirements/edx/testing.txt, edx-enterprise, edx-event-routing-backends @@ -109,7 +110,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.20 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +edx-enterprise==3.17.21 # 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.2 # via -r requirements/edx/testing.txt @@ -135,7 +136,7 @@ enmerkar==0.7.1 # via -r requirements/edx/testing.txt, enmerkar-unders event-tracking==1.0.4 # via -r requirements/edx/testing.txt, edx-event-routing-backends, edx-proctoring, edx-search execnet==1.8.0 # via -r requirements/edx/testing.txt, pytest-xdist factory-boy==2.8.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt -faker==5.8.0 # via -r requirements/edx/testing.txt, factory-boy +faker==6.0.0 # via -r requirements/edx/testing.txt, factory-boy filelock==3.0.12 # via -r requirements/edx/testing.txt, tox, virtualenv freezegun==0.3.12 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt fs-s3fs==0.1.8 # via -r requirements/edx/testing.txt, django-pyfs @@ -295,7 +296,7 @@ text-unidecode==1.3 # via -r requirements/edx/testing.txt, faker, python-s tincan==1.0.0 # via -r requirements/edx/testing.txt, edx-event-routing-backends toml==0.10.2 # via -r requirements/edx/testing.txt, pylint, pytest, tox tox-battery==0.6.1 # via -r requirements/edx/testing.txt -tox==3.21.3 # via -r requirements/edx/testing.txt, tox-battery +tox==3.21.4 # via -r requirements/edx/testing.txt, tox-battery tqdm==4.56.0 # via -r requirements/edx/testing.txt, nltk transifex-client==0.14.2 # via -r requirements/edx/testing.txt ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5964954e62..bb0d0a22c8 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -57,6 +57,7 @@ defusedxml==0.6.0 # via -r requirements/edx/base.txt, djangorestframewor diff-cover==4.2.1 # via -r requirements/edx/coverage.txt distlib==0.3.1 # via virtualenv django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n +django-cache-memoize==0.1.7 # via -r requirements/edx/base.txt, edx-enterprise django-celery-results==2.0.1 # via -r requirements/edx/base.txt django-classy-tags==2.0.0 # via -r requirements/edx/base.txt, django-sekizai django-config-models==2.1.1 # via -r requirements/edx/base.txt, edx-enterprise, edx-event-routing-backends @@ -106,7 +107,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.20 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +edx-enterprise==3.17.21 # 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.2 # via -r requirements/edx/testing.in @@ -131,7 +132,7 @@ enmerkar==0.7.1 # via -r requirements/edx/base.txt, enmerkar-underscor event-tracking==1.0.4 # via -r requirements/edx/base.txt, edx-event-routing-backends, edx-proctoring, edx-search execnet==1.8.0 # via pytest-xdist factory-boy==2.8.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in -faker==5.8.0 # via factory-boy +faker==6.0.0 # via factory-boy filelock==3.0.12 # via tox, virtualenv freezegun==0.3.12 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in fs-s3fs==0.1.8 # via -r requirements/edx/base.txt, django-pyfs @@ -274,7 +275,7 @@ text-unidecode==1.3 # via -r requirements/edx/base.txt, faker, python-slug tincan==1.0.0 # via -r requirements/edx/base.txt, edx-event-routing-backends toml==0.10.2 # via pylint, pytest, tox tox-battery==0.6.1 # via -r requirements/edx/testing.in -tox==3.21.3 # via -r requirements/edx/testing.in, tox-battery +tox==3.21.4 # via -r requirements/edx/testing.in, tox-battery tqdm==4.56.0 # via -r requirements/edx/base.txt, nltk transifex-client==0.14.2 # via -r requirements/edx/testing.in ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite