Merge pull request #62 from dabapps/django-5

j4mie · web-flow · commit 2022b7621130 · 2024-04-09T09:35:35.000+01:00
Add Django 5 and Python 3.12 to test matrix
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,21 +9,29 @@ jobs:
 
     strategy:
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11"]
-        django: ["3.2", "4.0", "4.1", "4.2"]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        django: ["3.2", "4.0", "4.1", "4.2", "5.0"]
         exclude:
           - python: "3.11"
             django: "3.2"
+          - python: "3.12"
+            django: "3.2"
           - python: "3.11"
             django: "4.0"
+          - python: "3.12"
+            django: "4.0"
+          - python: "3.8"
+            django: "5.0"
+          - python: "3.9"
+            django: "5.0"
         database_url:
           - postgres://runner:password@localhost/project
           - mysql://root:root@127.0.0.1/project
           - 'sqlite:///:memory:'
 
     services:
       postgres:
-        image: postgres:12
+        image: postgres
         ports:
           - 5432:5432
         env:
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ Simple database-backed job queue. Jobs are defined in your settings, and are pro
 Asynchronous tasks are run via a *job queue*. This system is designed to support multi-step job workflows.
 
 Supported and tested against:
-- Django 3.2, 4.0, 4.1, 4.2
-- Python 3.8, 3.9, 3.10, 3.11
+- Django 3.2, 4.0, 4.1, 4.2, 5.0
+- Python 3.8, 3.9, 3.10, 3.11, 3.12
 
 ## Getting Started
 
diff --git a/django_dbq/tests.py b/django_dbq/tests.py
@@ -13,6 +13,14 @@
 from io import StringIO
 
 
+try:
+    utc = timezone.utc
+except AttributeError:
+    from datetime import timezone as datetime_timezone
+
+    utc = datetime_timezone.utc
+
+
 def test_task(job=None):
     pass  # pragma: no cover
 
@@ -189,7 +197,7 @@ def test_get_next_ready_job(self):
         Job.objects.create(name="testjob", state=Job.STATES.READY)
         Job.objects.create(name="testjob", state=Job.STATES.PROCESSING)
         expected = Job.objects.create(name="testjob", state=Job.STATES.READY)
-        expected.created = datetime.now() - timedelta(minutes=1)
+        expected.created = timezone.now() - timedelta(minutes=1)
         expected.save()
 
         self.assertEqual(Job.objects.get_ready_or_none("default"), expected)
@@ -231,7 +239,9 @@ def test_gets_jobs_in_priority_and_date_order(self):
 
     def test_ignores_jobs_until_run_after_is_in_the_past(self):
         job_1 = Job.objects.create(name="testjob")
-        job_2 = Job.objects.create(name="testjob", run_after=datetime(2021, 11, 4, 8))
+        job_2 = Job.objects.create(
+            name="testjob", run_after=datetime(2021, 11, 4, 8, tzinfo=utc)
+        )
 
         with freezegun.freeze_time(datetime(2021, 11, 4, 7)):
             self.assertEqual(
@@ -256,7 +266,7 @@ def test_get_next_ready_job_created(self):
         Job.objects.create(name="testjob", state=Job.STATES.NEW)
         Job.objects.create(name="testjob", state=Job.STATES.PROCESSING)
         expected = Job.objects.create(name="testjob", state=Job.STATES.NEW)
-        expected.created = datetime.now() - timedelta(minutes=1)
+        expected.created = timezone.now() - timedelta(minutes=1)
         expected.save()
 
         self.assertEqual(Job.objects.get_ready_or_none("default"), expected)
@@ -336,7 +346,7 @@ def test_failure_hook(self):
 @override_settings(JOBS={"testjob": {"tasks": ["a"]}})
 class DeleteOldJobsTestCase(TestCase):
     def test_delete_old_jobs(self):
-        two_days_ago = datetime.utcnow() - timedelta(days=2)
+        two_days_ago = timezone.now() - timedelta(days=2)
 
         j1 = Job.objects.create(name="testjob", state=Job.STATES.COMPLETE)
         j1.created = two_days_ago
diff --git a/testsettings.py b/testsettings.py
@@ -19,3 +19,5 @@
     "root": {"handlers": ["console"], "level": "INFO",},
     "loggers": {"django_dbq": {"level": "CRITICAL", "propagate": True,},},
 }
+
+USE_TZ = True

Original file line number	Diff line number	Diff line change
`@@ -19,3 +19,5 @@`
`19`	`19`	`"root": {"handlers": ["console"], "level": "INFO",},`
`20`	`20`	`"loggers": {"django_dbq": {"level": "CRITICAL", "propagate": True,},},`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+USE_TZ = True`