Remove use of django.utils.timezone.utc

This is an alias for the stdlib's datetime.timezone.utc, which has been
deprecated as of 4.1.

Author: ghickman

jobserver/github.py

@@ -1,5 +1,6 @@
 import json
-from datetime import datetime, timezone
+from datetime import datetime
+from datetime.timezone import utc
 
 import requests
 from environs import Env
@@ -354,7 +355,7 @@ def get_repos_with_dates(self, org):
         for repo in results:
             created_at = datetime.strptime(
                 repo["createdAt"], "%Y-%m-%dT%H:%M:%SZ"
-            ).replace(tzinfo=timezone.utc)
+            ).replace(tzinfo=utc)
 
             topics = []
             if repo["repositoryTopics"]["nodes"]:

jobserver/signing.py

@@ -1,5 +1,6 @@
 import hashlib
-from datetime import datetime, timezone
+from datetime import datetime
+from datetime.timezone import utc
 
 import itsdangerous
 from pydantic import BaseModel, Field, ValidationError, root_validator, validator
@@ -82,7 +83,7 @@ def check_url(cls, url):
     @validator("expiry")
     def check_expiry(cls, expiry):
         """Enforce the token has not expired."""
-        if datetime.now(timezone.utc) > expiry:
+        if datetime.now(utc) > expiry:
             raise ValueError(f"token expired on {expiry.isoformat()}")
         return expiry
 

tests/factories/applications.py

@@ -1,6 +1,7 @@
+from datetime.timezone import utc
+
 import factory
 import factory.fuzzy
