From a380f1137b589c456d13dbfbb9c5c75204f21735 Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Wed, 18 Oct 2023 16:33:29 -0400 Subject: [PATCH 1/3] fix: test update for edx-drf-extensions 8.11.0 The method generate_unversioned_payload in edx-drf-extensions now requires a user.id to function, so that needed to be added to the mock user. --- ecommerce/tests/mixins.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ecommerce/tests/mixins.py b/ecommerce/tests/mixins.py index a03154b06d6..349c6f11e0b 100644 --- a/ecommerce/tests/mixins.py +++ b/ecommerce/tests/mixins.py @@ -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 user.username = username user.email = email user.is_staff = is_staff From 6c72e8eb9eac5406168f021c2bd50b433dd4847e Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Wed, 6 Sep 2023 21:23:28 -0400 Subject: [PATCH 2/3] feat: upgrade edx-drf-extensions Upgrade edx-drf-extensions to 8.12.0. This was done using a temporary constraint and pip-compile without the --upgrade to keep from upgrading unrelated requirements. --- requirements/base.txt | 4 +--- requirements/dev.txt | 4 +--- requirements/production.txt | 4 +--- requirements/test.txt | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 6bec622bc53..535ef245ee2 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index d2c0dbb9b0a..0962b91a9f3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements/production.txt b/requirements/production.txt index 8906a420a65..5c3dd5a1cd4 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements/test.txt b/requirements/test.txt index a4c81da0534..1778e1d1759 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 @@ -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 @@ -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 From d8e317848e9a36d8d0f35703cf48c8255c811b3b Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Tue, 17 Oct 2023 17:32:30 -0400 Subject: [PATCH 3/3] feat: upgrade newrelic Upgrade newrelic to 9.1.0. This was done using a temporary constraint and pip-compile without the --upgrade to keep from upgrading unrelated requirements. --- requirements/base.txt | 2 +- requirements/dev.txt | 2 +- requirements/e2e.txt | 2 +- requirements/production.in | 2 +- requirements/production.txt | 2 +- requirements/test.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 535ef245ee2..59589075df6 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 0962b91a9f3..d852e603eca 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 diff --git a/requirements/e2e.txt b/requirements/e2e.txt index a16e052bd76..51f87ad3f34 100644 --- a/requirements/e2e.txt +++ b/requirements/e2e.txt @@ -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 diff --git a/requirements/production.in b/requirements/production.in index 378ef627b83..c485b80a968 100644 --- a/requirements/production.in +++ b/requirements/production.in @@ -4,7 +4,7 @@ django-ses gunicorn==19.7.1 -newrelic<5 +newrelic python-memcached==1.59 PyYAML nodeenv==1.1.1 diff --git a/requirements/production.txt b/requirements/production.txt index 5c3dd5a1cd4..948b06058d3 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -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 diff --git a/requirements/test.txt b/requirements/test.txt index 1778e1d1759..0dc13e2a0f5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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