ruff: Add from __future__ import annotations to most `tilavarauspal…

…velu` files

pyproject.toml

@@ -269,7 +269,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$|^options$|^info$|^na
     "SLF",      # Allow accessing private members in tests
     "TID251"    # Can use banned imports here (e.g. datetime.datetime.now)
 ]
-"tilavarauspalvelu/*"       = ["I002"]  # missing-required-import
+"tilavarauspalvelu/api/graphql/types/application_round_time_slot/types.py" = ["I002"]  # FIXME Somehow importing `TYPE_CHECKING` to this file causes ImportError for `tilavarauspalvelu.api.graphql.schema.schema`
 "local_settings.py"         = ["I002"]  # missing-required-import
 "local_settings_example.py" = ["I002"]  # missing-required-import
 "manage.py"                 = ["I002"]  # missing-required-import

tilavarauspalvelu/admin/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from .ability_group.admin import AbilityGroupAdmin
 from .address.admin import AddressAdmin
 from .age_group.admin import AgeGroupAdmin

tilavarauspalvelu/admin/ability_group/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/address/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _

tilavarauspalvelu/admin/age_group/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 
 from tilavarauspalvelu.models import AgeGroup

tilavarauspalvelu/admin/allocated_timeslot/admin.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from django.contrib import admin
-from django.db.models import QuerySet
 from django.utils.translation import gettext_lazy as _
 from lookup_property import L
 
@@ -12,7 +15,11 @@
 )
 from tilavarauspalvelu.admin.allocated_timeslot.form import AllocatedTimeSlotAdminForm
 from tilavarauspalvelu.models import AllocatedTimeSlot
-from tilavarauspalvelu.typing import WSGIRequest
+
+if TYPE_CHECKING:
+    from django.db.models import QuerySet
+
+    from tilavarauspalvelu.typing import WSGIRequest
 
 
 @admin.register(AllocatedTimeSlot)

tilavarauspalvelu/admin/allocated_timeslot/form.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.utils.translation import gettext_lazy as _
 

tilavarauspalvelu/admin/application/admin.py

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from django.contrib import admin, messages
 from django.contrib.admin import helpers
-from django.db.models import QuerySet
 from django.template.response import TemplateResponse
 from django.utils.translation import gettext_lazy as _
 from lookup_property import L
@@ -14,8 +17,12 @@
 from tilavarauspalvelu.admin.application.form import ApplicationAdminForm
 from tilavarauspalvelu.admin.application_section.admin import ApplicationSectionInline
 from tilavarauspalvelu.models import Application
-from tilavarauspalvelu.models.application.queryset import ApplicationQuerySet
-from tilavarauspalvelu.typing import WSGIRequest
+
+if TYPE_CHECKING:
+    from django.db.models import QuerySet
+
+    from tilavarauspalvelu.models.application.queryset import ApplicationQuerySet
+    from tilavarauspalvelu.typing import WSGIRequest
 
 
 @admin.register(Application)

tilavarauspalvelu/admin/application_round/admin.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from admin_extra_buttons.decorators import button
 from admin_extra_buttons.mixins import ExtraButtonsMixin
 from django.contrib import admin, messages
 from django.contrib.admin import helpers
-from django.db.models import QuerySet
-from django.http import FileResponse
 from django.template.response import TemplateResponse
 from django.utils.translation import gettext_lazy as _
 from lookup_property import L
@@ -16,9 +18,14 @@
     ApplicationRoundApplicationsCSVExporter,
     ApplicationRoundResultCSVExporter,
 )
-from tilavarauspalvelu.typing import WSGIRequest
 from utils.sentry import SentryLogger
 
+if TYPE_CHECKING:
+    from django.db.models import QuerySet
+    from django.http import FileResponse
+
+    from tilavarauspalvelu.typing import WSGIRequest
+
 
 @admin.register(ApplicationRound)
 class ApplicationRoundAdmin(ExtraButtonsMixin, TranslationAdmin):

tilavarauspalvelu/admin/application_round/form.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from django import forms

tilavarauspalvelu/admin/application_round_time_slot/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 
 from tilavarauspalvelu.models import ApplicationRoundTimeSlot

tilavarauspalvelu/admin/application_round_time_slot/form.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.utils.translation import gettext_lazy as _
 from subforms.fields import DynamicArrayField, NestedFormField

tilavarauspalvelu/admin/application_section/admin.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from django.contrib import admin
-from django.db.models import QuerySet
 from django.utils.translation import gettext_lazy as _
 from lookup_property import L
 
@@ -17,9 +20,13 @@
 )
 from tilavarauspalvelu.admin.suitable_time_range.admin import SuitableTimeRangeInline
 from tilavarauspalvelu.models import ApplicationSection, ReservationUnitOption
