feat: remove enterprise and consent from OPTIONAL_APPS#38209
Merged
feat: remove enterprise and consent from OPTIONAL_APPS#38209
Conversation
pwnage101
force-pushed
the
pwnage101/ENT-11663
branch
2 times, most recently
from
8090b0e to
50b8580
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Updates edx-platform’s enterprise integration to rely on edx-enterprise’s plugin-based app registration (edx-enterprise 6.8.0), preventing duplicate Django app registrations and keeping enterprise feature-detection working with the new AppConfig-based install style.
Changes:
- Bump
edx-enterprisefrom6.7.0to6.8.0across constraints and compiled requirement sets. - Remove
enterpriseandconsentfromOPTIONAL_APPSso they aren’t double-registered when plugins auto-load them. - Update
enterprise_enabled()to detect installation via Django’s app registry rather than a rawsettings.INSTALLED_APPSstring check.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| requirements/edx/base.txt | Updates pinned edx-enterprise to 6.8.0 in base compiled requirements. |
| requirements/edx/development.txt | Updates pinned edx-enterprise to 6.8.0 in development compiled requirements. |
| requirements/edx/doc.txt | Updates pinned edx-enterprise to 6.8.0 in docs compiled requirements. |
| requirements/edx/testing.txt | Updates pinned edx-enterprise to 6.8.0 in testing compiled requirements. |
| requirements/constraints.txt | Pins edx-enterprise to 6.8.0 to control deployment of the enterprise package version. |
| openedx/features/enterprise_support/api.py | Switches enterprise install detection to django.apps.apps.is_installed(...). |
| openedx/envs/common.py | Removes enterprise and consent from OPTIONAL_APPS to avoid duplicate app-label registration. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
kiram15
approved these changes
Mar 25, 2026
pwnage101
force-pushed
the
pwnage101/ENT-11663
branch
from
50b8580 to
de550d0
Compare
Contributor
Author
|
Merged and deployed edx-enterprise 6.8.0, but CI is failing due to missing installing enterprise and consent in the CMS. edx-enterprise 6.8.1 will hopefull fix that: openedx/edx-enterprise#2579 |
iloveagent57
approved these changes
Mar 26, 2026
pwnage101
force-pushed
the
pwnage101/ENT-11663
branch
from
de550d0 to
0889524
Compare
- Remove ('enterprise', None) and ('consent', None) from OPTIONAL_APPS in
openedx/envs/common.py. Now that edx-enterprise registers enterprise and
consent as openedx LMS plugins via entry_points, get_plugin_apps() adds
them to INSTALLED_APPS automatically. Keeping them in OPTIONAL_APPS would
cause duplicate app label errors.
- Update enterprise_enabled() in enterprise_support/api.py to use
django_apps.is_installed('enterprise') instead of the raw string check
'enterprise' in settings.INSTALLED_APPS. The new plugin entry_point-based
registration uses 'enterprise.apps.EnterpriseConfig' (not 'enterprise') in
INSTALLED_APPS, so the raw string check no longer works.
ENT-11663
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
pwnage101
force-pushed
the
pwnage101/ENT-11663
branch
from
0889524 to
d890c7a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
enterpriseandconsentfrom platform INSTALLED_APPS. They'll automatically load as openedx plugins via the plugin framework in edx-enterprise 6.8.0. Keeping them in OPTIONAL_APPS would cause duplicate app label errors.IMPORTANT: bumping edx-enterprise to 6.8.0 AND removing apps from INSTALLED_APPS must happen in the same commit so that they don't end up in different deployments which would either break django startup or accidentally disable enterprise (depending on the merge order).
ENT-11663
Tickets/PRs blocked by this one:
Related: