feat: remove enterprise and consent from OPTIONAL_APPS#196
Merged
pwnage101 merged 1 commit intorelease-ulmofrom Mar 26, 2026
Merged
feat: remove enterprise and consent from OPTIONAL_APPS#196pwnage101 merged 1 commit intorelease-ulmofrom
pwnage101 merged 1 commit intorelease-ulmofrom
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the edx-platform fork to align with upstream enterprise pluginification work by stopping automatic installation of enterprise/consent Django apps and bumping the edx-enterprise dependency.
Changes:
- Bump
edx-enterprisefrom6.7.0to6.8.0across constraints and compiled requirement sets. - Update
enterprise_enabled()to use Django’s app registry (apps.is_installed) instead ofsettings.INSTALLED_APPS. - Remove
enterpriseandconsentfrom LMSOPTIONAL_APPS(leaving integrated/channel integrations entries in place).
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| requirements/edx/base.txt | Bumps pinned edx-enterprise version to 6.8.0. |
| requirements/edx/development.txt | Bumps pinned edx-enterprise version to 6.8.0. |
| requirements/edx/testing.txt | Bumps pinned edx-enterprise version to 6.8.0. |
| requirements/edx/doc.txt | Bumps pinned edx-enterprise version to 6.8.0. |
| requirements/constraints.txt | Updates global constraint for edx-enterprise to 6.8.0. |
| openedx/features/enterprise_support/api.py | Switches enterprise-installed check to django.apps.apps.is_installed. |
| lms/envs/common.py | Removes enterprise/consent from LMS OPTIONAL_APPS and updates comment accordingly. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
pwnage101
force-pushed
the
pwnage101/ENT-11663-edx
branch
2 times, most recently
from
5a0c091 to
19fcdf2
Compare
Member
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 |
- Remove ('enterprise', None) and ('consent', None) from OPTIONAL_APPS in
{lms,cms}/envs/common.py. Now that edx-enterprise registers enterprise and
consent as openedx 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-edx
branch
from
19fcdf2 to
9e57dc8
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
iloveagent57
approved these changes
Mar 26, 2026
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.
edx fork version of the same PR upstream: openedx#38209
ENT-11663