Merge pull request #16094 from open-craft/uman/ent-0.48.1

[WL-1240] [ENT-640] [ENT-628] [ENT-629] [ENT-630] [ENT-631] [ENT-634] [ENT-644] Bump to edx-enterprise to 0.48.1

cms/envs/aws.py

@@ -247,6 +247,7 @@ LOGGING = get_logger_config(LOG_DIR,
 
 #theming start:
 PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
+PLATFORM_DESCRIPTION = ENV_TOKENS.get('PLATFORM_DESCRIPTION', PLATFORM_DESCRIPTION)
 STUDIO_NAME = ENV_TOKENS.get('STUDIO_NAME', STUDIO_NAME)
 STUDIO_SHORT_NAME = ENV_TOKENS.get('STUDIO_SHORT_NAME', STUDIO_SHORT_NAME)
 

cms/envs/common.py

@@ -48,8 +48,8 @@ from datetime import timedelta
 import lms.envs.common
 # Although this module itself may not use these imported variables, other dependent modules may.
 from lms.envs.common import (
-    USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL, DOC_STORE_CONFIG, DATA_DIR, ALL_LANGUAGES, WIKI_ENABLED,
-    update_module_store_settings, ASSET_IGNORE_REGEX,
+    USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, PLATFORM_DESCRIPTION, BUGS_EMAIL, DOC_STORE_CONFIG, DATA_DIR,
+    ALL_LANGUAGES, WIKI_ENABLED, update_module_store_settings, ASSET_IGNORE_REGEX,
     PARENTAL_CONSENT_AGE_LIMIT, COMPREHENSIVE_THEME_DIRS, REGISTRATION_EMAIL_PATTERNS_ALLOWED,
     # The following PROFILE_IMAGE_* settings are included as they are
     # indirectly accessed through the email opt-in API, which is

common/djangoapps/util/tests/test_db.py

@@ -236,7 +236,4 @@ class MigrationTests(TestCase):
         out = StringIO()
         call_command('makemigrations', dry_run=True, verbosity=3, stdout=out)
         output = out.getvalue()
-        # Temporary for `edx-enterprise` version bumps with migrations.
-        # Please delete when `edx-enterprise==0.47.0`.
-        if 'Remove field' not in output and 'Delete model' not in output:
-            self.assertIn('No changes detected', output)
+        self.assertIn('No changes detected', output)

lms/envs/aws.py

@@ -145,6 +145,7 @@ MEDIA_ROOT = ENV_TOKENS.get('MEDIA_ROOT', MEDIA_ROOT)
 MEDIA_URL = ENV_TOKENS.get('MEDIA_URL', MEDIA_URL)
 
 PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
+PLATFORM_DESCRIPTION = ENV_TOKENS.get('PLATFORM_DESCRIPTION', PLATFORM_DESCRIPTION)
 # For displaying on the receipt. At Stanford PLATFORM_NAME != MERCHANT_NAME, but PLATFORM_NAME is a fine default
 PLATFORM_TWITTER_ACCOUNT = ENV_TOKENS.get('PLATFORM_TWITTER_ACCOUNT', PLATFORM_TWITTER_ACCOUNT)
 PLATFORM_FACEBOOK_ACCOUNT = ENV_TOKENS.get('PLATFORM_FACEBOOK_ACCOUNT', PLATFORM_FACEBOOK_ACCOUNT)
@@ -1004,6 +1005,10 @@ ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE = ENV_TOKENS.get(
     'ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE',
     ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE
 )
+ENTERPRISE_TAGLINE = ENV_TOKENS.get(
+    'ENTERPRISE_TAGLINE',
+    ENTERPRISE_TAGLINE
+)
 ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS = set(
     ENV_TOKENS.get(
         'ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS',

lms/envs/common.py

@@ -47,6 +47,7 @@ from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin
 ################################### FEATURES ###################################
 # The display name of the platform to be used in templates/emails/etc.
 PLATFORM_NAME = _('Your Platform Name Here')
+PLATFORM_DESCRIPTION = _('Your Platform Description Here')
 CC_MERCHANT_NAME = PLATFORM_NAME
 
 PLATFORM_FACEBOOK_ACCOUNT = "http://www.facebook.com/YourPlatformFacebookAccount"
@@ -3271,6 +3272,7 @@ ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE = _(
     '{platform_name}{end_bold} to offer you high-quality learning opportunities '
     'from the world\'s best universities.'
 )
+ENTERPRISE_TAGLINE = ''
 ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS = {
     'age',
     'level_of_education',

openedx/features/enterprise_support/api.py

@@ -171,9 +171,6 @@ class EnterpriseApiClient(object):
                                 },
                                 "enable_data_sharing_consent": true,
                                 "enforce_data_sharing_consent": "at_login",
-                                "enterprise_customer_users": [
-                                    1
-                                ],
                                 "branding_configuration": {
                                     "enterprise_customer": "cf246b88-d5f6-4908-a522-fc307e0b0c59",
                                     "logo": "https://open.edx.org/sites/all/themes/edx_open/logo.png"

openedx/features/enterprise_support/tests/mixins/enterprise.py

@@ -168,9 +168,6 @@ class EnterpriseServiceMockMixin(object):
                         'enable_data_sharing_consent': True,
                         'enforce_data_sharing_consent': 'at_login',
                         'enable_audit_enrollment': enable_audit_enrollment,
-                        'enterprise_customer_users': [
-                            1
-                        ],
                         'branding_configuration': {
                             'enterprise_customer': enterprise_customer_uuid,
                             'logo': 'https://open.edx.org/sites/all/themes/edx_open/logo.png'

requirements/edx/base.txt

@@ -48,7 +48,7 @@ edx-lint==0.4.3
 astroid==1.3.8
 edx-django-oauth2-provider==1.2.5
 edx-django-sites-extensions==2.3.0
-edx-enterprise==0.46.8
+edx-enterprise==0.48.1
 edx-oauth2-provider==1.2.2
 edx-opaque-keys==0.4.0
 edx-organizations==0.4.6