-from tilavarauspalvelu.typing import WSGIRequest
 from utils.utils import comma_sep_str
 
+if TYPE_CHECKING:
+    from django.db.models import QuerySet
+
+    from tilavarauspalvelu.typing import WSGIRequest
+
 
 class ApplicationSectionInline(admin.TabularInline):
     model = ApplicationSection

tilavarauspalvelu/admin/banner_notification/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _

tilavarauspalvelu/admin/city/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _

tilavarauspalvelu/admin/email_template/utils.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import datetime
 from decimal import Decimal
+from typing import TYPE_CHECKING
 
 from tilavarauspalvelu.enums import EmailType
 from tilavarauspalvelu.integrations.email.template_context import (
@@ -18,9 +21,11 @@
     get_context_for_staff_notification_reservation_requires_handling,
     get_context_for_user_anonymization,
 )
-from tilavarauspalvelu.typing import EmailContext, Lang
 from utils.date_utils import local_datetime
 
+if TYPE_CHECKING:
+    from tilavarauspalvelu.typing import EmailContext, Lang
+
 __all__ = [
     "get_mock_data",
 ]

tilavarauspalvelu/admin/equipment/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/keyword/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/keyword_category/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/keyword_group/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/location/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 
 from tilavarauspalvelu.models import Location

tilavarauspalvelu/admin/organisation/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _

tilavarauspalvelu/admin/payment_accounting/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.contrib import admin
 

tilavarauspalvelu/admin/person/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _

tilavarauspalvelu/admin/purpose/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from adminsortable2.admin import SortableAdminMixin
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin

tilavarauspalvelu/admin/qualifier/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/recurring_reservation/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 
 from tilavarauspalvelu.admin.reservation.admin import ReservationInline

tilavarauspalvelu/admin/request_log/admin.py

@@ -1,22 +1,29 @@
+from __future__ import annotations
+
 import re
+from typing import TYPE_CHECKING
 
 from django import forms
 from django.contrib import admin, messages
 from django.db import models
 from django.db.models.functions import Coalesce
-from django.http import FileResponse
-from django.utils.safestring import SafeString, mark_safe
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from rangefilter.filters import DateTimeRangeFilterBuilder, NumericRangeFilterBuilder
 
 from tilavarauspalvelu.admin.helpers import ImmutableModelAdmin
 from tilavarauspalvelu.admin.sql_log.admin import SQLLogAdminInline
 from tilavarauspalvelu.models.request_log.model import RequestLog
-from tilavarauspalvelu.models.request_log.queryset import RequestLogQuerySet
 from tilavarauspalvelu.services.csv_export import SQLLogCSVExporter
-from tilavarauspalvelu.typing import WSGIRequest
 from utils.sentry import SentryLogger
 
+if TYPE_CHECKING:
+    from django.http import FileResponse
+    from django.utils.safestring import SafeString
+
+    from tilavarauspalvelu.models.request_log.queryset import RequestLogQuerySet
+    from tilavarauspalvelu.typing import WSGIRequest
+
 
 class RequestLogAdminForm(forms.ModelForm):
     class Meta:

tilavarauspalvelu/admin/reservable_time_span/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 
 from tilavarauspalvelu.models import ReservableTimeSpan

tilavarauspalvelu/admin/reservation/form.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.utils.translation import gettext_lazy as _
 

tilavarauspalvelu/admin/reservation_cancel_reason/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/reservation_deny_reason/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from adminsortable2.admin import SortableAdminMixin
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin

tilavarauspalvelu/admin/reservation_metadata_field/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 from django.contrib import admin
 

tilavarauspalvelu/admin/reservation_purpose/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from adminsortable2.admin import SortableAdminMixin
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin

tilavarauspalvelu/admin/reservation_statistic/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from import_export.admin import ExportMixin
 from import_export.formats.base_formats import CSV

tilavarauspalvelu/admin/reservation_unit_cancellation_rule/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/reservation_unit_image/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 
 from tilavarauspalvelu.models import ReservationUnitImage

tilavarauspalvelu/admin/reservation_unit_pricing/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from rangefilter.filters import DateRangeFilterBuilder
 

tilavarauspalvelu/admin/reservation_unit_type/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from adminsortable2.admin import SortableAdminMixin
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin

tilavarauspalvelu/admin/resource/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/service/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 

tilavarauspalvelu/admin/service_sector/admin.py

@@ -1,9 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from django.contrib import admin
 from django.db import models
 from modeltranslation.admin import TranslationAdmin
 
 from tilavarauspalvelu.models import ServiceSector
-from tilavarauspalvelu.typing import WSGIRequest
+
+if TYPE_CHECKING:
+    from tilavarauspalvelu.typing import WSGIRequest
 
 __all__ = [
     "ServiceSectorAdmin",