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 edx-drf-extensions and newrelic #4027

Merged
Merged
Show file tree
Hide file tree
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: 1 addition & 0 deletions ecommerce/tests/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ def generate_new_user_token(self, username, email, is_staff):
# create a mock user, and not the actual user, because we want to confirm that
# the user is created during JWT authentication
user = Mock()
user.id = 1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to reviewer: I updated the edx-drf-extensions CHANGELOG in openedx/edx-drf-extensions#393 to note this test utility change.

user.username = username
user.email = email
user.is_staff = is_staff
Expand Down
6 changes: 2 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ edx-django-utils==5.5.0
# edx-drf-extensions
# edx-rest-api-client
# getsmarter-api-clients
edx-drf-extensions==8.8.0
edx-drf-extensions==8.12.0
# via
# -r requirements/base.in
# edx-rbac
Expand Down Expand Up @@ -349,7 +349,7 @@ naked==0.1.32
# cybersource-rest-client-python
ndg-httpsclient==0.5.1
# via -r requirements/base.in
newrelic==8.8.0
newrelic==9.1.0
# via
# -r requirements/base.in
# edx-django-utils
Expand Down Expand Up @@ -452,7 +452,6 @@ python-dateutil==2.8.2
# -r requirements/base.in
# analytics-python
# botocore
# edx-drf-extensions
# faker
python-mimeparse==1.6.0
# via cybersource-rest-client-python
Expand Down Expand Up @@ -543,7 +542,6 @@ six==1.16.0
# djangorestframework-csv
# edx-auth-backends
# edx-django-release-util
# edx-drf-extensions
# edx-ecommerce-worker
# edx-rbac
# google-auth
Expand Down
6 changes: 2 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ edx-django-utils==5.5.0
# edx-drf-extensions
# edx-rest-api-client
# getsmarter-api-clients
edx-drf-extensions==8.8.0
edx-drf-extensions==8.12.0
# via
# -r requirements/test.txt
# edx-rbac
Expand Down Expand Up @@ -552,7 +552,7 @@ naked==0.1.32
# cybersource-rest-client-python
ndg-httpsclient==0.5.1
# via -r requirements/test.txt
newrelic==8.8.0
newrelic==9.1.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -778,7 +778,6 @@ python-dateutil==2.8.2
# -r requirements/test.txt
# analytics-python
# botocore
# edx-drf-extensions
# faker
# freezegun
python-dotenv==1.0.0
Expand Down Expand Up @@ -920,7 +919,6 @@ six==1.16.0
# djangorestframework-csv
# edx-auth-backends
# edx-django-release-util
# edx-drf-extensions
# edx-ecommerce-worker
# edx-rbac
# google-auth
Expand Down
2 changes: 1 addition & 1 deletion requirements/e2e.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ importlib-metadata==6.7.0
# via pytest-randomly
iniconfig==2.0.0
# via pytest
newrelic==8.8.0
newrelic==9.1.0
# via
# -c requirements/base.txt
# edx-django-utils
Expand Down
2 changes: 1 addition & 1 deletion requirements/production.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

django-ses
gunicorn==19.7.1
newrelic<5
newrelic
Copy link
Contributor Author

@robrap robrap Oct 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to reviewer: This was an outdated constraint from before constraints.txt existed, and based on constraining against major version upgrades as a rule, not due to a particular known issue.

Note that the other constraints in here are likely also an issue, but are riskier so I'll them to the owning team. I figured it would be good to have the latest monitoring capabilities though, like getting logs into New Relic.

python-memcached==1.59
PyYAML
nodeenv==1.1.1
Expand Down
6 changes: 2 additions & 4 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ edx-django-utils==5.5.0
# edx-drf-extensions
# edx-rest-api-client
# getsmarter-api-clients
edx-drf-extensions==8.8.0
edx-drf-extensions==8.12.0
# via
# -r requirements/base.in
# edx-rbac
Expand Down Expand Up @@ -356,7 +356,7 @@ naked==0.1.32
# cybersource-rest-client-python
ndg-httpsclient==0.5.1
# via -r requirements/base.in
newrelic==4.20.1.121
newrelic==9.1.0
# via
# -r requirements/base.in
# -r requirements/production.in
Expand Down Expand Up @@ -462,7 +462,6 @@ python-dateutil==2.8.2
# -r requirements/base.in
# analytics-python
# botocore
# edx-drf-extensions
# faker
python-memcached==1.59
# via -r requirements/production.in
Expand Down Expand Up @@ -559,7 +558,6 @@ six==1.16.0
# djangorestframework-csv
# edx-auth-backends
# edx-django-release-util
# edx-drf-extensions
# edx-ecommerce-worker
# edx-rbac
# google-auth
Expand Down
6 changes: 2 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ edx-django-utils==5.5.0
# edx-drf-extensions
# edx-rest-api-client
# getsmarter-api-clients
edx-drf-extensions==8.8.0
edx-drf-extensions==8.12.0
# via
# -r requirements/base.txt
# edx-rbac
Expand Down Expand Up @@ -530,7 +530,7 @@ naked==0.1.32
# cybersource-rest-client-python
ndg-httpsclient==0.5.1
# via -r requirements/base.txt
newrelic==8.8.0
newrelic==9.1.0
# via
# -r requirements/base.txt
# -r requirements/e2e.txt
Expand Down Expand Up @@ -757,7 +757,6 @@ python-dateutil==2.8.2
# -r requirements/base.txt
# analytics-python
# botocore
# edx-drf-extensions
# faker
# freezegun
python-dotenv==1.0.0
Expand Down Expand Up @@ -897,7 +896,6 @@ six==1.16.0
# djangorestframework-csv
# edx-auth-backends
# edx-django-release-util
# edx-drf-extensions
# edx-ecommerce-worker
# edx-rbac
# google-auth
Expand Down
Loading