From 66accd4a9686d6c0cf3b5c93e8ddc0db7e554640 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sat, 19 Sep 2026 16:58:05 +0200
Subject: [PATCH 1/4] sitemaps: Type all methods returning None

---
 sitemaps.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sitemaps.py b/sitemaps.py
index 9dc5a50a..5f9151b6 100644
--- a/sitemaps.py
+++ b/sitemaps.py
@@ -20,7 +20,7 @@ def items(self):
     def lastmod(self, obj):
         return obj.last_update
 
-    def get_latest_lastmod(self):
+    def get_latest_lastmod(self) -> None:
         return None
 
     def changefreq(self, obj):
@@ -49,7 +49,7 @@ def location(self, obj):
     def lastmod(self, obj):
         return obj.files_last_update
 
-    def get_latest_lastmod(self):
+    def get_latest_lastmod(self) -> None:
         return None
 
 
@@ -63,7 +63,7 @@ def items(self):
     def lastmod(self, obj):
         return obj['last_update']
 
-    def get_latest_lastmod(self):
+    def get_latest_lastmod(self) -> None:
         return None
 
     def location(self, obj):
@@ -80,7 +80,7 @@ def items(self):
     def lastmod(self, obj):
         return obj['last_update']
 
-    def get_latest_lastmod(self):
+    def get_latest_lastmod(self) -> None:
         return None
 
     def location(self, obj):
@@ -99,7 +99,7 @@ def items(self):
     def lastmod(self, obj):
         return obj.last_modified
 
-    def get_latest_lastmod(self):
+    def get_latest_lastmod(self) -> None:
         return None
 
     def priority(self, obj):
@@ -131,7 +131,7 @@ def items(self):
     def lastmod(self, obj):
         return obj.last_modified
 
-    def get_latest_lastmod(self):
+    def get_latest_lastmod(self) -> None:
         return None
 
     def priority(self, obj):
@@ -153,7 +153,7 @@ def items(self):
     def lastmod(self, obj):
         return obj.last_modified
 
-    def get_latest_lastmod(self):
+    def get_latest_lastmod(self) -> None:
         return None
 
     def changefreq(self, obj):

From 9e31d73c11355d0c203cd3b88ec13dfec3713e44 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sat, 19 Sep 2026 19:25:10 +0200
Subject: [PATCH 2/4] releng: Add more type hints

---
 releng/models.py            | 36 +++++++++++++++++++++++++-----------
 releng/tests/conftest.py    |  5 +++--
 releng/tests/test_models.py | 27 +++++++++++++++++----------
 releng/tests/test_views.py  | 19 ++++++++++++-------
 releng/views.py             | 12 ++++++------
 5 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/releng/models.py b/releng/models.py
index 9214aea0..30024a6b 100644
--- a/releng/models.py
+++ b/releng/models.py
@@ -2,17 +2,31 @@
 import hashlib
 from base64 import b64decode
 from datetime import datetime, timezone
+from typing import TypedDict
 
 from bencode import bdecode, bencode
 from django.db import models
 from django.db.models.signals import pre_save
 from django.urls import reverse
-from django.utils.safestring import mark_safe
+from django.utils.safestring import SafeText, mark_safe
 
 from devel.fields import PGPKeyField
 from main.utils import parse_markdown, set_created_field
 
 
+class TorrentMetadata(TypedDict):
+    comment: str | None
+    created_by: str | None
+    creation_date: datetime | None
+    announce: str | None
+    file_name: str | None
+    file_length: int | None
+    piece_count: float | None
+    piece_length: int | None
+    url_list: list[str] | None
+    info_hash: str | None
+
+
 class Release(models.Model):
     release_date = models.DateField(db_index=True)
     version = models.CharField(max_length=50, unique=True)
@@ -34,25 +48,25 @@ class Meta:
         get_latest_by = 'release_date'
         ordering = ('-release_date', '-version')
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.version
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str:
         return reverse('releng-release-detail', args=[self.version])
 
-    def dir_path(self):
+    def dir_path(self) -> str:
         return "iso/%s/" % self.version
 
-    def iso_url(self):
+    def iso_url(self) -> str:
         return f"iso/{self.version}/archlinux-{self.version}-x86_64.iso"
 
-    def tarball_url(self):
+    def tarball_url(self) -> str:
         return f"iso/{self.version}/archlinux-bootstrap-{self.version}-x86_64.tar.zst"
 
-    def dir_url(self):
+    def dir_url(self) -> str:
         return "iso/%s" % (self.version)
 
-    def magnet_uri(self):
+    def magnet_uri(self) -> str:
         query = [
             ('dn', "archlinux-%s-x86_64.iso" % self.version),
         ]
@@ -61,10 +75,10 @@ def magnet_uri(self):
             query.insert(0, ('xt', "urn:btih:%s" % metadata['info_hash']))
         return "magnet:?%s" % '&'.join([f'{k}={v}' for k, v in query])
 
-    def info_html(self):
+    def info_html(self) -> SafeText:
         return mark_safe(parse_markdown(self.info))
 
-    def torrent(self):
+    def torrent(self) -> TorrentMetadata | None:
         try:
             data = b64decode(self.torrent_data.encode('utf-8'))
         except (TypeError, binascii.Error):
@@ -74,7 +88,7 @@ def torrent(self):
         data = bdecode(data)
         # transform the data into a template-friendly dict
         info = data.get('info', {})
