Skip to content

fix: Upgrade edx-django-utils, dropping newrelic; fix test and typo #36799

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
timmc-edx merged 1 commit into from
May 27, 2025
Merged

fix: Upgrade edx-django-utils, dropping newrelic; fix test and typo #36799

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
2 changes: 1 addition & 1 deletion openedx/core/djangoapps/user_authn/views/login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def _check_user_auth_flow(site, user):
# we don't record their e-mail in case there is sensitive info accidentally
# in there.
set_custom_attribute("login_tpa_domain_shortcircuit_user_id", user.id)
log.warning("User %s has nonstandard e-mail. Shortcircuiting THIRD_PART_AUTH_ONLY_DOMAIN check.", user.id)
log.warning("User %s has nonstandard e-mail. Shortcircuiting THIRD_PARTY_AUTH_ONLY_DOMAIN check.", user.id)
return
user_domain = email_parts[1].strip().lower()

Expand Down
3 changes: 1 addition & 2 deletions openedx/core/djangoapps/user_authn/views/tests/test_login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,8 +1027,7 @@ def test_check_user_auth_flow_bad_email(self):

with self.assertLogs(level='WARN') as log:
_check_user_auth_flow(site, invalid_email_user)
assert len(log.output) == 1
assert "Shortcircuiting THIRD_PART_AUTH_ONLY_DOMAIN check." in log.output[0]
assert any("Shortcircuiting THIRD_PARTY_AUTH_ONLY_DOMAIN check." in warning for warning in log.output)


@ddt.ddt
Expand Down
4 changes: 1 addition & 3 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ edx-django-release-util==1.5.0
# edxval
edx-django-sites-extensions==5.1.0
# via -r requirements/edx/kernel.in
edx-django-utils==7.4.0
edx-django-utils==8.0.0
# via
# -r requirements/edx/kernel.in
# django-config-models
Expand Down Expand Up @@ -756,8 +756,6 @@ mysqlclient==2.2.7
# via
# -r requirements/edx/kernel.in
# openedx-forum
newrelic==10.12.0
# via edx-django-utils
nh3==0.2.21
# via -r requirements/edx/kernel.in
nltk==3.9.1
Expand Down
7 changes: 1 addition & 6 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ edx-django-sites-extensions==5.1.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-django-utils==7.4.0
edx-django-utils==8.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1286,11 +1286,6 @@ mysqlclient==2.2.7
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# openedx-forum
newrelic==10.12.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-django-utils
nh3==0.2.21
# via
# -r requirements/edx/doc.txt
Expand Down
6 changes: 1 addition & 5 deletions requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ edx-django-release-util==1.5.0
# edxval
edx-django-sites-extensions==5.1.0
# via -r requirements/edx/base.txt
edx-django-utils==7.4.0
edx-django-utils==8.0.0
# via
# -r requirements/edx/base.txt
# django-config-models
Expand Down Expand Up @@ -920,10 +920,6 @@ mysqlclient==2.2.7
# via
# -r requirements/edx/base.txt
# openedx-forum
newrelic==10.12.0
# via
# -r requirements/edx/base.txt
# edx-django-utils
nh3==0.2.21
# via -r requirements/edx/base.txt
nltk==3.9.1
Expand Down
6 changes: 1 addition & 5 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ edx-django-release-util==1.5.0
# edxval
edx-django-sites-extensions==5.1.0
# via -r requirements/edx/base.txt
edx-django-utils==7.4.0
edx-django-utils==8.0.0
# via
# -r requirements/edx/base.txt
# django-config-models
Expand Down Expand Up @@ -979,10 +979,6 @@ mysqlclient==2.2.7
# via
# -r requirements/edx/base.txt
# openedx-forum
newrelic==10.12.0
# via
# -r requirements/edx/base.txt
# edx-django-utils
nh3==0.2.21
# via -r requirements/edx/base.txt
nltk==3.9.1
Expand Down
Loading