Skip to content
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.

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

feat: upgrade enterprise to 5.10.1, removing braze-client #36385

Merged
merged 1 commit into from
Mar 17, 2025
Merged
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/check_python_dependencies.yml
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ jobs:
--req-file requirements/edx/base.txt \
--req-file requirements/edx/testing.txt \
--ignore https://github.com/edx/codejail-includes \
--ignore https://github.com/edx/braze-client \
--ignore https://github.com/edx/edx-name-affirmation \
--ignore https://github.com/mitodl/edx-sga \
--ignore https://github.com/open-craft/xblock-poll
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ django-storages<1.14.4
# 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==5.9.2
edx-enterprise==5.10.1

# Date: 2024-05-09
# This has to be constrained as well because newer versions of edx-i18n-tools need the
9 changes: 1 addition & 8 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
@@ -204,7 +204,6 @@ django==4.2.19
# edx-ace
# edx-api-doc-tools
# edx-auth-backends
# edx-braze-client
# edx-bulk-grades
# edx-celeryutils
# edx-completion
@@ -412,10 +411,6 @@ edx-api-doc-tools==2.0.0
# edx-name-affirmation
edx-auth-backends==4.4.0
# via -r requirements/edx/kernel.in
edx-braze-client==1.0.0
# via
# -r requirements/edx/bundled.in
# edx-enterprise
edx-bulk-grades==1.1.0
# via
# -r requirements/edx/kernel.in
@@ -446,7 +441,6 @@ edx-django-utils==7.2.0
# -r requirements/edx/kernel.in
# django-config-models
# edx-ace
# edx-braze-client
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
@@ -471,7 +465,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==5.9.2
edx-enterprise==5.10.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
@@ -1057,7 +1051,6 @@ requests==2.32.3
# analytics-python
# cachecontrol
# django-oauth-toolkit
# edx-braze-client
# edx-bulk-grades
# edx-drf-extensions
# edx-enterprise
1 change: 0 additions & 1 deletion requirements/edx/bundled.in
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ edx-i18n-tools>=0.4.6 # Commands for developers and translators to
## Third party integrations
algoliasearch # Algolia’s API client for indexed searching
django-ses # Django email backend for Amazon’s Simple Email Service
edx-braze-client # a customer engagement platform used for edx.org
mailsnake # MailChimp API; used for two management commands in the "mailing" djangoapp
optimizely-sdk # Optimizely provides A/B testing and other features, used by edx.org

10 changes: 1 addition & 9 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
@@ -378,7 +378,6 @@ django==4.2.19
# edx-ace
# edx-api-doc-tools
# edx-auth-backends
# edx-braze-client
# edx-bulk-grades
# edx-celeryutils
# edx-completion
@@ -678,11 +677,6 @@ edx-auth-backends==4.4.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-braze-client==1.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-enterprise
edx-bulk-grades==1.1.0
# via
# -r requirements/edx/doc.txt
@@ -724,7 +718,6 @@ edx-django-utils==7.2.0
# -r requirements/edx/testing.txt
# django-config-models
# edx-ace
# edx-braze-client
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
@@ -750,7 +743,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==5.9.2
edx-enterprise==5.10.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
@@ -1845,7 +1838,6 @@ requests==2.32.3
# cachecontrol
# django-oauth-toolkit
# djangorestframework-stubs
# edx-braze-client
# edx-bulk-grades
# edx-drf-extensions
# edx-enterprise
9 changes: 1 addition & 8 deletions requirements/edx/doc.txt
Original file line number Diff line number Diff line change
@@ -260,7 +260,6 @@ django==4.2.19
# edx-ace
# edx-api-doc-tools
# edx-auth-backends
# edx-braze-client
# edx-bulk-grades
# edx-celeryutils
# edx-completion
@@ -496,10 +495,6 @@ edx-api-doc-tools==2.0.0
# edx-name-affirmation
edx-auth-backends==4.4.0
# via -r requirements/edx/base.txt
edx-braze-client==1.0.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
edx-bulk-grades==1.1.0
# via
# -r requirements/edx/base.txt
@@ -530,7 +525,6 @@ edx-django-utils==7.2.0
# -r requirements/edx/base.txt
# django-config-models
# edx-ace
# edx-braze-client
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
@@ -555,7 +549,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==5.9.2
edx-enterprise==5.10.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -1288,7 +1282,6 @@ requests==2.32.3
# analytics-python
# cachecontrol
# django-oauth-toolkit
# edx-braze-client
# edx-bulk-grades
# edx-drf-extensions
# edx-enterprise
9 changes: 1 addition & 8 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
@@ -290,7 +290,6 @@ django==4.2.19
# edx-ace
# edx-api-doc-tools
# edx-auth-backends
# edx-braze-client
# edx-bulk-grades
# edx-celeryutils
# edx-completion
@@ -521,10 +520,6 @@ edx-api-doc-tools==2.0.0
# edx-name-affirmation
edx-auth-backends==4.4.0
# via -r requirements/edx/base.txt
edx-braze-client==1.0.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
edx-bulk-grades==1.1.0
# via
# -r requirements/edx/base.txt
@@ -555,7 +550,6 @@ edx-django-utils==7.2.0
# -r requirements/edx/base.txt
# django-config-models
# edx-ace
# edx-braze-client
# edx-drf-extensions
# edx-enterprise
# edx-event-bus-kafka
@@ -580,7 +574,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==5.9.2
edx-enterprise==5.10.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -1409,7 +1403,6 @@ requests==2.32.3
# analytics-python
# cachecontrol
# django-oauth-toolkit
# edx-braze-client
# edx-bulk-grades
# edx-drf-extensions
# edx-enterprise

Unchanged files with check annotations Beta

var tabsTemplate;
var tabs = this.options.tabs;
if (tabs && tabs.length > 0) {
tabsTemplate = this.loadTemplate('subsection-share-link-modal-tabs');

Check failure on line 308 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 16 spaces but found 20.
HtmlUtils.setHtml(this.$('.modal-section'), HtmlUtils.HTML(tabsTemplate({tabs: tabs})));

Check failure on line 309 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 16 spaces but found 20.
_.each(this.options.tabs, function(tab) {

Check failure on line 310 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 16 spaces but found 20.
// eslint-disable-next-line prefer-spread

Check failure on line 311 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 20 spaces but found 24.
this.options.editors.push.apply(

Check failure on line 312 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 20 spaces but found 24.
this.options.editors,

Check failure on line 313 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 24 spaces but found 28.
_.map(tab.editors, function(Editor) {

Check failure on line 314 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 24 spaces but found 28.
return new Editor({

Check failure on line 315 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 28 spaces but found 32.
parent: this,

Check failure on line 316 in cms/static/js/views/modals/course_outline_modals.js

GitHub Actions / Quality Others (ubuntu-24.04, 3.11, 20)

Expected indentation of 32 spaces but found 36.
parentElement: this.$(`.modal-section .${tab.name}`),
model: this.model,
xblockType: this.options.xblockType,