-        metadata = {
+        metadata: TorrentMetadata = {
             'comment': data.get('comment', None),
             'created_by': data.get('created by', None),
             'creation_date': None,
diff --git a/releng/tests/conftest.py b/releng/tests/conftest.py
index 7247fd46..373ec859 100644
--- a/releng/tests/conftest.py
+++ b/releng/tests/conftest.py
@@ -1,4 +1,5 @@
 from base64 import b64encode
+from collections.abc import Generator
 from datetime import datetime, timezone
 
 import pytest
@@ -15,7 +16,7 @@
 
 
 @pytest.fixture
-def release(db):
+def release(db: None) -> Generator[Release, None, None]:
     release = Release.objects.create(
         release_date=datetime.now(),
         version=VERSION,
@@ -28,7 +29,7 @@ def release(db):
 
 
 @pytest.fixture
-def torrent_data():
+def torrent_data() -> str:
     data = {
         'comment': 'comment',
         'created_by': 'Arch Linux',
diff --git a/releng/tests/test_models.py b/releng/tests/test_models.py
index 2d5701d3..c7fe29b9 100644
--- a/releng/tests/test_models.py
+++ b/releng/tests/test_models.py
@@ -1,50 +1,57 @@
-def test_feed(client, release):
+from django.test import Client
+
+from releng.models import Release
+
+
+def test_feed(client: Client, release: Release) -> None:
     response = client.get('/feeds/releases/')
     assert response.status_code == 200
 
 
-def test_str(release):
+def test_str(release: Release) -> None:
     assert str(release) == release.version
 
 
-def test_absolute_url(release):
+def test_absolute_url(release: Release) -> None:
     assert release.version, release.get_absolute_url()
 
 
-def test_iso_url(release):
+def test_iso_url(release: Release) -> None:
     url = release.iso_url()
     ver = release.version
     expected = f'iso/{ver}/archlinux-{ver}-x86_64.iso'
     assert url == expected
 
 
-def test_info_html(release):
+def test_info_html(release: Release) -> None:
     assert release.info in release.info_html()
 
 
-def test_dir_path(release):
+def test_dir_path(release: Release) -> None:
     dir_path = f'iso/{release.version}/'
     assert dir_path == release.dir_path()
 
 
-def test_sitemap(client, release):
+def test_sitemap(client: Client, release: Release) -> None:
     response = client.get('/sitemap-releases.xml')
     assert response.status_code == 200
 
 
-def test_garbage_torrent_data(release):
+def test_garbage_torrent_data(release: Release) -> None:
     assert release.torrent() is None
 
     release.torrent_data = 'garbage'
     assert release.torrent() is None
 
 
-def test_torrent_data(release, torrent_data):
+def test_torrent_data(release: Release, torrent_data: str) -> None:
     release.torrent_data = torrent_data
     data = release.torrent()
+    assert data is not None
+    assert data['file_name'] is not None
     assert 'arch' in data['file_name']
 
 
-def test_magnet_uri(release, torrent_data):
+def test_magnet_uri(release: Release, torrent_data: str) -> None:
     release.torrent_data = torrent_data
     assert release.magnet_uri()
diff --git a/releng/tests/test_views.py b/releng/tests/test_views.py
index f71f22d4..63a9c9d3 100644
--- a/releng/tests/test_views.py
+++ b/releng/tests/test_views.py
@@ -1,4 +1,9 @@
-def test_release_json(client, release, torrent_data):
+from django.test import Client
+
+from releng.models import Release
+
+
+def test_release_json(client: Client, release: Release, torrent_data: str) -> None:
     version = release.version
     response = client.get('/releng/releases/json/')
     assert response.status_code == 200
@@ -20,7 +25,7 @@ def test_release_json(client, release, torrent_data):
     assert release_data['wkd_email'] == release.wkd_email
 
 
-def test_json(db, client):
+def test_json(db: None, client: Client) -> None:
     response = client.get('/releng/releases/json/')
     assert response.status_code == 200
 
@@ -28,7 +33,7 @@ def test_json(db, client):
     assert data['releases'] == []
 
 
-def test_release_json_null_pgp_fingerprint_and_wkd_email(client, db):
+def test_release_json_null_pgp_fingerprint_and_wkd_email(client: Client, db: None) -> None:
     from datetime import datetime
 
     from releng.models import Release
@@ -45,17 +50,17 @@ def test_release_json_null_pgp_fingerprint_and_wkd_email(client, db):
     assert release_data['wkd_email'] is None
 
 
-def test_netboot_page(db, client):
+def test_netboot_page(db: None, client: Client) -> None:
     response = client.get('/releng/netboot/')
     assert response.status_code == 200
 
 
-def test_netboot_config(db, client):
+def test_netboot_config(db: None, client: Client):
     response = client.get('/releng/netboot/archlinux.ipxe')
     assert response.status_code == 200
 
 
-def test_release_torrent(client, release, torrent_data):
+def test_release_torrent(client: Client, release: Release, torrent_data: str) -> None:
     response = client.get(f'/releng/releases/{release.version}/torrent/')
     assert response.status_code == 404
 
@@ -65,7 +70,7 @@ def test_release_torrent(client, release, torrent_data):
     assert response.status_code == 200
 
 
-def test_release_details(client, release):
+def test_release_details(client: Client, release: Release) -> None:
     response = client.get(f'/releng/releases/{release.version}/')
     assert response.status_code == 200
     assert release.version in response.content.decode()
diff --git a/releng/views.py b/releng/views.py
index d6d833b2..00cbced1 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -3,7 +3,7 @@
 
 from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
-from django.http import Http404, HttpResponse
+from django.http import Http404, HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.views.generic import DetailView, ListView
@@ -25,7 +25,7 @@ class ReleaseDetailView(DetailView):
     slug_url_kwarg = 'version'
 
 
-def release_torrent(request, version):
+def release_torrent(request: HttpRequest, version: str) -> HttpResponse:
     release = get_object_or_404(Release, version=version)
     if not release.torrent_data:
         raise Http404
@@ -61,7 +61,7 @@ def default(self, obj):
 
 
 @deprecated_json_endpoint('/api/v1/releng/releases/')
-def releases_json(request):
+def releases_json(request: HttpRequest) -> HttpResponse:
     releases = Release.objects.all()
     try:
         latest_version = Release.objects.filter(available=True).values_list(
@@ -95,10 +95,10 @@ def netboot_config(request):
     return render(request, "releng/archlinux.ipxe", context, content_type='text/plain')
 
 
-def netboot_info(request):
+def netboot_info(request: HttpRequest) -> HttpResponse:
     ipxepkg = None
-    ipxepkgs = Package.objects.filter(pkgname='ipxe').all()
-    ipxepkgs = [pkg for pkg in ipxepkgs if not pkg.repo.testing and 'Staging' not in pkg.repo.name]
+    ipxepkgs_qs = Package.objects.filter(pkgname='ipxe').all()
+    ipxepkgs = [pkg for pkg in ipxepkgs_qs if not pkg.repo.testing and 'Staging' not in pkg.repo.name]
 
     if ipxepkgs:
         ipxepkg = ipxepkgs[0]

From f615b1143797c31f4257199bdc6c7cd09ab91077 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sat, 19 Sep 2026 19:44:26 +0200
Subject: [PATCH 3/4] releng: Rename django queryset

Re-using mirrorurls causes typing issues as it changes the QuerySet to a
list.
---
 releng/views.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/releng/views.py b/releng/views.py
index 00cbced1..04a99773 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -81,12 +81,12 @@ def releases_json(request: HttpRequest) -> HttpResponse:
 
 def netboot_config(request):
     releases = Release.objects.filter(available=True).values_list('version', flat=True).order_by('-release_date')
-    mirrorurls = MirrorUrl.objects.filter(protocol__protocol='http',
-                                          active=True,
-                                          mirror__public=True,
-                                          mirror__active=True,
-                                          mirror__isos=True)
-    mirrorurls = sorted(mirrorurls, key=lambda x: x.mirror.name)
+    mirrorurls_qs = MirrorUrl.objects.filter(protocol__protocol='http',
+                                             active=True,
+                                             mirror__public=True,
+                                             mirror__active=True,
+                                             mirror__isos=True)
+    mirrorurls = sorted(mirrorurls_qs, key=lambda x: x.mirror.name)
     mirrorurls = sorted(mirrorurls, key=lambda x: x.country.name)
     context = {
         'releases': releases,

From f1a22e489df17255f1119a56de05fd9748633c40 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sun, 20 Sep 2026 15:07:02 +0200
Subject: [PATCH 4/4] treewide: Add trivial type hints everywhere

---
 devel/management/commands/generate_keyring.py |  2 +-
 devel/models.py                               |  8 ++---
 devel/reports.py                              |  2 +-
 devel/tests/test_pgp_import.py                |  2 +-
 devel/tests/test_reports.py                   | 35 ++++++++++---------
 devel/tests/test_retire_user.py               | 10 +++---
 devel/utils.py                                |  2 +-
 feeds.py                                      |  2 +-
 main/log.py                                   |  2 +-
 main/models.py                                | 26 +++++++-------
 main/tests/test_donor_import.py               |  8 ++---
 main/tests/test_templatetags_pgp.py           |  6 ++--
 main/utils.py                                 |  2 +-
 mirrors/models.py                             | 27 +++++++-------
 mirrors/tests/test_templatetags.py            |  6 ++--
 news/models.py                                |  8 ++---
 news/tests/test_models.py                     | 11 +++---
 news/views.py                                 |  6 ++--
 packages/alpm.py                              |  4 +--
 .../management/commands/populate_signoffs.py  |  4 +--
 packages/models.py                            | 26 +++++++-------
 packages/tests/test_alpm.py                   |  8 ++---
 packages/tests/test_flag_packages.py          |  9 ++---
 packages/utils.py                             |  2 +-
 planet/models.py                              |  8 ++---
 planet/tests/test_views.py                    |  5 +--
 sitemaps.py                                   |  4 +--
 todolists/models.py                           | 12 +++----
 visualize/tests/test_urls.py                  |  5 ++-
 visualize/views.py                            |  8 ++---
 30 files changed, 136 insertions(+), 124 deletions(-)

diff --git a/devel/management/commands/generate_keyring.py b/devel/management/commands/generate_keyring.py
index 0ce5f3e7..aceef994 100644
--- a/devel/management/commands/generate_keyring.py
+++ b/devel/management/commands/generate_keyring.py
@@ -76,7 +76,7 @@ def generate_keyring(keyserver, keyring):
 }
 
 
-def generate_ownertrust(trust_path):
+def generate_ownertrust(trust_path: str) -> None:
     master_key_ids = MasterKey.objects.values_list("pgp_key", flat=True)
     with open(trust_path, "w") as trustfile:
         for key_id in master_key_ids:
diff --git a/devel/models.py b/devel/models.py
index bfe9f452..8714d533 100644
--- a/devel/models.py
+++ b/devel/models.py
@@ -66,14 +66,14 @@ class Meta:
         verbose_name = 'additional profile data'
         verbose_name_plural = 'additional profile data'
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str | None:
         user = self.user
         group = StaffGroup.objects.filter(group=user.groups.all().first()).get()
         if group:
             return f'{group.get_absolute_url()}#{user.username}'
         return None
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"{self.user}"
 
 
@@ -114,7 +114,7 @@ class Meta:
         ordering = ('created',)
         get_latest_by = 'created'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'{self.owner.get_full_name()}, created {self.created}'
 
 
@@ -145,7 +145,7 @@ class Meta:
         get_latest_by = 'created'
         verbose_name = 'PGP signature'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'{self.signer} → {self.signee}'
 
 
diff --git a/devel/reports.py b/devel/reports.py
index 7ff9c2ac..9cd3ff0f 100644
--- a/devel/reports.py
+++ b/devel/reports.py
@@ -20,7 +20,7 @@ def __init__(self, href, title, desc):
         self.title = title
         self.desc = desc
 
-    def __str__(self):
+    def __str__(self) -> str:
         return format_html('<a href="{href}" title="{title}">{desc}</a>',
                            href=self.href, title=self.title, desc=self.desc)
 
diff --git a/devel/tests/test_pgp_import.py b/devel/tests/test_pgp_import.py
index 54f8d0a8..4b47282b 100644
--- a/devel/tests/test_pgp_import.py
+++ b/devel/tests/test_pgp_import.py
@@ -18,7 +18,7 @@
 ]
 
 
-def test_pgp_import_error():
+def test_pgp_import_error() -> None:
     with pytest.raises(CommandError) as e:
         call_command('pgp_import')
     assert 'keyring_path' in str(e)
diff --git a/devel/tests/test_reports.py b/devel/tests/test_reports.py
index c942c5dd..b5707f45 100644
--- a/devel/tests/test_reports.py
+++ b/devel/tests/test_reports.py
@@ -1,12 +1,15 @@
+from collections.abc import Generator
+
 import pytest
 from django.contrib.auth.models import User
+from django.test import Client
 
 from devel.reports import Linkify
 from packages.models import PackageRelation
 
 
 @pytest.fixture
-def devel_client(client, arches, repos, package):
+def devel_client(client: Client, arches: None, repos: None, package: None) -> Generator[Client]:
     password = 'test'
     user = User.objects.create_superuser('admin',
                                          'admin@archlinux.org',
@@ -21,57 +24,57 @@ def devel_client(client, arches, repos, package):
     user.delete()
 
 
-def test_overview(devel_client):
+def test_overview(devel_client: Client) -> None:
     response = devel_client.get('/devel/')
     assert response.status_code == 200
 
 
-def test_reports_old(devel_client):
+def test_reports_old(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/old', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_outofdate(devel_client):
+def test_reports_outofdate(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/long-out-of-date', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_big(devel_client):
+def test_reports_big(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/big', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_badcompression(devel_client):
+def test_reports_badcompression(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/badcompression', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_uncompressed_man(devel_client):
+def test_reports_uncompressed_man(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/uncompressed-man', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_uncompressed_info(devel_client):
+def test_reports_uncompressed_info(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/uncompressed-info', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_unneeded_orphans(devel_client):
+def test_reports_unneeded_orphans(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/unneeded-orphans', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_mismatched_signature(devel_client):
+def test_reports_mismatched_signature(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/mismatched-signature', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_signature_time(devel_client):
+def test_reports_signature_time(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/signature-time', follow=True)
     assert response.status_code == 200
 
 
-def test_reports_pkgbases(devel_client):
+def test_reports_pkgbases(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/old/pkgbases/')
     assert response.status_code == 200
     assert response['Content-Type'] == 'text/plain'
@@ -83,12 +86,12 @@ def test_reports_pkgbases_with_username(devel_client):
     assert response['Content-Type'] == 'text/plain'
 
 
-def test_reports_pkgbases_invalid_report(devel_client):
+def test_reports_pkgbases_invalid_report(devel_client: Client) -> None:
     response = devel_client.get('/devel/reports/nonexistent/pkgbases/')
     assert response.status_code == 404
 
 
-def test_report_filtered_by_maintainer(devel_client):
+def test_report_filtered_by_maintainer(devel_client: Client) -> None:
     user = User.objects.get(username='admin')
     PackageRelation.objects.create(
         pkgbase='linux',
@@ -104,7 +107,7 @@ def test_report_filtered_by_maintainer(devel_client):
     assert pkgbases == {'linux'}
 
 
-def test_report_pkgbases_filtered_by_maintainer(devel_client):
+def test_report_pkgbases_filtered_by_maintainer(devel_client: Client) -> None:
     user = User.objects.get(username='admin')
     PackageRelation.objects.create(
         pkgbase='linux',
@@ -118,7 +121,7 @@ def test_report_pkgbases_filtered_by_maintainer(devel_client):
     assert response.content.decode().strip() == 'linux'
 
 
-def test_linkify_escapes_html():
+def test_linkify_escapes_html() -> None:
     link = Linkify(href='"><script>alert(1)</script>', title='<img onerror=alert(1)>', desc='<b>xss</b>')
     result = str(link)
     assert '<script>' not in result
diff --git a/devel/tests/test_retire_user.py b/devel/tests/test_retire_user.py
index 06fb7c73..27882bb8 100644
--- a/devel/tests/test_retire_user.py
+++ b/devel/tests/test_retire_user.py
@@ -28,19 +28,19 @@ def test_user(arches, repos, groups):
     user.delete()
 
 
-def test_invalid_args():
+def test_invalid_args() -> None:
     with pytest.raises(CommandError) as e:
         call_command('retire_user')
     assert 'missing argument user.' in str(e)
 
 
-def test_user_not_found(db):
+def test_user_not_found(db: None) -> None:
     with pytest.raises(CommandError) as e:
         call_command('retire_user', 'user1')
     assert "Failed to find User 'user1'" in str(e)
 
 
-def test_userprofile_missing(db):
+def test_userprofile_missing(db: None) -> None:
     user = User.objects.create(username='user2', first_name="Jane",
                                last_name="User2", email="user2@example.com")
 
@@ -50,13 +50,13 @@ def test_userprofile_missing(db):
     user.delete()
 
 
-def test_user_inactive(test_user):
+def test_user_inactive(test_user: User) -> None:
     call_command('retire_user', test_user.username)
     user = User.objects.get(username=test_user.username)
     assert not user.is_active
 
 
-def test_user_moved_groups(test_user):
+def test_user_moved_groups(test_user: User) -> None:
     test_user.groups.add(Group.objects.get(name='Developers'))
     test_user.save()
 
diff --git a/devel/utils.py b/devel/utils.py
index 1e79e07a..4fae079a 100644
--- a/devel/utils.py
+++ b/devel/utils.py
@@ -187,7 +187,7 @@ def find_by_pgp_key(self, pgp_key):
         self.pgp_cache[pgp_key] = user
         return user
 
-    def clear_cache(self):
+    def clear_cache(self) -> None:
         self.cache = {}
         self.username_cache = {}
         self.email_cache = {}
diff --git a/feeds.py b/feeds.py
index dff07836..ca1e7a15 100644
--- a/feeds.py
+++ b/feeds.py
@@ -29,7 +29,7 @@ def write(self, s):
             self.outfile.write(b''.join(buf))
             self.buf = []
 
-    def flush(self):
+    def flush(self) -> None:
         self.outfile.write(b''.join(self.buf))
         self.outfile.flush()
 
diff --git a/main/log.py b/main/log.py
index de6b0037..88c4af9c 100644
--- a/main/log.py
+++ b/main/log.py
@@ -22,7 +22,7 @@ def __setitem__(self, key, value):
         super().__setitem__(key, value)
         self.check_item_limits()
 
-    def check_item_limits(self):
+    def check_item_limits(self) -> None:
         if self.size_limit is None:
             return
         while len(self) > self.size_limit:
diff --git a/main/models.py b/main/models.py
index eb4c59a1..d044982d 100644
--- a/main/models.py
+++ b/main/models.py
@@ -50,7 +50,7 @@ class Arch(models.Model):
     required_signoffs = models.PositiveIntegerField(
         default=2, help_text="Number of signoffs required for packages of this architecture")
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
     def __lt__(self, other):
@@ -75,7 +75,7 @@ class Repo(models.Model):
     bugs_category = models.SmallIntegerField(
         default=2, help_text="Flyspray category ID for this repository.")
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
     def __lt__(self, other):
@@ -116,11 +116,11 @@ class Meta:
         get_latest_by = 'last_update'
         unique_together = (('pkgname', 'repo', 'arch'),)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.pkgname
 
     @property
-    def full_version(self):
+    def full_version(self) -> str:
         if self.epoch > 0:
             return f'{self.epoch}:{self.pkgver}-{self.pkgrel}'
         return f'{self.pkgver}-{self.pkgrel}'
@@ -128,13 +128,13 @@ def full_version(self):
     def get_absolute_url(self):
         return f'/packages/{self.repo.name.lower()}/{self.arch.name}/{self.pkgname}/'
 
-    def get_full_url(self, proto='https'):
+    def get_full_url(self, proto='https') -> str:
         '''get a URL suitable for things like email including the domain'''
         domain = Site.objects.get_current().domain
         return f'{proto}://{domain}{self.get_absolute_url()}'
 
     @property
-    def updated_mins_ago(self):
+    def updated_mins_ago(self) -> int:
         # Note: This uses the archweb metadata update time, not when the
         # package was actually pushed to any repo. We don't have that
         # easily available without adding more fields and scripts.
@@ -143,11 +143,11 @@ def updated_mins_ago(self):
         return int((now - self.last_update).total_seconds()) // 60
 
     @property
-    def is_recent(self):
+    def is_recent(self) -> bool:
         return self.updated_mins_ago <= 90
 
     @property
-    def signature(self):
+    def signature(self) -> SignatureWrapper | None:
         if not self.signature_bytes:
             return None
         data = BinaryData(self.signature_bytes)
@@ -155,7 +155,7 @@ def signature(self):
         return SignatureWrapper(packets[0])
 
     @property
-    def signer(self):
+    def signer(self) -> User | None:
         sig = self.signature
         if sig and sig.key_id:
             try:
@@ -439,7 +439,7 @@ class PackageFile(models.Model):
     directory = models.CharField(max_length=1024)
     filename = models.CharField(max_length=1024, null=True, blank=True)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return "{}{}".format(self.directory, self.filename or '')
 
     class Meta:
@@ -475,10 +475,10 @@ class RebuilderdStatus(models.Model):
     build_id = models.IntegerField(null=True, blank=True)
 
     @property
-    def status_str(self):
+    def status_str(self) -> str:
         return self.REBUILDERD_STATUSES[self.status][1]
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"pkg={self.pkg}, status={self.status_str}"
 
 
@@ -487,7 +487,7 @@ class Soname(models.Model):
     pkg = models.ForeignKey(Package, on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"pkg={self.pkg}, name={self.name}"
 
 
diff --git a/main/tests/test_donor_import.py b/main/tests/test_donor_import.py
index 151a972a..74e8d535 100644
--- a/main/tests/test_donor_import.py
+++ b/main/tests/test_donor_import.py
@@ -12,7 +12,7 @@
 command = Command()
 
 
-def test_parse_subject():
+def test_parse_subject() -> None:
     assert command.parse_subject('garbage') is None
 
     # Valid
@@ -21,14 +21,14 @@ def test_parse_subject():
     assert output == 'John Doe'
 
 
-def test_parse_name():
+def test_parse_name() -> None:
     assert command.sanitize_name('1244') == ''
     assert command.sanitize_name('John Doe') == 'John Doe'
     assert command.sanitize_name(' John Doe ') == 'John Doe'
     assert command.sanitize_name('John Doe 23') == 'John Doe'
 
 
-def test_decode_subject():
+def test_decode_subject() -> None:
     text = 'メイル'
     subject = Header(text, 'utf-8')
     assert command.decode_subject(subject) == text
@@ -41,7 +41,7 @@ def test_invalid_args(monkeypatch):
     assert 'Failed to read from STDIN' in str(e.value)
 
 
-def test_invalid_path():
+def test_invalid_path() -> None:
     with pytest.raises(FileNotFoundError) as e:
         call_command('donor_import', '/tmp/non-existant')
     assert 'No such file or directory' in str(e.value)
diff --git a/main/tests/test_templatetags_pgp.py b/main/tests/test_templatetags_pgp.py
index 38a34a6a..73a52cca 100644
--- a/main/tests/test_templatetags_pgp.py
+++ b/main/tests/test_templatetags_pgp.py
@@ -1,7 +1,7 @@
 from main.templatetags.pgp import format_key, pgp_fingerprint, pgp_key_link
 
 
-def test_format_key():
+def test_format_key() -> None:
     # 40 len case
     pgp_key = '423423fD9004FB063E2C81117BFB1108D234DAFZ'
     pgp_key_len = len(pgp_key)
@@ -26,7 +26,7 @@ def test_format_key():
     assert pgp_key_len == len(format_key(pgp_key))
 
 
-def assert_pgp_key_link(pgp_key):
+def assert_pgp_key_link(pgp_key: str) -> None:
     output = pgp_key_link(int(pgp_key, 16))
     assert pgp_key[2:] in output
     assert "https" in output
@@ -64,7 +64,7 @@ def test_pgp_key_link(settings):
     assert "https" not in pgp_key_link(pgp_key)
 
 
-def test_pgp_fingerprint():
+def test_pgp_fingerprint() -> None:
     assert pgp_fingerprint(None) == ""
     keyid = '423423fD9004FB063E2C81117BFB1108D234DAFZ'
     fingerprint = pgp_fingerprint(keyid)
diff --git a/main/utils.py b/main/utils.py
index d986e87b..90607bf3 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -52,7 +52,7 @@ def clear_cache_function(func, args, kwargs):
     cache.delete(key)
 
 
-def empty_response():
+def empty_response() -> HttpResponse:
     empty = HttpResponse('')
     # designating response as 'streaming' forces ConditionalGetMiddleware to
     # not add a 'Content-Length: 0' header
diff --git a/mirrors/models.py b/mirrors/models.py
index 246d6e42..896265d1 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -1,5 +1,6 @@
 import socket
 from datetime import timedelta
+from typing import Literal
 from urllib.parse import urlparse
 
 from django.contrib.sites.models import Site
@@ -39,16 +40,16 @@ class Mirror(models.Model):
     class Meta:
         ordering = ('name',)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
     def downstream(self):
         return Mirror.objects.filter(upstream=self).order_by('name')
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str:
         return '/mirrors/%s/' % self.name
 
-    def get_full_url(self, proto='https'):
+    def get_full_url(self, proto='https') -> str:
         domain = Site.objects.get_current().domain
         return f'{proto}://{domain}{self.get_absolute_url()}'
 
@@ -61,7 +62,7 @@ class MirrorProtocol(models.Model):
         default=True, help_text="Included by default when building mirror list?")
     created = models.DateTimeField(editable=False)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.protocol
 
     class Meta:
@@ -84,7 +85,7 @@ class MirrorUrl(models.Model):
     class Meta:
         verbose_name = 'mirror URL'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.url
 
     def address_families(self):
@@ -94,7 +95,7 @@ def address_families(self):
         return families
 
     @property
-    def hostname(self):
+    def hostname(self) -> str | None:
         return urlparse(self.url).hostname
 
     def clean(self):
@@ -113,10 +114,10 @@ def clean(self):
             self.has_ipv4 = False
             self.has_ipv6 = False
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str:
         return '/mirrors/%s/%d/' % (self.mirror.name, self.pk)
 
-    def get_full_url(self, proto='https'):
+    def get_full_url(self, proto='https') -> str:
         domain = Site.objects.get_current().domain
         return f'{proto}://{domain}{self.get_absolute_url()}'
 
@@ -127,7 +128,7 @@ class MirrorRsync(models.Model):
     mirror = models.ForeignKey(Mirror, related_name="rsync_ips", on_delete=models.CASCADE)
     created = models.DateTimeField(editable=False)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return str(self.ip)
 
     class Meta:
@@ -145,7 +146,7 @@ class CheckLocation(models.Model):
     class Meta:
         ordering = ('hostname', 'source_ip')
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.hostname
 
     @property
@@ -155,7 +156,7 @@ def family(self):
         return families[0]
 
     @property
-    def ip_version(self):
+    def ip_version(self) -> Literal[4, 6] | None:
         '''Returns integer '4' or '6'.'''
         if self.family == socket.AF_INET6:
             return 6
@@ -174,7 +175,7 @@ class MirrorLog(models.Model):
     error = models.TextField(blank=True, default='')
 
     @property
-    def delay(self):
+    def delay(self) -> timedelta | None:
         if self.last_sync is None:
             return None
         # sanity check, this shouldn't happen
@@ -182,7 +183,7 @@ def delay(self):
             return timedelta()
         return self.check_time - self.last_sync
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"Check of {self.url.url} at {self.check_time}"
 
     class Meta:
diff --git a/mirrors/tests/test_templatetags.py b/mirrors/tests/test_templatetags.py
index 57b49d01..97bde171 100644
--- a/mirrors/tests/test_templatetags.py
+++ b/mirrors/tests/test_templatetags.py
@@ -3,7 +3,7 @@
 from mirrors.templatetags.mirror_status import duration, hours, percentage
 
 
-def test_duration():
+def test_duration() -> None:
     assert duration(None) == ''
 
     assert duration(timedelta(hours=5)) == '5:00'
@@ -12,7 +12,7 @@ def test_duration():
     assert duration(timedelta(microseconds=9999)) == '0:00'
 
 
-def test_hours():
+def test_hours() -> None:
     assert hours(None) == ''
 
     assert hours(timedelta(hours=5)) == '5 hours'
@@ -20,7 +20,7 @@ def test_hours():
     assert hours(timedelta(seconds=60 * 60)) == '1 hour'
 
 
-def test_percentage():
+def test_percentage() -> None:
     assert percentage(None) == ''
     assert percentage(10.0) == '1000.0%'
     assert percentage(10.0, 2) == '1000.00%'
diff --git a/news/models.py b/news/models.py
index cff13884..20e3d1e6 100644
--- a/news/models.py
+++ b/news/models.py
@@ -2,7 +2,7 @@
 from django.contrib.sites.models import Site
 from django.db import models
 from django.db.models.signals import pre_save
-from django.utils.safestring import mark_safe
+from django.utils.safestring import SafeText, mark_safe
 from django.utils.timezone import now
 
 from main.utils import parse_markdown
@@ -20,13 +20,13 @@ class News(models.Model):
     safe_mode = models.BooleanField(default=True)
     send_announce = models.BooleanField(default=True)
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str:
         return '/news/%s/' % self.slug
 
-    def html(self):
+    def html(self) -> SafeText:
         return mark_safe(parse_markdown(self.content, not self.safe_mode))
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.title
 
     class Meta:
diff --git a/news/tests/test_models.py b/news/tests/test_models.py
index 5a4178bc..63ce6173 100644
--- a/news/tests/test_models.py
+++ b/news/tests/test_models.py
@@ -1,18 +1,21 @@
-def test_feed(db, client):
+from django.test import Client
+
+
+def test_feed(db: None, client: Client) -> None:
     response = client.get('/feeds/news/')
     assert response.status_code == 200
 
 
-def test_sitemap(db, client):
+def test_sitemap(db: None, client: Client) -> None:
     response = client.get('/sitemap-news.xml')
     assert response.status_code == 200
 
 
-def test_news_sitemap(db, client):
+def test_news_sitemap(db: None, client: Client) -> None:
     response = client.get('/news-sitemap.xml')
     assert response.status_code == 200
 
 
-def test_newsitem(db, client):
+def test_newsitem(db: None, client: Client) -> None:
     response = client.get('/news/404', follow=True)
     assert response.status_code == 404
diff --git a/news/views.py b/news/views.py
index b961afcc..81e2fbeb 100644
--- a/news/views.py
+++ b/news/views.py
@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.core.mail import EmailMessage
-from django.http import HttpResponse
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template import loader
 from django.views.decorators.http import require_POST
@@ -78,14 +78,14 @@ class NewsDeleteView(DeleteView):
     success_url = "/news/"
 
 
-def view_redirect(request, object_id):
+def view_redirect(request: HttpRequest, object_id: int) -> HttpResponse:
     newsitem = get_object_or_404(News, pk=object_id)
     return redirect(newsitem, permanent=True)
 
 
 @login_required
 @require_POST
-def preview(request):
+def preview(request: HttpRequest) -> HttpResponse:
     data = request.POST.get('data', '')
     markup = parse_markdown(data)
     return HttpResponse(markup)
diff --git a/packages/alpm.py b/packages/alpm.py
index ab7090f0..e6fb95d8 100644
--- a/packages/alpm.py
+++ b/packages/alpm.py
@@ -39,7 +39,7 @@ class AlpmAPI:
         '>=': operator.ge,
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.alpm = ALPM
         self.available = ALPM is not None
 
@@ -63,7 +63,7 @@ def compare_versions(self, ver1, oper, ver2):
         return func(res, 0)
 
 
-def main():  # pragma: no cover
+def main() -> None:  # pragma: no cover
     api = AlpmAPI()
     print(api.version())
     print(api.vercmp(1, 2))
diff --git a/packages/management/commands/populate_signoffs.py b/packages/management/commands/populate_signoffs.py
index 57b0f00e..00242396 100644
--- a/packages/management/commands/populate_signoffs.py
+++ b/packages/management/commands/populate_signoffs.py
@@ -82,7 +82,7 @@ def get_tag_info(repo, pkgbase, version):
     return log
 
 
-def add_signoff_comments():
+def add_signoff_comments() -> None:
     logger.info("getting all signoff groups")
     groups = get_signoff_groups()
     logger.info("%d signoff groups found", len(groups))
@@ -105,7 +105,7 @@ def add_signoff_comments():
             logger.exception("error getting Git commits for %s", group.pkgbase)
 
 
-def cleanup_signoff_comments():
+def cleanup_signoff_comments() -> None:
     logger.info("getting all signoff groups")
     groups = get_signoff_groups()
 
diff --git a/packages/models.py b/packages/models.py
index 61d70b3d..d2005ffa 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -91,12 +91,12 @@ class SignoffSpecification(models.Model):
     objects = SignoffSpecificationManager()
 
     @property
-    def full_version(self):
+    def full_version(self) -> str:
         if self.epoch > 0:
             return '%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
         return f'{self.pkgver}-{self.pkgrel}'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'{self.pkgbase}-{self.full_version}'
 
 
@@ -162,12 +162,12 @@ def packages(self):
                                                arch=self.arch, repo=self.repo)
 
     @property
-    def full_version(self):
+    def full_version(self) -> str:
         if self.epoch > 0:
             return '%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
         return f'{self.pkgver}-{self.pkgrel}'
 
-    def __str__(self):
+    def __str__(self) -> str:
         revoked = ''
         if self.revoked:
             revoked = ' (revoked)'
@@ -197,13 +197,13 @@ class FlagRequest(models.Model):
     class Meta:
         get_latest_by = 'created'
 
-    def who(self):
+    def who(self) -> str:
         if self.user:
             return self.user.get_full_name()
         return self.user_email
 
     @property
-    def full_version(self):
+    def full_version(self) -> str:
         # Difference here from other implementations at the moment: we need to
         # handle the case of pkgver and pkgrel being null as this table didn't
         # originally have version columns.
@@ -220,7 +220,7 @@ def get_associated_packages(self):
             repo__staging=self.repo.staging).order_by(
             'pkgname', 'repo__name', 'arch__name')
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'{self.pkgbase} from {self.who()} on {self.created}'
 
 
@@ -304,13 +304,13 @@ class Update(models.Model):
     class Meta:
         get_latest_by = 'created'
 
-    def is_addition(self):
+    def is_addition(self) -> bool:
         return self.action_flag == ADDITION
 
-    def is_change(self):
+    def is_change(self) -> bool:
         return self.action_flag == CHANGE
 
-    def is_deletion(self):
+    def is_deletion(self) -> bool:
         return self.action_flag == DELETION
 
     @property
@@ -341,10 +341,10 @@ def replacements(self):
             pkgs = pkgs.filter(arch__in=arches)
         return pkgs
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str:
         return f'/packages/{self.repo.name.lower()}/{self.arch.name}/{self.pkgname}/'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'{self.get_action_flag_display()} of {self.pkgname} on {self.created}'
 
 
@@ -493,7 +493,7 @@ class Provision(RelatedToBase):
     # comparison must be '=' for provides
 
     @property
-    def comparison(self):
+    def comparison(self) -> str | None:
         if self.version is not None and self.version != '':
             return '='
         return None
diff --git a/packages/tests/test_alpm.py b/packages/tests/test_alpm.py
index 0841c37f..b3d3ba2c 100644
--- a/packages/tests/test_alpm.py
+++ b/packages/tests/test_alpm.py
@@ -6,7 +6,7 @@
 
 
 @pytest.mark.skipif(not alpm.available, reason="ALPM is unavailable")
-def test_version():
+def test_version() -> None:
     version = alpm.version()
     assert version
     version = version.split(b'.')
@@ -15,13 +15,13 @@ def test_version():
 
 
 @pytest.mark.skipif(not alpm.available, reason="ALPM is unavailable")
-def test_vercmp():
+def test_vercmp() -> None:
     assert alpm.vercmp("1.0", "1.0") == 0
     assert alpm.vercmp("1.1", "1.0") == 1
 
 
 @pytest.mark.skipif(not alpm.available, reason="ALPM is unavailable")
-def test_compare_versions():
+def test_compare_versions() -> None:
     assert alpm.compare_versions("1.0", "<=", "2.0")
     assert alpm.compare_versions("1.0", "<", "2.0")
     assert not alpm.compare_versions("1.0", ">=", "2.0")
@@ -34,7 +34,7 @@ def test_compare_versions():
     assert not alpm.compare_versions("1.0", "!=", "1.0")
 
 
-def test_behavior_when_unavailable():
+def test_behavior_when_unavailable() -> None:
     mock_alpm = AlpmAPI()
     mock_alpm.available = False
 
diff --git a/packages/tests/test_flag_packages.py b/packages/tests/test_flag_packages.py
index 7e743568..f20d236c 100644
--- a/packages/tests/test_flag_packages.py
+++ b/packages/tests/test_flag_packages.py
@@ -1,13 +1,14 @@
+from django.test import Client
 from django.utils import timezone
 
 from main.models import Package
 
 
-def flag_package():
+def flag_package() -> None:
     Package.objects.filter(pkgname='linux').update(flag_date=timezone.now())
 
 
-def test_unflag_package_404(developer_client, package):
+def test_unflag_package_404(developer_client: Client, package: None) -> None:
     response = developer_client.get('/packages/core/x86_64/fooobar/unflag/')
     assert response.status_code == 404
 
@@ -15,13 +16,13 @@ def test_unflag_package_404(developer_client, package):
     assert response.status_code == 404
 
 
-def test_unflag_package(developer_client, package):
+def test_unflag_package(developer_client: Client, package: None) -> None:
     flag_package()
     response = developer_client.get('/packages/core/x86_64/linux/unflag/', follow=True)
     assert response.status_code == 200
 
 
-def test_unflag_all_package(developer_client, package):
+def test_unflag_all_package(developer_client: Client, package: None) -> None:
     flag_package()
     response = developer_client.get('/packages/core/x86_64/linux/unflag/all/', follow=True)
     assert response.status_code == 200
diff --git a/packages/utils.py b/packages/utils.py
index 43a96cfb..95b0735e 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -313,7 +313,7 @@ def approved(self):
         return approved_by_signoffs(self.signoffs, self.specification)
 
     @property
-    def completed(self):
+    def completed(self) -> int:
         return sum(1 for s in self.signoffs if not s.revoked)
 
     @property
diff --git a/planet/models.py b/planet/models.py
index 8cc3b1de..69a00d30 100644
--- a/planet/models.py
+++ b/planet/models.py
@@ -9,7 +9,7 @@ class Feed(models.Model):
     website = models.CharField(max_length=200, null=True, blank=True)
     website_rss = models.CharField(max_length=200, null=True, blank=True)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.title
 
     class Meta:
@@ -28,10 +28,10 @@ class FeedItem(models.Model):
     publishdate = models.DateTimeField("publish date", db_index=True)
     url = models.CharField('URL', max_length=255)
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str:
         return self.url
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.title
 
     class Meta:
@@ -49,7 +49,7 @@ class Planet(models.Model):
     name = models.CharField(max_length=255)
     website = models.CharField(max_length=200, null=True, blank=True)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
     class Meta:
diff --git a/planet/tests/test_views.py b/planet/tests/test_views.py
index 5f7fa34d..419c0b2a 100644
--- a/planet/tests/test_views.py
+++ b/planet/tests/test_views.py
@@ -1,11 +1,12 @@
 from datetime import datetime, timezone
 
 import feedparser
+from django.test import Client
 
 from planet.models import FeedItem
 
 
-def test_feed(db, client):
+def test_feed(db: None, client: Client) -> None:
     response = client.get('/feeds/planet/')
     assert response.status_code == 200
     feed = feedparser.parse(response.content)
@@ -25,6 +26,6 @@ def test_feed_item(db, client):
     assert feed_entry['author'] == 'John Doe'
 
 
-def test_planet(db, client):
+def test_planet(db: None, client: Client) -> None:
     response = client.get('/planet/')
     assert response.status_code == 200
diff --git a/sitemaps.py b/sitemaps.py
index 5f9151b6..81c300fc 100644
--- a/sitemaps.py
+++ b/sitemaps.py
@@ -88,7 +88,7 @@ def location(self, obj):
 
 
 class NewsSitemap(Sitemap):
-    def __init__(self):
+    def __init__(self) -> None:
         now = datetime.now(timezone.utc)
         self.one_day_ago = now - timedelta(days=1)
         self.one_week_ago = now - timedelta(days=7)
@@ -143,7 +143,7 @@ def priority(self, obj):
 class TodolistSitemap(Sitemap):
     priority = "0.4"
 
-    def __init__(self):
+    def __init__(self) -> None:
         now = datetime.now(timezone.utc)
         self.two_weeks_ago = now - timedelta(days=14)
 
diff --git a/todolists/models.py b/todolists/models.py
index d150a40c..c5328cc2 100644
--- a/todolists/models.py
+++ b/todolists/models.py
@@ -31,17 +31,17 @@ class Todolist(models.Model):
     class Meta:
         get_latest_by = 'created'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
     @property
-    def stripped_description(self):
+    def stripped_description(self) -> str:
         return self.description.strip()
 
-    def get_absolute_url(self):
+    def get_absolute_url(self) -> str:
         return '/todo/%s/' % self.slug
 
-    def get_full_url(self, proto='https'):
+    def get_full_url(self, proto='https') -> str:
         '''get a URL suitable for things like email including the domain'''
         domain = Site.objects.get_current().domain
         return f'{proto}://{domain}{self.get_absolute_url()}'
@@ -87,14 +87,14 @@ class Meta:
         unique_together = (('todolist', 'pkgname', 'arch'),)
         get_latest_by = 'created'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.pkgname
 
     def status_css_class(self):
         return self.get_status_display().lower().replace('-', '')
 
     @property
-    def status_str(self):
+    def status_str(self) -> str:
         return self.STATUS_CHOICES[self.status][1]
 
 
diff --git a/visualize/tests/test_urls.py b/visualize/tests/test_urls.py
index f2f81627..06a5e027 100644
--- a/visualize/tests/test_urls.py
+++ b/visualize/tests/test_urls.py
@@ -1,4 +1,7 @@
-def test_urls(client, arches, repos, package):
+from django.test import Client
+
+
+def test_urls(client: Client, arches: None, repos: None, package: None) -> None:
     for url in ['', 'by_repo/', 'by_arch/']:
         response = client.get(f'/visualize/{url}')
         assert response.status_code == 200
diff --git a/visualize/views.py b/visualize/views.py
index 04d0d729..4ddbcad3 100644
--- a/visualize/views.py
+++ b/visualize/views.py
@@ -1,14 +1,14 @@
 import json
 
 from django.db.models import Count, Sum
-from django.http import HttpResponse
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 from django.views.decorators.cache import cache_page
 
 from main.models import Arch, Package, Repo
 
 
-def index(request):
+def index(request: HttpRequest) -> HttpResponse:
     return render(request, 'visualize/index.html')
 
 
@@ -59,14 +59,14 @@ def build_map(name, arch, repo):
 
 
 @cache_page(1800)
-def by_arch(request):
+def by_arch(request: HttpRequest) -> HttpResponse:
     data = arch_repo_data()
     to_json = json.dumps(data['by_arch'], ensure_ascii=False)
     return HttpResponse(to_json, content_type='application/json')
 
 
 @cache_page(1800)
-def by_repo(request):
+def by_repo(request: HttpRequest) -> HttpResponse:
     data = arch_repo_data()
     to_json = json.dumps(data['by_repo'], ensure_ascii=False)
     return HttpResponse(to_json, content_type='application/json')