Merge pull request #251 from python-discord/update-linting

Update linting dependencies & relint

5 files changed, 29 insertions, 23 deletions

diff --git a/pydis_site/apps/api/viewsets/__init__.py b/pydis_site/apps/api/viewsets/__init__.py
index 224e6910..f9a186d9 100644
--- a/pydis_site/apps/api/viewsets/__init__.py
+++ b/pydis_site/apps/api/viewsets/__init__.py
@@ -1,4 +1,5 @@
-from .bot import (  # noqa
+# flake8: noqa
+from .bot import (
     BotSettingViewSet,
     DeletedMessageViewSet,
     DocumentationLinkViewSet,
@@ -10,4 +11,4 @@ from .bot import (  # noqa
     TagViewSet,
     UserViewSet
 )
-from .log_entry import LogEntryViewSet  # noqa
+from .log_entry import LogEntryViewSet
diff --git a/pydis_site/apps/api/viewsets/bot/__init__.py b/pydis_site/apps/api/viewsets/bot/__init__.py
index 465ba5f4..f1851e32 100644
--- a/pydis_site/apps/api/viewsets/bot/__init__.py
+++ b/pydis_site/apps/api/viewsets/bot/__init__.py
@@ -1,10 +1,11 @@
-from .bot_setting import BotSettingViewSet  # noqa
-from .deleted_message import DeletedMessageViewSet  # noqa
-from .documentation_link import DocumentationLinkViewSet  # noqa
-from .infraction import InfractionViewSet  # noqa
-from .nomination import NominationViewSet  # noqa
-from .off_topic_channel_name import OffTopicChannelNameViewSet  # noqa
-from .reminder import ReminderViewSet  # noqa
-from .role import RoleViewSet  # noqa
-from .tag import TagViewSet  # noqa
-from .user import UserViewSet  # noqa
+# flake8: noqa
+from .bot_setting import BotSettingViewSet
+from .deleted_message import DeletedMessageViewSet
+from .documentation_link import DocumentationLinkViewSet
+from .infraction import InfractionViewSet
+from .nomination import NominationViewSet
+from .off_topic_channel_name import OffTopicChannelNameViewSet
+from .reminder import ReminderViewSet
+from .role import RoleViewSet
+from .tag import TagViewSet
+from .user import UserViewSet
diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py
index c471ca2c..edec0a1e 100644
--- a/pydis_site/apps/api/viewsets/bot/infraction.py
+++ b/pydis_site/apps/api/viewsets/bot/infraction.py
@@ -1,3 +1,4 @@
+from django.http.request import HttpRequest
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
@@ -123,7 +124,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     search_fields = ('$reason',)
     frozen_fields = ('id', 'inserted_at', 'type', 'user', 'actor', 'hidden')
 
-    def partial_update(self, request, *_args, **_kwargs):
+    def partial_update(self, request: HttpRequest, *_args, **_kwargs) -> Response:
         """Method that handles the nuts and bolts of updating an Infraction."""
         for field in request.data:
             if field in self.frozen_fields:
@@ -137,7 +138,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         return Response(serializer.data)
 
     @action(url_path='expanded', detail=False)
-    def list_expanded(self, *args, **kwargs):
+    def list_expanded(self, *args, **kwargs) -> Response:
         """
         DRF method for listing Infraction entries.
 
@@ -147,7 +148,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         return self.list(*args, **kwargs)
 
     @list_expanded.mapping.post
-    def create_expanded(self, *args, **kwargs):
+    def create_expanded(self, *args, **kwargs) -> Response:
         """
         DRF method for creating an Infraction.
 
@@ -157,7 +158,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         return self.create(*args, **kwargs)
 
     @action(url_path='expanded', url_name='detail-expanded', detail=True)
-    def retrieve_expanded(self, *args, **kwargs):
+    def retrieve_expanded(self, *args, **kwargs) -> Response:
         """
         DRF method for retrieving a specific Infraction.
 
@@ -167,7 +168,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         return self.retrieve(*args, **kwargs)
 
     @retrieve_expanded.mapping.patch
-    def partial_update_expanded(self, *args, **kwargs):
+    def partial_update_expanded(self, *args, **kwargs) -> Response:
         """
         DRF method for updating an Infraction.
 
diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 8d551697..cf6e262f 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -1,5 +1,6 @@
 from collections import ChainMap
 
+from django.http.request import HttpRequest
 from django.utils import timezone
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import status
@@ -151,7 +152,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     frozen_fields = ('id', 'actor', 'inserted_at', 'user', 'ended_at')
     frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at')
 
-    def create(self, request, *args, **kwargs):
+    def create(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
         DRF method for creating a Nomination.
 
@@ -176,7 +177,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
-    def partial_update(self, request, *args, **kwargs):
+    def partial_update(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
         DRF method for updating a Nomination.
 
diff --git a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
index d977aade..d6da2399 100644
--- a/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
+++ b/pydis_site/apps/api/viewsets/bot/off_topic_channel_name.py
@@ -1,3 +1,5 @@
+from django.db.models.query import QuerySet
+from django.http.request import HttpRequest
 from django.shortcuts import get_object_or_404
 from rest_framework.exceptions import ParseError
 from rest_framework.mixins import DestroyModelMixin
@@ -54,7 +56,7 @@ class OffTopicChannelNameViewSet(DestroyModelMixin, ViewSet):
     lookup_field = 'name'
     serializer_class = OffTopicChannelNameSerializer
 
-    def get_object(self):
+    def get_object(self) -> OffTopicChannelName:
         """
         Returns the OffTopicChannelName entry for this request, if it exists.
 
@@ -64,11 +66,11 @@ class OffTopicChannelNameViewSet(DestroyModelMixin, ViewSet):
         name = self.kwargs[self.lookup_field]
         return get_object_or_404(queryset, name=name)
 
-    def get_queryset(self):
+    def get_queryset(self) -> QuerySet:
         """Returns a queryset that covers the entire OffTopicChannelName table."""
         return OffTopicChannelName.objects.all()
 
-    def create(self, request):
+    def create(self, request: HttpRequest) -> Response:
         """
         DRF method for creating a new OffTopicChannelName.
 
@@ -86,7 +88,7 @@ class OffTopicChannelNameViewSet(DestroyModelMixin, ViewSet):
                 'name': ["This query parameter is required."]
             })
 
-    def list(self, request):
+    def list(self, request: HttpRequest) -> Response:
         """
         DRF method for listing OffTopicChannelName entries.