From 52d03626e270b176544b98c2c585a69c99534844 Mon Sep 17 00:00:00 2001
From: Brittney Exline <bexline@edx.org>
Date: Mon, 17 Jun 2019 14:28:05 -0600
Subject: [PATCH] Version bump for edx-enterprise
---
openedx/features/enterprise_support/api.py | 1 -
openedx/features/enterprise_support/tests/factories.py | 1 -
openedx/features/enterprise_support/tests/mixins/enterprise.py | 2 --
requirements/edx/base.in | 2 +-
requirements/edx/base.txt | 2 +-
requirements/edx/development.txt | 2 +-
requirements/edx/testing.txt | 2 +-
7 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py
index f884ff19aa7..e436867f013 100644
--- a/openedx/features/enterprise_support/api.py
+++ b/openedx/features/enterprise_support/api.py
@@ -187,7 +187,6 @@ class EnterpriseApiClient(object):
"enterprise_customer": {
"uuid": "cf246b88-d5f6-4908-a522-fc307e0b0c59",
"name": "TestShib",
- "catalog": 2,
"active": true,
"site": {
"domain": "example.com",
diff --git a/openedx/features/enterprise_support/tests/factories.py b/openedx/features/enterprise_support/tests/factories.py
index e8d4ffd4b58..0270663541b 100644
--- a/openedx/features/enterprise_support/tests/factories.py
+++ b/openedx/features/enterprise_support/tests/factories.py
@@ -33,7 +33,6 @@ class EnterpriseCustomerFactory(factory.django.DjangoModelFactory):
name = factory.LazyAttribute(lambda x: FAKER.company()) # pylint: disable=no-member
active = True
site = factory.SubFactory(SiteFactory)
- catalog = factory.LazyAttribute(lambda x: FAKER.random_int(min=0, max=1000000)) # pylint: disable=no-member
enable_data_sharing_consent = True
enforce_data_sharing_consent = EnterpriseCustomer.AT_ENROLLMENT
diff --git a/openedx/features/enterprise_support/tests/mixins/enterprise.py b/openedx/features/enterprise_support/tests/mixins/enterprise.py
index 8322f93408b..d17d56e2541 100644
--- a/openedx/features/enterprise_support/tests/mixins/enterprise.py
+++ b/openedx/features/enterprise_support/tests/mixins/enterprise.py
@@ -144,7 +144,6 @@ class EnterpriseServiceMockMixin(object):
def mock_enterprise_learner_api(
self,
- catalog_id=1,
entitlement_id=1,
learner_id=1,
enterprise_customer_uuid='cf246b88-d5f6-4908-a522-fc307e0b0c59',
@@ -163,7 +162,6 @@ class EnterpriseServiceMockMixin(object):
'enterprise_customer': {
'uuid': enterprise_customer_uuid,
'name': 'TestShib',
- 'catalog': catalog_id,
'active': True,
'site': {
'domain': 'example.com',
diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 9efb378c0f4..e91f65332d4 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -75,7 +75,7 @@ edx-django-release-util # Release utils for the edx release pipeline
edx-django-sites-extensions==2.3.1
edx-django-utils
edx-drf-extensions
-edx-enterprise==1.6.7
+edx-enterprise
edx-milestones
edx-oauth2-provider
edx-organizations
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 9b346aa0dbc..eefc45c4f49 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -105,7 +105,7 @@ edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-django-utils==1.0.5
edx-drf-extensions==2.3.1
-edx-enterprise==1.6.7
+edx-enterprise==1.6.13
edx-i18n-tools==0.4.8
edx-milestones==0.2.3
edx-oauth2-provider==1.2.2
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 44ede57687d..aa26a70babd 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -125,7 +125,7 @@ edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-django-utils==1.0.5
edx-drf-extensions==2.3.1
-edx-enterprise==1.6.7
+edx-enterprise==1.6.13
edx-i18n-tools==0.4.8
edx-lint==1.3.0
edx-milestones==0.2.3
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 15155821871..da61fb8b2f5 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -121,7 +121,7 @@ edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-django-utils==1.0.5
edx-drf-extensions==2.3.1
-edx-enterprise==1.6.7
+edx-enterprise==1.6.13
edx-i18n-tools==0.4.8
edx-lint==1.3.0
edx-milestones==0.2.3
--
GitLab