diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5f8e9464fc..0b8653ca1a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,10 @@ Unreleased ---------- * nothing unreleased +[6.8.0] - 2026-03-24 +--------------------- +* feat: register enterprise and consent as openedx LMS plugins (ENT-11663) + [6.7.0] - 2026-03-10 --------------------- * feat: Invite admin endpoints with validation (ENT-11238) diff --git a/consent/apps.py b/consent/apps.py index 8098acd55c..fed5ba49eb 100644 --- a/consent/apps.py +++ b/consent/apps.py @@ -11,6 +11,19 @@ class ConsentConfig(AppConfig): """Configuration for edX Enterprise's Consent application.""" + plugin_app = { + "settings_config": { + "lms.djangoapp": { + "common": { + "relative_path": "settings.common", + }, + "production": { + "relative_path": "settings.production", + }, + }, + }, + } + name = 'consent' verbose_name = "Enterprise Consent" diff --git a/consent/settings/__init__.py b/consent/settings/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/consent/settings/common.py b/consent/settings/common.py new file mode 100644 index 0000000000..2e4668eb4d --- /dev/null +++ b/consent/settings/common.py @@ -0,0 +1,15 @@ +""" +Common plugin settings for the consent app. +""" + + +def plugin_settings(settings): # pylint: disable=unused-argument + """ + Override platform settings for the consent app. + + This is called by the Open edX plugin system during LMS/CMS startup. Add + any Django settings overrides here (e.g. ``settings.FEATURES['...'] = True``). + + Args: + settings: The Django settings module being configured. + """ diff --git a/consent/settings/production.py b/consent/settings/production.py new file mode 100644 index 0000000000..2d0326dcf1 --- /dev/null +++ b/consent/settings/production.py @@ -0,0 +1,5 @@ +""" +Production plugin settings for the consent app. +""" + +from consent.settings.common import plugin_settings # noqa: F401 pylint: disable=unused-import diff --git a/enterprise/__init__.py b/enterprise/__init__.py index af9a92679e..283edc67b2 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,4 +2,4 @@ Your project description goes here. """ -__version__ = "6.7.0" +__version__ = "6.8.0" diff --git a/enterprise/apps.py b/enterprise/apps.py index cd8e66ac84..de0a7c7dd2 100644 --- a/enterprise/apps.py +++ b/enterprise/apps.py @@ -13,6 +13,19 @@ class EnterpriseConfig(AppConfig): Configuration for the enterprise Django application. """ + plugin_app = { + "settings_config": { + "lms.djangoapp": { + "common": { + "relative_path": "settings.common", + }, + "production": { + "relative_path": "settings.production", + }, + }, + }, + } + name = "enterprise" valid_image_extensions = [".png", ] valid_max_image_size = getattr(settings, 'ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE', 512) # Value in KB's diff --git a/enterprise/settings/common.py b/enterprise/settings/common.py new file mode 100644 index 0000000000..8432d2d945 --- /dev/null +++ b/enterprise/settings/common.py @@ -0,0 +1,15 @@ +""" +Common plugin settings for the enterprise app. +""" + + +def plugin_settings(settings): # pylint: disable=unused-argument + """ + Override platform settings for the enterprise app. + + This is called by the Open edX plugin system during LMS/CMS startup. Add + any Django settings overrides here (e.g. ``settings.FEATURES['...'] = True``). + + Args: + settings: The Django settings module being configured. + """ diff --git a/enterprise/settings/production.py b/enterprise/settings/production.py new file mode 100644 index 0000000000..e68daa1a43 --- /dev/null +++ b/enterprise/settings/production.py @@ -0,0 +1,5 @@ +""" +Production plugin settings for the enterprise app. +""" + +from enterprise.settings.common import plugin_settings # noqa: F401 pylint: disable=unused-import diff --git a/setup.py b/setup.py index 4efa0cc22c..2f12b6ae9b 100755 --- a/setup.py +++ b/setup.py @@ -83,6 +83,12 @@ def get_requirements(requirements_file): setup( name="edx-enterprise", version=VERSION, + entry_points={ + "lms.djangoapp": [ + "enterprise = enterprise.apps:EnterpriseConfig", + "consent = consent.apps:ConsentConfig", + ], + }, description="""Your project description goes here""", long_description=f"{README}\n\n{CHANGELOG}", author="edX",