Skip to content

feat: remove enterprise and consent from OPTIONAL_APPS #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pwnage101 merged 1 commit into from
Mar 26, 2026
Merged

feat: remove enterprise and consent from OPTIONAL_APPS #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,9 +1300,8 @@
# edxval
('edxval', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'),

# Enterprise App (http://github.com/openedx/edx-enterprise)
('enterprise', None),
('consent', None),
# Deprecated apps from the edx-enterprise package. We're working on removing these as part of
# pluginifying edx-enterprise (<https://discuss.openedx.org/t/18316>)
('integrated_channels.integrated_channel', None),
('integrated_channels.degreed', None),
('integrated_channels.degreed2', None),
Expand Down
5 changes: 2 additions & 3 deletions lms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2678,9 +2678,8 @@
# edxval
('edxval', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'),

# Enterprise Apps (http://github.com/openedx/edx-enterprise)
('enterprise', None),
('consent', None),
# Deprecated apps from the edx-enterprise package. We're working on removing these as part of
# pluginifying edx-enterprise (<https://discuss.openedx.org/t/18316>)
('integrated_channels.integrated_channel', None),
Comment thread
pwnage101 marked this conversation as resolved.
('integrated_channels.degreed', None),
('integrated_channels.degreed2', None),
Expand Down
3 changes: 2 additions & 1 deletion openedx/features/enterprise_support/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import requests
from crum import get_current_request
from django.apps import apps as django_apps
from django.conf import settings
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
Comment thread
pwnage101 marked this conversation as resolved.
from django.contrib.sites.models import Site
Expand Down Expand Up @@ -383,7 +384,7 @@ def enterprise_enabled():
"""
Determines whether the Enterprise app is installed
Comment thread
pwnage101 marked this conversation as resolved.
"""
return 'enterprise' in settings.INSTALLED_APPS and settings.FEATURES.get('ENABLE_ENTERPRISE_INTEGRATION', False)
return django_apps.is_installed('enterprise') and settings.FEATURES.get('ENABLE_ENTERPRISE_INTEGRATION', False)


def enterprise_is_enabled(otherwise=None):
Expand Down
2 changes: 1 addition & 1 deletion requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ django-stubs<6
# The team that owns this package will manually bump this package rather than having it pulled in automatically.
# This is to allow them to better control its deployment and to do it in a process that works better
# for them.
edx-enterprise==6.7.0
edx-enterprise==6.8.1

# Date: 2023-07-26
# Our legacy Sass code is incompatible with anything except this ancient libsass version.
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ edx-drf-extensions==10.6.0
# edxval
# enterprise-integrated-channels
# openedx-learning
edx-enterprise==6.7.0
edx-enterprise==6.8.1
# via
# -c requirements/constraints.txt
# -r requirements/edx/kernel.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ edx-drf-extensions==10.6.0
# edxval
# enterprise-integrated-channels
# openedx-learning
edx-enterprise==6.7.0
edx-enterprise==6.8.1
# via
# -c requirements/constraints.txt
# -r requirements/edx/doc.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ edx-drf-extensions==10.6.0
# edxval
# enterprise-integrated-channels
# openedx-learning
edx-enterprise==6.7.0
edx-enterprise==6.8.1
# via
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ edx-drf-extensions==10.6.0
# edxval
# enterprise-integrated-channels
# openedx-learning
edx-enterprise==6.7.0
edx-enterprise==6.8.1
# via
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
Expand Down
Loading