From 8cf6cfcb787b78673e3909bc43a618012ad1d269 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 22 Jul 2025 17:47:46 +0200
Subject: [PATCH 1/2] Update Django to 5.1.10

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 10780078..3dc7faa7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/fredj/cssmin.git@master#egg=cssmin
-Django==5.1.9
+Django==5.1.10
 IPy==1.1
 Markdown==3.3.7
 bencode.py==4.0.0

From c9b1ecc32ea9ed408611b8537c53f9668f13f40c Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Tue, 22 Jul 2025 17:52:14 +0200
Subject: [PATCH 2/2] treewide: port away from deprecated datetime.utcnow()

---
 public/views.py          | 6 +++---
 releng/tests/conftest.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/views.py b/public/views.py
index 57a6ab60..f93aa024 100644
--- a/public/views.py
+++ b/public/views.py
@@ -1,5 +1,5 @@
 import json
-from datetime import datetime
+from datetime import datetime, timezone
 from operator import attrgetter
 
 from django.contrib.auth.models import User
@@ -99,7 +99,7 @@ def keys(request):
     user_key_ids = frozenset(user.userprofile.pgp_key[-16:] for user in users
             if user.userprofile.pgp_key)
 
-    not_expired = Q(expires__gt=datetime.utcnow()) | Q(expires__isnull=True)
+    not_expired = Q(expires__gt=datetime.now(timezone.utc)) | Q(expires__isnull=True)
     master_keys = MasterKey.objects.select_related('owner', 'revoker',
             'owner__userprofile', 'revoker__userprofile').filter(
             revoked__isnull=True)
@@ -155,7 +155,7 @@ def keys_json(request):
             'group': 'master'
         } for key in master_keys)
 
-    not_expired = Q(expires__gt=datetime.utcnow()) | Q(expires__isnull=True)
+    not_expired = Q(expires__gt=datetime.now(timezone.utc)) | Q(expires__isnull=True)
     signatures = PGPSignature.objects.filter(not_expired, revoked__isnull=True)
     edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
             for sig in signatures]
diff --git a/releng/tests/conftest.py b/releng/tests/conftest.py
index 191feea4..f67abc25 100644
--- a/releng/tests/conftest.py
+++ b/releng/tests/conftest.py
@@ -1,5 +1,5 @@
 from base64 import b64encode
-from datetime import datetime
+from datetime import datetime, timezone
 
 import pytest
 from bencode import bencode
@@ -24,7 +24,7 @@ def torrent_data():
     data = {
         'comment': 'comment',
         'created_by': 'Arch Linux',
-        'creation date': int(datetime.utcnow().timestamp()),
+        'creation date': int(datetime.now(timezone.utc).timestamp()),
         'info': {
             'name': 'arch.iso',
             'length': 1,