From dfb36644c9a88d826fde5e32fd5e2eade33e735e Mon Sep 17 00:00:00 2001
From: Saleem Latif <saleem.latif.ee@gmail.com>
Date: Tue, 15 Dec 2020 19:13:14 +0500
Subject: [PATCH] Upgraded edx-enterprise version to 3.15.0 and updated field
name changed in that version.
---
openedx/features/enterprise_support/api.py | 2 +-
openedx/features/enterprise_support/tests/test_api.py | 2 +-
requirements/constraints.txt | 2 +-
requirements/edx/base.txt | 2 +-
requirements/edx/development.txt | 2 +-
requirements/edx/testing.txt | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py
index 2a2840c85a7..a568ff449ad 100644
--- a/openedx/features/enterprise_support/api.py
+++ b/openedx/features/enterprise_support/api.py
@@ -474,7 +474,7 @@ def enterprise_customer_uuid_for_request(request):
# has an ID equal to the ID we got from the running pipeline or from the
# request tpa_hint URL parameter.
enterprise_customer_uuid = EnterpriseCustomer.objects.get(
- enterprise_customer_identity_provider__provider_id=sso_provider_id
+ enterprise_customer_identity_providers__provider_id=sso_provider_id
).uuid
except EnterpriseCustomer.DoesNotExist:
LOGGER.info(
diff --git a/openedx/features/enterprise_support/tests/test_api.py b/openedx/features/enterprise_support/tests/test_api.py
index fc57271bf3a..ec104a0c73e 100644
--- a/openedx/features/enterprise_support/tests/test_api.py
+++ b/openedx/features/enterprise_support/tests/test_api.py
@@ -403,7 +403,7 @@ class TestEnterpriseApi(EnterpriseServiceMockMixin, CacheIsolationTestCase):
mock_get_enterprise_learner_data,
):
def mock_get_enterprise_customer(**kwargs):
- uuid = kwargs.get('enterprise_customer_identity_provider__provider_id')
+ uuid = kwargs.get('enterprise_customer_identity_providers__provider_id')
if uuid:
return mock.MagicMock(uuid=uuid, user=self.user)
raise Exception
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index eeb3c7206ba..7b1f2d7acef 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -38,7 +38,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.14.1
+edx-enterprise==3.15.0
# We expect v2.0.0 to introduce large breaking changes in the feature toggle API
edx-toggles<2.0.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 274475c39db..5ec14af57c7 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -98,7 +98,7 @@ 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.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.2.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
-edx-enterprise==3.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
+edx-enterprise==3.15.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
edx-event-routing-backends==2.0.0 # 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 b1f5d6590cf..ec6caca15cf 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -109,7 +109,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.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.2.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
-edx-enterprise==3.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
+edx-enterprise==3.15.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
edx-event-routing-backends==2.0.0 # via -r requirements/edx/testing.txt
edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2
edx-lint==1.5.2 # via -r requirements/edx/testing.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index a915cf43ee3..2704b37aec6 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -106,7 +106,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.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.2.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
-edx-enterprise==3.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
+edx-enterprise==3.15.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
edx-event-routing-backends==2.0.0 # 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.5.2 # via -r requirements/edx/testing.in
--
GitLab