-from django.utils import timezone
 
 from applications.models import (
     Application,
@@ -42,10 +43,10 @@ class Meta:
     notes = factory.Sequence(lambda n: f"note {n}")
     is_approved = factory.fuzzy.FuzzyChoice([True, False])
 
-    last_reviewed_at = factory.Faker("date_time", tzinfo=timezone.utc)
+    last_reviewed_at = factory.Faker("date_time", tzinfo=utc)
 
-    created_at = factory.Faker("date_time", tzinfo=timezone.utc)
-    updated_at = factory.Faker("date_time", tzinfo=timezone.utc)
+    created_at = factory.Faker("date_time", tzinfo=utc)
+    updated_at = factory.Faker("date_time", tzinfo=utc)
 
 
 class ContactDetailsPageFactory(AbstractPageFactory):
@@ -191,4 +192,4 @@ class Meta:
 
     application = factory.SubFactory("tests.factories.ApplicationFactory")
     has_taken_safe_researcher_training = True
-    training_passed_at = factory.Faker("date_time", tzinfo=timezone.utc)
+    training_passed_at = factory.Faker("date_time", tzinfo=utc)

tests/factories/jobserver.py

@@ -1,8 +1,8 @@
 from datetime import datetime
+from datetime.timezone import utc
 
 import factory
 import factory.fuzzy
-from django.utils import timezone
 from social_django.models import UserSocialAuth
 
 from jobserver.models import (
@@ -49,7 +49,7 @@ class Meta:
 
     identifier = factory.Sequence(lambda n: f"identifier-{n}")
 
-    updated_at = factory.fuzzy.FuzzyDateTime(datetime(2020, 1, 1, tzinfo=timezone.utc))
+    updated_at = factory.fuzzy.FuzzyDateTime(datetime(2020, 1, 1, tzinfo=utc))
 
 
 class JobRequestFactory(factory.django.DjangoModelFactory):
@@ -111,7 +111,7 @@ class Meta:
 
     backend = factory.SubFactory("tests.factories.BackendFactory")
 
-    api_last_seen = factory.Faker("date_time", tzinfo=timezone.utc)
+    api_last_seen = factory.Faker("date_time", tzinfo=utc)
 
 
 class UserFactory(factory.django.DjangoModelFactory):

tests/fakes.py

@@ -1,5 +1,6 @@
 import textwrap
 from datetime import datetime
+from datetime.timezone import utc
 
 from django.utils import timezone
 
@@ -60,7 +61,7 @@ def get_repos_with_dates(self, org):
                 "name": "predates-job-server",
                 "url": "https://github.com/opensafely/predates-job-server",
                 "is_private": True,
-                "created_at": datetime(2020, 7, 31, tzinfo=timezone.utc),
+                "created_at": datetime(2020, 7, 31, tzinfo=utc),
                 "topics": ["github-releases"],
             },
             {

tests/unit/jobserver/models/test_stats.py

@@ -1,14 +1,13 @@
 from datetime import datetime
-
-from django.utils import timezone
+from datetime.timezone import utc
 
 from ....factories import BackendFactory, StatsFactory
 
 
 def test_stats_str_with_last_seen(freezer):
     backend = BackendFactory(slug="test")
 
-    last_seen = datetime(2020, 12, 25, 10, 11, 12, tzinfo=timezone.utc)
+    last_seen = datetime(2020, 12, 25, 10, 11, 12, tzinfo=utc)
     stats = StatsFactory(backend=backend, api_last_seen=last_seen, url="/foo")
 
     assert str(stats) == "test | 2020-12-25 10:11:12 | /foo"

tests/unit/jobserver/test_signing.py

@@ -1,6 +1,7 @@
 import json
 import secrets
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
+from datetime.timezone import utc
 
 import pytest
 from pydantic import ValidationError
@@ -26,7 +27,7 @@ def test_token_sign_verify_roundtrip(secret_key):
     token1 = signing.AuthToken(
         url="https://example.com/url",
         user="user",
-        expiry=datetime.now(timezone.utc) + timedelta(minutes=1),
+        expiry=datetime.now(utc) + timedelta(minutes=1),
     )
     token_string = token1.sign(secret_key, "salt")
 
@@ -39,7 +40,7 @@ def test_token_object_url_invalid():
         signing.AuthToken(
             url="bad",
             user="user",
-            expiry=datetime.now(timezone.utc) + timedelta(minutes=1),
+            expiry=datetime.now(utc) + timedelta(minutes=1),
         )
 
 
@@ -48,15 +49,15 @@ def test_token_object_expired():
         signing.AuthToken(
             url="https://example.com/url",
             user="user",
-            expiry=datetime.now(timezone.utc) - timedelta(minutes=1),
+            expiry=datetime.now(utc) - timedelta(minutes=1),
         )
 
 
 def test_token_verify_mismatched_secrets():
     payload = dict(
         url="https://example.com/url",
         user="user",
-        expiry=datetime.now(timezone.utc) + timedelta(minutes=1),
+        expiry=datetime.now(utc) + timedelta(minutes=1),
     )
     token = create_raw_token(payload, "secret1" * 10)
 
@@ -76,7 +77,7 @@ def test_token_verify_expired(secret_key):
     payload = dict(
         url="https://example.com/url",
         user="user",
-        expiry=datetime.now(timezone.utc) - timedelta(minutes=1),
+        expiry=datetime.now(utc) - timedelta(minutes=1),
     )
     token = create_raw_token(payload, secret_key)
     with pytest.raises(signing.AuthToken.Expired):
@@ -87,7 +88,7 @@ def test_token_verify_wrong_all_the_things(secret_key):
     payload = dict(
         url="bad url",
         # missing user
-        expiry=datetime.now(timezone.utc) - timedelta(minutes=1),
+        expiry=datetime.now(utc) - timedelta(minutes=1),
     )
     token = create_raw_token(payload, secret_key)
     with pytest.raises(ValidationError) as exc_info:

tests/unit/jobserver/views/test_status.py

@@ -1,6 +1,7 @@
 import functools
 import time
 from datetime import datetime, timedelta
+from datetime.timezone import utc
 
 import pytest
 from django.utils import timezone
@@ -12,7 +13,7 @@
 from ....utils import minutes_ago
 
 
-dt = functools.partial(datetime, tzinfo=timezone.utc)
+dt = functools.partial(datetime, tzinfo=utc)
 
 
 def test_dbavailability_in_db_maintenance(rf):