Merge pull request #2630 from carpentries/feature/2624-upgrade-django…

…-to-4.2

[#2624] Upgrade Django to v4.2

Pipfile

@@ -4,11 +4,11 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "~=3.2.25"
+django = "~=4.2"
 argon2-cffi = "~=21.3.0"
 django-anymail = "~=8.4"
-django-contrib-comments = "~=2.1.0"
-django-countries = "~=7.2.1"
+django-contrib-comments = "~=2.2.0"
+django-countries = "~=7.6.1"
 django-crispy-forms = "~=1.13.0"
 django-debug-toolbar = "~=3.2.2"
 django-environ = "~=0.9.0"
@@ -19,7 +19,7 @@ django-recaptcha = "~=3.0.0"
 django-reversion = "~=4.0.0"
 django-reversion-compare = "~=0.15"
 django-redis = "~=5.0.0"
-django-rq = "~=2.8.1"
+django-rq = "~=2.10.2"
 django-select2 = "~=7.10.0"
 djangorestframework = "~=3.15"
 djangorestframework-csv = "~=2.1.1"
@@ -30,7 +30,7 @@ pygithub = "~=1.55"
 pyyaml = "~=6.0"
 redis = "~=4.5.4"
 requests = "~=2.31.0"
-rq = "~=1.15.0"
+rq = "~=1.16.1"
 rq-scheduler = "~=0.13.0"
 social-auth-core = "~=4.1.0"
 social-auth-app-django = "~=5.0.0"

amy/autoemails/tests/test_utils.py

@@ -1,7 +1,6 @@
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 
 from django.test import TestCase
-import pytz
 from rq.queue import Queue
 from rq.worker import SimpleWorker
 from rq_scheduler.utils import to_unix
@@ -63,7 +62,7 @@ def test_time_unaware_aware(self):
         self.assertEqual(rv.tzinfo, None)
 
         rv = scheduled_execution_time(job_id, self.scheduler, naive=False)
-        self.assertEqual(rv.tzinfo, pytz.UTC)
+        self.assertEqual(rv.tzinfo, UTC)
 
 
 class TestCheckStatus(FakeRedisTestCaseMixin, TestCase):

amy/autoemails/utils.py

@@ -1,8 +1,8 @@
+from datetime import UTC
 from typing import Optional, Union
 
 from django.conf import settings
 from django.utils.http import url_has_allowed_host_and_scheme
-import pytz
 from rq.exceptions import NoSuchJobError
 from rq.job import Job
 from rq_scheduler.utils import from_unix
@@ -21,7 +21,7 @@ def scheduled_execution_time(job_id, scheduler, naive=True):
         if not naive:
             # By default, RQ-Scheduler uses UTC naive (TZ-unaware) objects,
             # which we can "convert" to TZ-aware UTC.
-            time = time.replace(tzinfo=pytz.UTC)
+            time = time.replace(tzinfo=UTC)
     return time
 
 

amy/dashboard/tests/test_instructor_recruitment_views.py

@@ -26,7 +26,9 @@ class TestUpcomingTeachingOpportunitiesList(TestCase):
     def test_view_enabled__no_community_role(self):
         # Arrange
         request = RequestFactory().get("/")
-        request.user = Person(personal="Test", family="User", email="test@user.com")
+        request.user = Person.objects.create(
+            personal="Test", family="User", email="test@user.com"
+        )
         # Act
         view = UpcomingTeachingOpportunitiesList(request=request)
         # Assert
@@ -203,7 +205,9 @@ class TestSignupForRecruitment(TestCase):
     def test_view_enabled__no_community_role(self):
         # Arrange
         request = RequestFactory().get("/")
-        request.user = Person(personal="Test", family="User", email="test@user.com")
+        request.user = Person.objects.create(
+            personal="Test", family="User", email="test@user.com"
+        )
         # Act
         view = SignupForRecruitment(request=request)
         # Assert
@@ -505,7 +509,9 @@ class TestResignFromRecruitment(TestCase):
     def test_view_enabled__no_community_role(self):
         # Arrange
         request = RequestFactory().post("/")
-        request.user = Person(personal="Test", family="User", email="test@user.com")
+        request.user = Person.objects.create(
+            personal="Test", family="User", email="test@user.com"
+        )
         # Act
         view = ResignFromRecruitment(request=request)
         # Assert

amy/emails/tests/actions/test_new_membership_onboarding_common_functions.py

@@ -157,7 +157,7 @@ def test_get_recipients__no_email(self) -> None:
         # Arrange
         request = RequestFactory().get("/")
         membership_start_date = date(2023, 1, 1)
-        membership = Membership(
+        membership = Membership.objects.create(
             name="Test Membership",
             variant="gold",
             agreement_start=membership_start_date,

amy/emails/tests/test_controller.py

@@ -176,7 +176,7 @@ def test_schedule_email__invalid_template(self) -> None:
     def test_schedule_email__generic_object_link(self) -> None:
         # Arrange
         now = timezone.now()
-        person = Person(personal="Harry", family="Potter")
+        person = Person.objects.create(personal="Harry", family="Potter")
 
         # Act
         scheduled_email = self.create_scheduled_email(now, generic_relation_obj=person)