Add Git Blame Ignore

formatting storm
update classifiers and dependencies
2026-02-12 18:16:24 +01:00 · 2024-09-13 23:19:30 +10:00 · 2024-09-13 23:10:37 +10:00 · 2024-09-13 23:09:12 +10:00 · 2024-09-13 10:50:16 +00:00 · 2024-09-13 10:50:15 +00:00
445 changed files with 1855 additions and 7687 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,6 @@
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+
+
+# Ruff initial formatting storm
+a99315ea55339f0b6010b5c9d8703e51278fcf29
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,7 @@ celerybeat-schedule

 #other
 .flake8
+.ruff_cache
 .pylintrc
 Makefile
 alliance_auth.sqlite3
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,30 +51,6 @@ secret_detection:
  stage: gitlab
  before_script: []

-test-3.8-core:
-  <<: *only-default
-  image: python:3.8-bookworm
-  script:
-    - tox -e py38-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-core:
-  <<: *only-default
-  image: python:3.9-bookworm
-  script:
-    - tox -e py39-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
 test-3.10-core:
  <<: *only-default
  image: python:3.10-bookworm
@@ -111,29 +87,18 @@ test-3.12-core:
        coverage_format: cobertura
        path: coverage.xml

-test-3.8-all:
+test-3.13-core:
  <<: *only-default
-  image: python:3.8-bookworm
+  image: python:3.13-rc-bookworm
  script:
-    - tox -e py38-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-all:
-  <<: *only-default
-  image: python:3.9-bookworm
-  script:
-    - tox -e py39-all
+    - tox -e py313-core
  artifacts:
    when: always
    reports:
      coverage_report:
        coverage_format: cobertura
        path: coverage.xml
+  allow_failure: true

 test-3.10-all:
  <<: *only-default
@@ -172,9 +137,22 @@ test-3.12-all:
        coverage_format: cobertura
        path: coverage.xml

+test-3.13-all:
+  <<: *only-default
+  image: python:3.13-rc-bookworm
+  script:
+    - tox -e py313-all
+  artifacts:
+    when: always
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+  allow_failure: true
+
 build-test:
  stage: test
-  image: python:3.11-bookworm
+  image: python:3.12-bookworm

  before_script:
    - python -m pip install --upgrade pip
@@ -193,13 +171,13 @@ build-test:

 test-docs:
  <<: *only-default
-  image: python:3.11-bookworm
+  image: python:3.12-bookworm
  script:
    - tox -e docs

 deploy_production:
  stage: deploy
-  image: python:3.11-bookworm
+  image: python:3.12-bookworm

  before_script:
    - python -m pip install --upgrade pip
@@ -215,10 +193,10 @@ deploy_production:

 build-image:
  before_script: []
-  image: docker:24.0
+  image: docker:27.0
  stage: docker
  services:
-    - docker:24.0-dind
+    - docker:27-dind
  script: |
    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_SHORT_SHA
@@ -239,10 +217,10 @@ build-image:

 build-image-dev:
  before_script: []
-  image: docker:24.0
+  image: docker:27
  stage: docker
  services:
-    - docker:24.0-dind
+    - docker:27-dind
  script: |
    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
@@ -260,10 +238,10 @@ build-image-dev:

 build-image-mr:
  before_script: []
-  image: docker:24.0
+  image: docker:27
  stage: docker
  services:
-    - docker:24.0-dind
+    - docker:27-dind
  script: |
    CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
    IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$CI_COMMIT_SHORT_SHA
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,14 +4,14 @@
 #   pre-commit autoupdate

 repos:
-  # Code Upgrades
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.4
    hooks:
-      - id: pyupgrade
-        args: [--py38-plus]
+      # Run the linter, and only the linter
+      - id: ruff
+
  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.17.0
+    rev: 1.21.0
    hooks:
      - id: django-upgrade
        args: [--target-version=4.2]
@@ -33,9 +33,9 @@ repos:
      - id: detect-private-key
      - id: check-case-conflict
      # Python checks
-#      - id: check-docstring-first
+      #      - id: check-docstring-first
      - id: debug-statements
-#      - id: requirements-txt-fixer
+      #      - id: requirements-txt-fixer
      - id: fix-encoding-pragma
        args: [--remove]
      - id: fix-byte-order-marker
@@ -50,8 +50,7 @@ repos:
            \.min\.js|
            \.po|
            \.mo|
-            swagger\.json|
-            static/(.*)/libs/
+            swagger\.json
          )
      - id: check-executables-have-shebangs
      - id: end-of-file-fixer
@@ -61,11 +60,10 @@ repos:
            \.min\.js|
            \.po|
            \.mo|
-            swagger\.json|
-            static/(.*)/libs/
+            swagger\.json
          )
  - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 2.7.3
+    rev: 3.0.3
    hooks:
      - id: editorconfig-checker
        exclude: |
@@ -74,8 +72,7 @@ repos:
            allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
            \.po|
            \.mo|
-            swagger\.json|
-            static/(.*)/libs/
+            swagger\.json
          )
  - repo: https://github.com/igorshubovych/markdownlint-cli
    rev: v0.41.0
@@ -85,7 +82,7 @@ repos:
          - --disable=MD013
  # Infrastructure
  - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 2.1.3
+    rev: 2.2.3
    hooks:
      - id: pyproject-fmt
        name: pyproject.toml formatter
@@ -93,9 +90,9 @@ repos:
        args:
          - --indent=4
        additional_dependencies:
-          - tox==4.15.0 # https://github.com/tox-dev/tox/releases/latest
+          - tox==4.18.1 # https://github.com/tox-dev/tox/releases/latest
  - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.18
+    rev: v0.19
    hooks:
      - id: validate-pyproject
        name: Validate pyproject.toml
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -7,11 +7,11 @@ version: 2

 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
  apt_packages:
    - redis
  tools:
-    python: "3.11"
+    python: "3.12"
  jobs:
    post_system_dependencies:
      - redis-server --daemonize yes
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
 [![version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
 [![pipeline status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
-[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](https://allianceauth.readthedocs.io/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](http://allianceauth.readthedocs.io/?badge=latest)
 [![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Chat on Discord](https://img.shields.io/discord/399006117012832262.svg)](https://discord.gg/fjnHAmk)

@@ -14,7 +14,7 @@ An auth system for EVE Online to help in-game organizations manage online servic
 ## Content

 - [Overview](#overview)
- [Documentation](https://allianceauth.rtfd.io)
+- [Documentation](http://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
 - [Developer Team](#development-team)
@@ -38,7 +38,7 @@ Main features:

 - English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr:, Russian :flag_ru:, Italian :flag_it:, French :flag_fr:, Japanese :flag_jp: and Ukrainian :flag_ua: Localization

-For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](https://allianceauth.rtfd.io).
+For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](http://allianceauth.rtfd.io).

 ## Screenshot

--- a/allianceauth/init.py
+++ b/allianceauth/init.py
@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.

-__version__ = '4.6.0'
+__version__ = '4.3.1'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'
--- a/allianceauth/analytics/admin.py
+++ b/allianceauth/analytics/admin.py
@@ -1,16 +1,15 @@
 from django.contrib import admin

 from .models import AnalyticsIdentifier, AnalyticsTokens
-from solo.admin import SingletonModelAdmin


@admin.register(AnalyticsIdentifier)
-class AnalyticsIdentifierAdmin(SingletonModelAdmin):
+class AnalyticsIdentifierAdmin(admin.ModelAdmin):
    search_fields = ['identifier', ]
-    list_display = ['identifier', ]
+    list_display = ('identifier',)


@admin.register(AnalyticsTokens)
 class AnalyticsTokensAdmin(admin.ModelAdmin):
    search_fields = ['name', ]
-    list_display = ['name', 'type', ]
+    list_display = ('name', 'type',)
--- a/allianceauth/analytics/migrations/0001_initial.py
+++ b/allianceauth/analytics/migrations/0001_initial.py
@@ -1,8 +1,9 @@
 # Generated by Django 3.1.4 on 2020-12-30 13:11

-from django.db import migrations, models
 import uuid

+from django.db import migrations, models
+

 class Migration(migrations.Migration):

--- a/allianceauth/analytics/migrations/0002_add_AA_Team_Token.py
+++ b/allianceauth/analytics/migrations/0002_add_AA_Team_Token.py
@@ -21,7 +21,7 @@ def remove_aa_team_token(apps, schema_editor):
    # Have to define some code to remove this identifier
    # In case of migration rollback?
    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens.objects.filter(token="UA-186249766-2").delete()
+    Tokens.objects.filter(token="UA-186249766-2").delete()


 class Migration(migrations.Migration):
--- a/allianceauth/analytics/migrations/0003_Generate_Identifier.py
+++ b/allianceauth/analytics/migrations/0003_Generate_Identifier.py
@@ -1,6 +1,5 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53

-from uuid import uuid4
 from django.db import migrations


--- a/allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token
+++ b/allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token
@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53

-from django.db import migrations
 from django.core.exceptions import ObjectDoesNotExist
+from django.db import migrations


 def add_aa_team_token(apps, schema_editor):
@@ -51,7 +51,7 @@ def remove_aa_team_token(apps, schema_editor):
    # Have to define some code to remove this identifier
    # In case of migration rollback?
    Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    token = Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
+    Tokens.objects.filter(token="G-6LYSMYK8DE").delete()


 class Migration(migrations.Migration):
--- a/allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py
+++ b/allianceauth/analytics/migrations/0010_alter_analyticsidentifier_options.py
@@ -1,17 +0,0 @@
-# Generated by Django 4.2.16 on 2024-12-11 02:17
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('analytics', '0009_remove_analyticstokens_ignore_paths_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='analyticsidentifier',
-            options={'verbose_name': 'Analytics Identifier'},
-        ),
-    ]
--- a/allianceauth/analytics/models.py
+++ b/allianceauth/analytics/models.py
@@ -1,19 +1,26 @@
-from typing import Literal
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from solo.models import SingletonModel
 from uuid import uuid4

+from django.core.exceptions import ValidationError
+from django.db import models
+from django.utils.translation import gettext_lazy as _

-class AnalyticsIdentifier(SingletonModel):

-    identifier = models.UUIDField(default=uuid4, editable=False)
+class AnalyticsIdentifier(models.Model):

-    def __str__(self) -> Literal['Analytics Identifier']:
-        return "Analytics Identifier"
+    identifier = models.UUIDField(
+        default=uuid4,
+        editable=False)

-    class Meta:
-        verbose_name = "Analytics Identifier"
+    def __str__(self) -> str:
+        return f"{self.identifier}"
+
+    def save(self, *args, **kwargs):
+        if not self.pk and AnalyticsIdentifier.objects.exists():
+            # Force a single object
+            raise ValidationError('There is can be only one \
+                                    AnalyticsIdentifier instance')
+        self.pk = self.id = 1  # If this happens to be deleted and recreated, force it to be 1
+        return super().save(*args, **kwargs)


 class AnalyticsTokens(models.Model):
@@ -27,3 +34,6 @@ class AnalyticsTokens(models.Model):
    token = models.CharField(max_length=254, blank=False)
    secret = models.CharField(max_length=254, blank=True)
    send_stats = models.BooleanField(default=False)
+
+    def __str__(self) -> str:
+        return self.name
--- a/allianceauth/analytics/tasks.py
+++ b/allianceauth/analytics/tasks.py
@@ -1,17 +1,16 @@
-import requests
 import logging
-from django.conf import settings
-from django.apps import apps
+
+import requests
 from celery import shared_task
-from .models import AnalyticsTokens, AnalyticsIdentifier
-from .utils import (
-    existence_baremetal_or_docker,
-    install_stat_addons,
-    install_stat_tokens,
-    install_stat_users)
+
+from django.apps import apps
+from django.conf import settings

 from allianceauth import __version__

+from .models import AnalyticsIdentifier, AnalyticsTokens
+from .utils import install_stat_addons, install_stat_tokens, install_stat_users
+
 logger = logging.getLogger(__name__)

 BASE_URL = "https://www.google-analytics.com"
@@ -68,8 +67,8 @@ def analytics_event(namespace: str,
                value=value).apply_async(priority=9)


-@shared_task
-def analytics_daily_stats() -> None:
+@shared_task()
+def analytics_daily_stats():
    """Celery Task: Do not call directly

    Gathers a series of daily statistics
@@ -78,7 +77,6 @@ def analytics_daily_stats() -> None:
    users = install_stat_users()
    tokens = install_stat_tokens()
    addons = install_stat_addons()
-    existence_type = existence_baremetal_or_docker()
    logger.debug("Running Daily Analytics Upload")

    analytics_event(namespace='allianceauth.analytics',
@@ -86,11 +84,6 @@ def analytics_daily_stats() -> None:
                    label='existence',
                    value=1,
                    event_type='Stats')
-    analytics_event(namespace='allianceauth.analytics',
-                    task='send_install_stats',
-                    label=existence_type,
-                    value=1,
-                    event_type='Stats')
    analytics_event(namespace='allianceauth.analytics',
                    task='send_install_stats',
                    label='users',
@@ -106,6 +99,7 @@ def analytics_daily_stats() -> None:
                    label='addons',
                    value=addons,
                    event_type='Stats')
+
    for appconfig in apps.get_app_configs():
        if appconfig.label in [
            "django_celery_beat",
@@ -141,7 +135,7 @@ def analytics_daily_stats() -> None:
                            event_type='Stats')


-@shared_task
+@shared_task()
 def send_ga_tracking_celery_event(
        measurement_id: str,
        secret: str,
@@ -171,7 +165,7 @@ def send_ga_tracking_celery_event(
    }

    payload = {
-        'client_id': AnalyticsIdentifier.get_solo().identifier.hex,
+        'client_id': AnalyticsIdentifier.objects.get(id=1).identifier.hex,
        "user_properties": {
            "allianceauth_version": {
                "value": __version__
--- a/allianceauth/analytics/tests/test_models.py
+++ b/allianceauth/analytics/tests/test_models.py
@@ -1,9 +1,9 @@
-from allianceauth.analytics.models import AnalyticsIdentifier
+from uuid import UUID, uuid4

+from django.core.exceptions import ValidationError
 from django.test.testcases import TestCase

-from uuid import uuid4
-
+from allianceauth.analytics.models import AnalyticsIdentifier

 # Identifiers
 uuid_1 = "ab33e241fbf042b6aa77c7655a768af7"
@@ -13,4 +13,14 @@ uuid_2 = "7aa6bd70701f44729af5e3095ff4b55c"
 class TestAnalyticsIdentifier(TestCase):

    def test_identifier_random(self):
-        self.assertNotEqual(AnalyticsIdentifier.get_solo(), uuid4)
+        self.assertNotEqual(AnalyticsIdentifier.objects.get(), uuid4)
+
+    def test_identifier_singular(self):
+        AnalyticsIdentifier.objects.all().delete()
+        AnalyticsIdentifier.objects.create(identifier=uuid_1)
+        # Yeah i have multiple asserts here, they all do the same thing
+        with self.assertRaises(ValidationError):
+            AnalyticsIdentifier.objects.create(identifier=uuid_2)
+        self.assertEqual(AnalyticsIdentifier.objects.count(), 1)
+        self.assertEqual(AnalyticsIdentifier.objects.get(
+            pk=1).identifier, UUID(uuid_1))
--- a/allianceauth/analytics/tests/test_tasks.py
+++ b/allianceauth/analytics/tests/test_tasks.py
@@ -2,12 +2,9 @@ import requests_mock

 from django.test.utils import override_settings

-from allianceauth.analytics.tasks import (
-    analytics_event,
-    send_ga_tracking_celery_event)
+from allianceauth.analytics.tasks import analytics_event, send_ga_tracking_celery_event
 from allianceauth.utils.testing import NoSocketsTestCase

-
 GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'


--- a/allianceauth/analytics/tests/test_utils.py
+++ b/allianceauth/analytics/tests/test_utils.py
@@ -1,10 +1,9 @@
 from django.apps import apps
-from allianceauth.authentication.models import User
-from esi.models import Token
-from allianceauth.analytics.utils import install_stat_users, install_stat_tokens, install_stat_addons
-
 from django.test.testcases import TestCase

+from allianceauth.analytics.utils import install_stat_addons, install_stat_users
+from allianceauth.authentication.models import User
+

 def create_testdata():
    User.objects.all().delete()
--- a/allianceauth/analytics/utils.py
+++ b/allianceauth/analytics/utils.py
@@ -1,8 +1,9 @@
-import os
 from django.apps import apps
-from allianceauth.authentication.models import User
+
 from esi.models import Token

+from allianceauth.authentication.models import User
+

 def install_stat_users() -> int:
    """Count and Return the number of User accounts
@@ -35,16 +36,3 @@ def install_stat_addons() -> int:
        The Number of Installed Apps"""
    addons = len(list(apps.get_app_configs()))
    return addons
-
-
-def existence_baremetal_or_docker() -> str:
-    """Checks the Installation Type of an install
-
-    Returns
-    -------
-    str
-        existence_baremetal or existence_docker"""
-    docker_tag = os.getenv('AA_DOCKER_TAG')
-    if docker_tag:
-        return "existence_docker"
-    return "existence_baremetal"
--- a/allianceauth/authentication/admin.py
+++ b/allianceauth/authentication/admin.py
@@ -1,43 +1,21 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import Group
-from django.contrib.auth.models import Permission as BasePermission
-from django.contrib.auth.models import User as BaseUser
+from django.contrib.auth.models import Group, Permission as BasePermission, User as BaseUser
 from django.db.models import Count, Q
 from django.db.models.functions import Lower
-from django.db.models.signals import (
-    m2m_changed,
-    post_delete,
-    post_save,
-    pre_delete,
-    pre_save
-)
+from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
 from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.text import slugify

-from allianceauth.authentication.models import (
-    CharacterOwnership,
-    OwnershipRecord,
-    State,
-    UserProfile,
-    get_guest_state
-)
-from allianceauth.eveonline.models import (
-    EveAllianceInfo,
-    EveCharacter,
-    EveCorporationInfo,
-    EveFactionInfo
-)
+from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from allianceauth.eveonline.tasks import update_character
 from allianceauth.hooks import get_hooks
 from allianceauth.services.hooks import ServicesHook

-from .app_settings import (
-    AUTHENTICATION_ADMIN_USERS_MAX_CHARS,
-    AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
-)
+from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_CHARS, AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
 from .forms import UserChangeForm, UserProfileForm


@@ -132,10 +110,7 @@ def user_username(obj):
    To be used for all user based admin lists
    """
    link = reverse(
-        'admin:{}_{}_change'.format(
-            obj._meta.app_label,
-            type(obj).__name__.lower()
-        ),
+        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
        args=(obj.pk,)
    )
    user_obj = obj.user if hasattr(obj, 'user') else obj
@@ -548,7 +523,7 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
    def get_readonly_fields(self, request, obj=None):
        if obj and obj.pk:
            return 'owner_hash', 'character'
-        return tuple()
+        return ()


@admin.register(OwnershipRecord)
--- a/allianceauth/authentication/app_settings.py
+++ b/allianceauth/authentication/app_settings.py
@@ -25,7 +25,7 @@ def _clean_setting(
    if not required_type:
        required_type = type(default_value)

-    if min_value is None and required_type == int:
+    if min_value is None and required_type is int:
        min_value = 0

    if (hasattr(settings, name)
--- a/allianceauth/authentication/apps.py
+++ b/allianceauth/authentication/apps.py
@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.core.checks import register, Tags
+from django.core.checks import Tags, register


 class AuthenticationConfig(AppConfig):
--- a/allianceauth/authentication/auth_hooks.py
+++ b/allianceauth/authentication/auth_hooks.py
@@ -1,6 +1,7 @@
-from allianceauth.hooks import DashboardItemHook
 from allianceauth import hooks
-from .views import dashboard_characters, dashboard_esi_check, dashboard_groups, dashboard_admin
+from allianceauth.hooks import DashboardItemHook
+
+from .views import dashboard_admin, dashboard_characters, dashboard_esi_check, dashboard_groups


 class UserCharactersHook(DashboardItemHook):
--- a/allianceauth/authentication/backends.py
+++ b/allianceauth/authentication/backends.py
@@ -1,10 +1,9 @@
 import logging

 from django.contrib.auth.backends import ModelBackend
-from django.contrib.auth.models import User, Permission
-
-from .models import UserProfile, CharacterOwnership, OwnershipRecord
+from django.contrib.auth.models import Permission, User

+from .models import CharacterOwnership, OwnershipRecord, UserProfile

 logger = logging.getLogger(__name__)

--- a/allianceauth/authentication/checks.py
+++ b/allianceauth/authentication/checks.py
@@ -1,5 +1,5 @@
-from django.core.checks import Error
 from django.conf import settings
+from django.core.checks import Error


 def check_login_scopes_setting(*args, **kwargs):
--- a/allianceauth/authentication/core/celery_workers.py
+++ b/allianceauth/authentication/core/celery_workers.py
@@ -2,7 +2,6 @@

 import itertools
 import logging
-from typing import Optional

 from amqp.exceptions import ChannelError
 from celery import current_app
@@ -12,7 +11,7 @@ from django.conf import settings
 logger = logging.getLogger(__name__)


-def active_tasks_count() -> Optional[int]:
+def active_tasks_count() -> int | None:
    """Return count of currently active tasks
    or None if celery workers are not online.
    """
@@ -20,7 +19,7 @@ def active_tasks_count() -> Optional[int]:
    return _tasks_count(inspect.active())


-def _tasks_count(data: dict) -> Optional[int]:
+def _tasks_count(data: dict) -> int | None:
    """Return count of tasks in data from celery inspect API."""
    try:
        tasks = itertools.chain(*data.values())
@@ -29,7 +28,7 @@ def _tasks_count(data: dict) -> Optional[int]:
    return len(list(tasks))


-def queued_tasks_count() -> Optional[int]:
+def queued_tasks_count() -> int | None:
    """Return count of queued tasks. Return None if there was an error."""
    try:
        with current_app.connection_or_acquire() as conn:
--- a/allianceauth/authentication/decorators.py
+++ b/allianceauth/authentication/decorators.py
@@ -1,14 +1,11 @@
-from django.urls import include
-from django.contrib.auth.decorators import user_passes_test
-from django.core.exceptions import PermissionDenied
+from collections.abc import Callable, Iterable
 from functools import wraps
-from typing import Callable, Iterable, Optional

-from django.urls import include
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect
+from django.urls import include
 from django.utils.translation import gettext_lazy as _


@@ -17,7 +14,7 @@ def user_has_main_character(user):


 def decorate_url_patterns(
-    urls, decorator: Callable, excluded_views: Optional[Iterable] = None
+    urls, decorator: Callable, excluded_views: Iterable | None = None
 ):
    """Decorate views given in url patterns except when they are explicitly excluded.

--- a/allianceauth/authentication/forms.py
+++ b/allianceauth/authentication/forms.py
@@ -60,7 +60,7 @@ class UserChangeForm(BaseUserChangeForm):
                    {
                        "groups": _(
                            "You are not allowed to add or remove these "
-                            "restricted groups: %s" % restricted_names
+                            "restricted groups: {}".format(restricted_names)
                        )
                    }
                )
--- a/allianceauth/authentication/hmac_urls.py
+++ b/allianceauth/authentication/hmac_urls.py
@@ -1,5 +1,6 @@
+from django.urls import include, path, re_path
+
 from allianceauth.authentication import views
-from django.urls import include, re_path, path

 urlpatterns = [
    path('activate/complete/', views.activation_complete, name='registration_activation_complete'),
--- a/allianceauth/authentication/management/commands/checkmains.py
+++ b/allianceauth/authentication/management/commands/checkmains.py
@@ -1,4 +1,5 @@
 from django.core.management.base import BaseCommand
+
 from allianceauth.authentication.models import UserProfile


@@ -11,8 +12,7 @@ class Command(BaseCommand):
        if profiles.exists():
            for profile in profiles:
                self.stdout.write(self.style.ERROR(
-                    '{} does not have an ownership. Resetting user {} main character.'.format(profile.main_character,
-                                                                                                profile.user)))
+                    f'{profile.main_character} does not have an ownership. Resetting user {profile.user} main character.'))
                profile.main_character = None
                profile.save()
            self.stdout.write(self.style.WARNING(f'Reset {profiles.count()} main characters.'))
--- a/allianceauth/authentication/managers.py
+++ b/allianceauth/authentication/managers.py
@@ -1,7 +1,7 @@
 import logging

 from django.db import transaction
-from django.db.models import Manager, QuerySet, Q
+from django.db.models import Manager, Q, QuerySet

 from allianceauth.eveonline.models import EveCharacter

--- a/allianceauth/authentication/middleware.py
+++ b/allianceauth/authentication/middleware.py
@@ -1,8 +1,8 @@
+import logging
+
 from django.conf import settings
 from django.utils.deprecation import MiddlewareMixin

-import logging
-
 logger = logging.getLogger(__name__)


--- a/allianceauth/authentication/migrations/0001_initial.py
+++ b/allianceauth/authentication/migrations/0001_initial.py
@@ -1,8 +1,8 @@
 # Generated by Django 1.10.1 on 2016-09-05 21:38

+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion


 class Migration(migrations.Migration):
--- a/allianceauth/authentication/migrations/0004_create_permissions.py
+++ b/allianceauth/authentication/migrations/0004_create_permissions.py
@@ -2,6 +2,7 @@

 from django.db import migrations

+
 def create_permissions(apps, schema_editor):
    User = apps.get_model('auth', 'User')
    ContentType = apps.get_model('contenttypes', 'ContentType')
--- a/allianceauth/authentication/migrations/0005_delete_perms.py
+++ b/allianceauth/authentication/migrations/0005_delete_perms.py
@@ -2,6 +2,7 @@

 from django.db import migrations

+
 def delete_permissions(apps, schema_editor):
    User = apps.get_model('auth', 'User')
    ContentType = apps.get_model('contenttypes', 'ContentType')
--- a/allianceauth/authentication/migrations/0010_only_one_authservicesinfo.py
+++ b/allianceauth/authentication/migrations/0010_only_one_authservicesinfo.py
@@ -2,6 +2,7 @@

 from django.db import migrations

+
 def count_completed_fields(model):
    return len([True for key, value in model.__dict__.items() if bool(value)])

--- a/allianceauth/authentication/migrations/0011_authservicesinfo_user_onetoonefield.py
+++ b/allianceauth/authentication/migrations/0011_authservicesinfo_user_onetoonefield.py
@@ -1,8 +1,8 @@
 # Generated by Django 1.10.1 on 2017-01-07 07:11

+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion


 class Migration(migrations.Migration):
--- a/allianceauth/authentication/migrations/0012_remove_add_delete_authservicesinfo_permissions.py
+++ b/allianceauth/authentication/migrations/0012_remove_add_delete_authservicesinfo_permissions.py
@@ -1,6 +1,7 @@
 # Generated by Django 1.10.5 on 2017-01-12 00:59

-from django.db import migrations, models
+from django.db import migrations
+

 def remove_permissions(apps, schema_editor):
    ContentType = apps.get_model('contenttypes', 'ContentType')
--- a/allianceauth/authentication/migrations/0013_service_modules.py
+++ b/allianceauth/authentication/migrations/0013_service_modules.py
@@ -1,9 +1,9 @@
 # Generated by Django 1.10.2 on 2016-12-11 23:14

-from django.db import migrations
-
 import logging

+from django.db import migrations
+
 logger = logging.getLogger(__name__)


--- a/allianceauth/authentication/migrations/0015_user_profiles.py
+++ b/allianceauth/authentication/migrations/0015_user_profiles.py
@@ -1,11 +1,12 @@
 # Generated by Django 1.10.5 on 2017-03-22 23:09

-import allianceauth.authentication.models
 import django.db.models.deletion
 from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.db import migrations, models

+import allianceauth.authentication.models
+

 def create_guest_state(apps, schema_editor):
    State = apps.get_model('authentication', 'State')
--- a/allianceauth/authentication/migrations/0016_ownershiprecord.py
+++ b/allianceauth/authentication/migrations/0016_ownershiprecord.py
@@ -1,8 +1,8 @@
 # Generated by Django 2.0.4 on 2018-04-14 18:28

+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion


 def create_initial_records(apps, schema_editor):
--- a/allianceauth/authentication/models.py
+++ b/allianceauth/authentication/models.py
@@ -1,11 +1,11 @@
 import logging

-from django.contrib.auth.models import User, Permission
+from django.contrib.auth.models import Permission, User
 from django.db import models, transaction
 from django.utils.translation import gettext_lazy as _
-from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
+
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from allianceauth.notifications import notify
-from django.conf import settings

 from .managers import CharacterOwnershipManager, StateManager

@@ -60,8 +60,7 @@ def get_guest_state_pk():


 class UserProfile(models.Model):
-    class Meta:
-        default_permissions = ('change',)
+

    class Language(models.TextChoices):
        """
@@ -108,10 +107,15 @@ class UserProfile(models.Model):
        _("Theme"),
        max_length=200,
        blank=True,
-        null=True,
        help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps"
    )

+    class Meta:
+        default_permissions = ('change',)
+
+    def __str__(self) -> str:
+        return str(self.user)
+
    def assign_state(self, state=None, commit=True):
        if not state:
            state = State.objects.get_for_user(self.user)
@@ -122,7 +126,7 @@ class UserProfile(models.Model):
                self.save(update_fields=['state'])
                notify(
                    self.user,
-                    _('State changed to: %s' % state),
+                    _('State changed to: {}'.format(state)),
                    _('Your user\'s state is now: %(state)s')
                    % ({'state': state}),
                    'info'
@@ -137,19 +141,18 @@ class UserProfile(models.Model):
                    sender=self.__class__, user=self.user, state=self.state
                )

-    def __str__(self):
-        return str(self.user)
+
 class CharacterOwnership(models.Model):
-    class Meta:
-        default_permissions = ('change', 'delete')
-        ordering = ['user', 'character__character_name']
+

    character = models.OneToOneField(EveCharacter, on_delete=models.CASCADE, related_name='character_ownership')
    owner_hash = models.CharField(max_length=28, unique=True)
    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')

    objects = CharacterOwnershipManager()
-
+    class Meta:
+        default_permissions = ('change', 'delete')
+        ordering = ['user', 'character__character_name']
    def __str__(self):
        return f"{self.user}: {self.character}"

--- a/allianceauth/authentication/signals.py
+++ b/allianceauth/authentication/signals.py
@@ -1,19 +1,16 @@
 import logging

-from .models import (
-    CharacterOwnership,
-    UserProfile,
-    get_guest_state,
-    State,
-    OwnershipRecord)
 from django.contrib.auth.models import User
 from django.db.models import Q
-from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
-from django.dispatch import receiver, Signal
+from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
+from django.dispatch import Signal, receiver
+
 from esi.models import Token

 from allianceauth.eveonline.models import EveCharacter

+from .models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
+
 logger = logging.getLogger(__name__)

 state_changed = Signal()
@@ -108,8 +105,7 @@ def record_character_ownership(sender, instance, created, *args, **kwargs):
 def validate_main_character(sender, instance, *args, **kwargs):
    try:
        if instance.user.profile.main_character == instance.character:
-            logger.info("Ownership of a main character {} has been revoked. Resetting {} main character.".format(
-                instance.character, instance.user))
+            logger.info(f"Ownership of a main character {instance.character} has been revoked. Resetting {instance.user} main character.")
            # clear main character as user no longer owns them
            instance.user.profile.main_character = None
            instance.user.profile.save()
--- a/allianceauth/authentication/task_statistics/counters.py
+++ b/allianceauth/authentication/task_statistics/counters.py
@@ -1,7 +1,7 @@
 """Counters for Task Statistics."""

 import datetime as dt
-from typing import NamedTuple, Optional
+from typing import NamedTuple

 from .event_series import EventSeries

@@ -16,7 +16,7 @@ class _TaskCounts(NamedTuple):
    retried: int
    failed: int
    total: int
-    earliest_task: Optional[dt.datetime]
+    earliest_task: dt.datetime | None
    hours: int


--- a/allianceauth/authentication/task_statistics/event_series.py
+++ b/allianceauth/authentication/task_statistics/event_series.py
@@ -2,7 +2,6 @@

 import datetime as dt
 import logging
-from typing import List, Optional

 from pytz import utc
 from redis import Redis
@@ -17,7 +16,7 @@ class EventSeries:

    _ROOT_KEY = "ALLIANCEAUTH_EVENT_SERIES"

-    def __init__(self, key_id: str, redis: Optional[Redis] = None) -> None:
+    def __init__(self, key_id: str, redis: Redis | None = None) -> None:
        self._redis = get_redis_client_or_stub() if not redis else redis
        self._key_id = str(key_id)
        self.clear()
@@ -46,7 +45,7 @@ class EventSeries:
        my_id = self._redis.incr(self._key_counter)
        self._redis.zadd(self._key_sorted_set, {my_id: event_time.timestamp()})

-    def all(self) -> List[dt.datetime]:
+    def all(self) -> list[dt.datetime]:
        """List of all known events."""
        return [
            event[1]
@@ -75,7 +74,7 @@ class EventSeries:
        maximum = "+inf" if not latest else latest.timestamp()
        return self._redis.zcount(self._key_sorted_set, min=minimum, max=maximum)

-    def first_event(self, earliest: dt.datetime = None) -> Optional[dt.datetime]:
+    def first_event(self, earliest: dt.datetime = None) -> dt.datetime | None:
        """Date/Time of first event. Returns `None` if series has no events.

        Args:
--- a/allianceauth/authentication/task_statistics/signals.py
+++ b/allianceauth/authentication/task_statistics/signals.py
@@ -1,7 +1,11 @@
 """Signals for Task Statistics."""

 from celery.signals import (
-    task_failure, task_internal_error, task_retry, task_success, worker_ready,
+    task_failure,
+    task_internal_error,
+    task_retry,
+    task_success,
+    worker_ready,
 )

 from django.conf import settings
--- a/allianceauth/authentication/task_statistics/tests/test_counters.py
+++ b/allianceauth/authentication/task_statistics/tests/test_counters.py
@@ -4,7 +4,10 @@ from django.test import TestCase
 from django.utils.timezone import now

 from allianceauth.authentication.task_statistics.counters import (
-    dashboard_results, failed_tasks, retried_tasks, succeeded_tasks,
+    dashboard_results,
+    failed_tasks,
+    retried_tasks,
+    succeeded_tasks,
 )


--- a/allianceauth/authentication/task_statistics/tests/test_helpers.py
+++ b/allianceauth/authentication/task_statistics/tests/test_helpers.py
@@ -4,7 +4,8 @@ from unittest.mock import patch
 from redis import RedisError

 from allianceauth.authentication.task_statistics.helpers import (
-    _RedisStub, get_redis_client_or_stub,
+    _RedisStub,
+    get_redis_client_or_stub,
 )

 MODULE_PATH = "allianceauth.authentication.task_statistics.helpers"
--- a/allianceauth/authentication/task_statistics/tests/test_signals.py
+++ b/allianceauth/authentication/task_statistics/tests/test_signals.py
@@ -10,8 +10,8 @@ from allianceauth.authentication.task_statistics.counters import (
    succeeded_tasks,
 )
 from allianceauth.authentication.task_statistics.signals import (
-    reset_counters,
    is_enabled,
+    reset_counters,
 )
 from allianceauth.eveonline.tasks import update_character

--- a/allianceauth/authentication/tasks.py
+++ b/allianceauth/authentication/tasks.py
@@ -1,9 +1,10 @@
 import logging

-from esi.errors import TokenExpiredError, TokenInvalidError, IncompleteResponseError
-from esi.models import Token
 from celery import shared_task

+from esi.errors import IncompleteResponseError, TokenExpiredError, TokenInvalidError
+from esi.models import Token
+
 from allianceauth.authentication.models import CharacterOwnership

 logger = logging.getLogger(__name__)
@@ -22,8 +23,7 @@ def check_character_ownership(owner_hash):
                continue
            except (KeyError, IncompleteResponseError):
                # We can't validate the hash hasn't changed but also can't assume it has. Abort for now.
-                logger.warning("Failed to validate owner hash of {} due to problems contacting SSO servers.".format(
-                    tokens[0].character_name))
+                logger.warning(f"Failed to validate owner hash of {tokens[0].character_name} due to problems contacting SSO servers.")
                break

            if not t.character_owner_hash == old_hash:
@@ -33,7 +33,7 @@ def check_character_ownership(owner_hash):
            break

    if not Token.objects.filter(character_owner_hash=owner_hash).exists():
-        logger.info('No tokens found with owner hash %s. Revoking ownership.' % owner_hash)
+        logger.info(f'No tokens found with owner hash {owner_hash}. Revoking ownership.')
        CharacterOwnership.objects.filter(owner_hash=owner_hash).delete()


--- a/allianceauth/authentication/templates/authentication/tokens.html
+++ b/allianceauth/authentication/templates/authentication/tokens.html
@@ -1,6 +1,5 @@
 {% extends "allianceauth/base-bs5.html" %}

-{% load aa_i18n %}
 {% load i18n %}

 {% block page_title %}
@@ -51,23 +50,20 @@
 {% block extra_javascript %}
    {% include "bundles/datatables-js-bs5.html" %}

-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
    <script>
        $(document).ready(() => {
            let grp = 2;

-            $('#table_tokens').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
+            const table = $('#table_tokens').DataTable({
                'columnDefs': [{orderable: false, targets: [0, 1]}, {
                    'visible': false,
                    'targets': grp
                }],
                'order': [[grp, 'asc']],
                'drawCallback': function (settings) {
-                    const api = this.api();
-                    const rows = api.rows({page: 'current'}).nodes();
-                    let last = null;
+                    var api = this.api();
+                    var rows = api.rows({page: 'current'}).nodes();
+                    var last = null;
                    api.column(grp, {page: 'current'})
                        .data()
                        .each((group, i) => {
--- a/allianceauth/authentication/templates/public/lang_select.html
+++ b/allianceauth/authentication/templates/public/lang_select.html
@@ -5,11 +5,11 @@
        {% csrf_token %}

        <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
-            {% get_available_languages as LANGUAGES %}
+            {% get_language_info_list for LANGUAGES as languages %}

-            {% for lang_code, lang_name in LANGUAGES %}
-                <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
-                    {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
+            {% for language in languages %}
+                <option lang="{{ language.code }}" value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
+                    {{ language.name_local|capfirst }} ({{ language.code }})
                </option>
            {% endfor %}
        </select>
--- a/allianceauth/authentication/tests/init.py
+++ b/allianceauth/authentication/tests/init.py
@@ -1,12 +1,7 @@
-from django.db.models.signals import (
-    m2m_changed,
-    post_save,
-    pre_delete,
-    pre_save
-)
-from django.urls import reverse
 from unittest import mock

+from django.urls import reverse
+
 MODULE_PATH = 'allianceauth.authentication'


@@ -17,9 +12,7 @@ def patch(target, *args, **kwargs):
 def get_admin_change_view_url(obj: object) -> str:
    """returns URL to admin change view for given object"""
    return reverse(
-        'admin:{}_{}_change'.format(
-            obj._meta.app_label, type(obj).__name__.lower()
-        ),
+        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
        args=(obj.pk,)
    )

--- a/allianceauth/authentication/tests/core/test_celery_workers.py
+++ b/allianceauth/authentication/tests/core/test_celery_workers.py
@@ -5,7 +5,8 @@ from amqp.exceptions import ChannelError
 from django.test import TestCase

 from allianceauth.authentication.core.celery_workers import (
-    active_tasks_count, queued_tasks_count,
+    active_tasks_count,
+    queued_tasks_count,
 )

 MODULE_PATH = "allianceauth.authentication.core.celery_workers"
--- a/allianceauth/authentication/tests/test_admin.py
+++ b/allianceauth/authentication/tests/test_admin.py
@@ -1,42 +1,37 @@
-from bs4 import BeautifulSoup
+from unittest.mock import MagicMock, patch
 from urllib.parse import quote
-from unittest.mock import patch, MagicMock

+from bs4 import BeautifulSoup
 from django_webtest import WebTest

 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import Group
-from django.test import TestCase, RequestFactory, Client
+from django.test import Client, RequestFactory, TestCase

-from allianceauth.authentication.models import (
-    CharacterOwnership, State, OwnershipRecord
-)
-from allianceauth.eveonline.models import (
-    EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
-)
+from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from allianceauth.services.hooks import ServicesHook
 from allianceauth.tests.auth_utils import AuthUtils

 from ..admin import (
    BaseUserAdmin,
    CharacterOwnershipAdmin,
-    StateAdmin,
-    MainCorporationsFilter,
    MainAllianceFilter,
+    MainCorporationsFilter,
    MainFactionFilter,
    OwnershipRecordAdmin,
+    StateAdmin,
    User,
    UserAdmin,
+    make_service_hooks_sync_nickname_action,
+    make_service_hooks_update_groups_action,
+    update_main_character_model,
    user_main_organization,
    user_profile_pic,
    user_username,
-    update_main_character_model,
-    make_service_hooks_update_groups_action,
-    make_service_hooks_sync_nickname_action
 )
 from . import get_admin_change_view_url, get_admin_search_url

-
 MODULE_PATH = 'allianceauth.authentication.admin'


@@ -327,15 +322,15 @@ class TestUserAdmin(TestCaseWithTestData):

    def test_user_username_u1(self):
        expected = (
-            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Bruce_Wayne</a></strong><br>Bruce Wayne'.format(self.user_1.pk)
+            f'<strong><a href="/admin/authentication/user/{self.user_1.pk}/change/">'
+            'Bruce_Wayne</a></strong><br>Bruce Wayne'
        )
        self.assertEqual(user_username(self.user_1), expected)

    def test_user_username_u3(self):
        expected = (
-            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Lex_Luthor</a></strong>'.format(self.user_3.pk)
+            f'<strong><a href="/admin/authentication/user/{self.user_3.pk}/change/">'
+            'Lex_Luthor</a></strong>'
        )
        self.assertEqual(user_username(self.user_3), expected)

--- a/allianceauth/authentication/tests/test_app_settings.py
+++ b/allianceauth/authentication/tests/test_app_settings.py
@@ -1,4 +1,5 @@
 from unittest.mock import Mock, patch
+
 from django.test import TestCase

 from .. import app_settings
@@ -83,7 +84,7 @@ class TestSetAppSetting(TestCase):
        self.assertEqual(result, 50)

    @patch(MODULE_PATH + '.app_settings.settings')
-    def test_default_for_invalid_type_int(self, mock_settings):
+    def test_default_for_outofrange_int(self, mock_settings):
        mock_settings.TEST_SETTING_DUMMY = 1000
        result = app_settings._clean_setting(
            'TEST_SETTING_DUMMY',
@@ -96,7 +97,7 @@ class TestSetAppSetting(TestCase):
    def test_default_is_none_needs_required_type(self, mock_settings):
        mock_settings.TEST_SETTING_DUMMY = 'invalid type'
        with self.assertRaises(ValueError):
-            result = app_settings._clean_setting(
+            app_settings._clean_setting(
                'TEST_SETTING_DUMMY',
                default_value=None
            )
--- a/allianceauth/authentication/tests/test_backend.py
+++ b/allianceauth/authentication/tests/test_backend.py
@@ -1,13 +1,13 @@
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group, User
 from django.test import TestCase

+from esi.models import Token
+
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.tests.auth_utils import AuthUtils

-from esi.models import Token
-
 from ..backends import StateBackend
-from ..models import CharacterOwnership, UserProfile, OwnershipRecord
+from ..models import CharacterOwnership, OwnershipRecord, UserProfile

 MODULE_PATH = 'allianceauth.authentication'

--- a/allianceauth/authentication/tests/test_decorators.py
+++ b/allianceauth/authentication/tests/test_decorators.py
@@ -6,12 +6,11 @@ from django.contrib.auth.models import AnonymousUser
 from django.http.response import HttpResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.urls import reverse, URLPattern
+from django.urls import URLPattern, reverse

 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.tests.auth_utils import AuthUtils

-
 from ..decorators import decorate_url_patterns, main_character_required
 from ..models import CharacterOwnership

@@ -47,7 +46,7 @@ class DecoratorTestCase(TestCase):

    @mock.patch(MODULE_PATH + '.decorators.messages')
    def test_login_redirect(self, m):
-        setattr(self.request, 'user', AnonymousUser())
+        self.request.user = AnonymousUser()
        response = self.dummy_view(self.request)
        self.assertEqual(response.status_code, 302)
        url = getattr(response, 'url', None)
@@ -55,7 +54,7 @@ class DecoratorTestCase(TestCase):

    @mock.patch(MODULE_PATH + '.decorators.messages')
    def test_main_character_redirect(self, m):
-        setattr(self.request, 'user', self.no_main_user)
+        self.request.user = self.no_main_user
        response = self.dummy_view(self.request)
        self.assertEqual(response.status_code, 302)
        url = getattr(response, 'url', None)
@@ -63,7 +62,7 @@ class DecoratorTestCase(TestCase):

    @mock.patch(MODULE_PATH + '.decorators.messages')
    def test_successful_request(self, m):
-        setattr(self.request, 'user', self.main_user)
+        self.request.user = self.main_user
        response = self.dummy_view(self.request)
        self.assertEqual(response.status_code, 200)

--- a/allianceauth/authentication/tests/test_middleware.py
+++ b/allianceauth/authentication/tests/test_middleware.py
@@ -1,10 +1,10 @@
-from unittest import mock
-from allianceauth.authentication.middleware import UserSettingsMiddleware
 from unittest.mock import Mock
-from django.http import HttpResponse

+from django.http import HttpResponse
 from django.test.testcases import TestCase

+from allianceauth.authentication.middleware import UserSettingsMiddleware
+

 class TestUserSettingsMiddlewareSaveLang(TestCase):

@@ -39,7 +39,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
        of a non-existent (anonymous) user
        """
        self.request.user.is_anonymous = True
-        response = self.middleware.process_response(
+        self.middleware.process_response(
            self.request,
            self.response
            )
@@ -52,7 +52,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
        does the middleware change a language not set in the DB
        """
        self.request.user.profile.language = None
-        response = self.middleware.process_response(
+        self.middleware.process_response(
            self.request,
            self.response
            )
@@ -64,7 +64,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
        """
        Tests the middleware will change a language setting
        """
-        response = self.middleware.process_response(
+        self.middleware.process_response(
            self.request,
            self.response
            )
@@ -158,7 +158,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
        tests the middleware will set night_mode if not set
        """
        self.request.session = {}
-        response = self.middleware.process_response(
+        self.middleware.process_response(
            self.request,
            self.response
            )
@@ -168,7 +168,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
        """
        tests the middleware will set night_mode if set.
        """
-        response = self.middleware.process_response(
+        self.middleware.process_response(
            self.request,
            self.response
            )
--- a/allianceauth/authentication/tests/test_models.py
+++ b/allianceauth/authentication/tests/test_models.py
@@ -3,12 +3,12 @@ from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase

-from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\
-    EveAllianceInfo, EveFactionInfo
-from allianceauth.tests.auth_utils import AuthUtils
 from esi.errors import IncompleteResponseError
 from esi.models import Token

+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+from allianceauth.tests.auth_utils import AuthUtils
+
 from ..models import CharacterOwnership, State, get_guest_state
 from ..tasks import check_character_ownership

--- a/allianceauth/authentication/tests/test_signals.py
+++ b/allianceauth/authentication/tests/test_signals.py
@@ -1,19 +1,11 @@
+
+from django.db.models.signals import post_save
+from django.test.testcases import TestCase
+
 from allianceauth.authentication.models import User, UserProfile
-from allianceauth.eveonline.models import (
-    EveCharacter,
-    EveCorporationInfo,
-    EveAllianceInfo
-)
-from django.db.models.signals import (
-    pre_save,
-    post_save,
-    pre_delete,
-    m2m_changed
-)
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
 from allianceauth.tests.auth_utils import AuthUtils

-from django.test.testcases import TestCase
-from unittest.mock import Mock
 from . import patch


--- a/allianceauth/authentication/tests/test_templatetags.py
+++ b/allianceauth/authentication/tests/test_templatetags.py
@@ -9,8 +9,12 @@ from django.core.cache import cache
 from django.test import TestCase

 from allianceauth.templatetags.admin_status import (
-    _current_notifications, _current_version_summary, _fetch_list_from_gitlab,
-    _fetch_notification_issues_from_gitlab, _latests_versions, status_overview,
+    _current_notifications,
+    _current_version_summary,
+    _fetch_list_from_gitlab,
+    _fetch_notification_issues_from_gitlab,
+    _latests_versions,
+    status_overview,
 )

 MODULE_PATH = 'allianceauth.templatetags'
@@ -127,7 +131,7 @@ class TestNotifications(TestCase):
        # when
        result = _current_notifications()
        # then
-        self.assertEqual(result['notifications'], list())
+        self.assertEqual(result['notifications'], [])

    @patch(MODULE_PATH + '.admin_status.cache')
    def test_current_notifications_is_none(self, mock_cache):
@@ -136,7 +140,7 @@ class TestNotifications(TestCase):
        # when
        result = _current_notifications()
        # then
-        self.assertEqual(result['notifications'], list())
+        self.assertEqual(result['notifications'], [])


 class TestCeleryQueueLength(TestCase):
--- a/allianceauth/authentication/tests/test_views.py
+++ b/allianceauth/authentication/tests/test_views.py
@@ -1,12 +1,13 @@
 import json
-import requests_mock
 from unittest.mock import patch

+import requests_mock
+
 from django.test import RequestFactory, TestCase

-from allianceauth.authentication.views import task_counts, esi_check
-from allianceauth.tests.auth_utils import AuthUtils
 from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES
+from allianceauth.authentication.views import esi_check, task_counts
+from allianceauth.tests.auth_utils import AuthUtils

 MODULE_PATH = "allianceauth.authentication.views"

--- a/allianceauth/authentication/views.py
+++ b/allianceauth/authentication/views.py
@@ -1,11 +1,6 @@
 import logging

 import requests
-from django_registration.backends.activation.views import (
-    REGISTRATION_SALT, ActivationView as BaseActivationView,
-    RegistrationView as BaseRegistrationView,
-)
-from django_registration.signals import user_registered

 from django.conf import settings
 from django.contrib import messages
@@ -18,6 +13,12 @@ from django.shortcuts import redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
+from django_registration.backends.activation.views import (
+    REGISTRATION_SALT,
+    ActivationView as BaseActivationView,
+    RegistrationView as BaseRegistrationView,
+)
+from django_registration.signals import user_registered

 from esi.decorators import token_required
 from esi.models import Token
@@ -32,7 +33,7 @@ from .models import CharacterOwnership

 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
    _has_auto_groups = True
-    from allianceauth.eveonline.autogroups.models import *  # noqa: F401, F403
+    from allianceauth.eveonline.autogroups.models import *  # noqa: F403
 else:
    _has_auto_groups = False

@@ -87,7 +88,7 @@ def dashboard_esi_check(request):

@login_required
 def dashboard(request):
-    _dash_items = list()
+    _dash_items = []
    hooks = get_hooks('dashboard_hook')
    items = [fn() for fn in hooks]
    items.sort(key=lambda i: i.order)
@@ -164,9 +165,7 @@ def main_character_change(request, token):
        request.user.profile.save(update_fields=['main_character'])
        messages.success(request, _('Changed main character to %s') % co.character)
        logger.info(
-            'Changed user {user} main character to {char}'.format(
-                user=request.user, char=co.character
-            )
+            f'Changed user {request.user} main character to {co.character}'
        )
    return redirect("authentication:dashboard")

@@ -176,10 +175,9 @@ def add_character(request, token):
    if CharacterOwnership.objects.filter(character__character_id=token.character_id).filter(
            owner_hash=token.character_owner_hash).filter(user=request.user).exists():
        messages.success(request, _(
-            'Added %(name)s to your account.' % ({'name': token.character_name})))
+            'Added {name} to your account.'.format(name=token.character_name)))
    else:
-        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % (
-            {'name': token.character_name})))
+        messages.error(request, _('Failed to add {name} to your account: they already have an account.'.format(name=token.character_name)))
    return redirect('authentication:dashboard')


@@ -294,7 +292,7 @@ class RegistrationView(BaseRegistrationView):
            return redirect(settings.LOGIN_URL)
        if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
            # Keep the request so the user can be automagically logged in.
-            setattr(self, 'request', request)
+            self.request = request
        return super().dispatch(request, *args, **kwargs)

    def register(self, form):
--- a/allianceauth/bin/allianceauth.py
+++ b/allianceauth/bin/allianceauth.py
@@ -2,6 +2,7 @@
 import os
 import shutil
 from optparse import OptionParser
+
 from django.core.management import call_command
 from django.core.management.commands.startproject import Command as BaseStartProject

@@ -43,7 +44,7 @@ def create_project(parser, options, args):
    # Call the command with extra context
    call_command(StartProject(), *args, **command_options)

-    print(f"Success! {args[0]} has been created.")  # noqa
+    print(f"Success! {args[0]} has been created.")


 def update_settings(parser, options, args):
@@ -62,7 +63,7 @@ def update_settings(parser, options, args):
        # next check if given path is to the project, so the app is within it
        settings_path = os.path.join(project_path, project_name, 'settings/base.py')
        if not os.path.exists(settings_path):
-            parser.error("Unable to locate the Alliance Auth project at %s" % project_path)
+            parser.error(f"Unable to locate the Alliance Auth project at {project_path}")

    # first find the path to the Alliance Auth template settings
    import allianceauth
--- a/allianceauth/checks.py
+++ b/allianceauth/checks.py
@@ -1,13 +1,16 @@
-from typing import List
-from django import db
-from django.core.checks import CheckMessage, Error, register, Warning
-from allianceauth.utils.cache import get_redis_client
-from django.utils import timezone
-from packaging.version import InvalidVersion, Version as Pep440Version
-from celery import current_app
-from django.conf import settings
+import datetime
 from sqlite3.dbapi2 import sqlite_version_info

+from celery import current_app
+from packaging.version import InvalidVersion, Version as Pep440Version
+
+from django import db
+from django.conf import settings
+from django.core.checks import CheckMessage, Error, Warning, register
+from django.utils import timezone
+
+from allianceauth.utils.cache import get_redis_client
+
 """
 A = System Packages
 B = Configuration
@@ -15,8 +18,8 @@ B = Configuration


@register()
-def django_settings(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
+def django_settings(app_configs, **kwargs) -> list[CheckMessage]:
+    errors: list[CheckMessage] = []
    if hasattr(settings, "SITE_URL"):
        if settings.SITE_URL[-1] == "/":
            errors.append(Warning("'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth.", hint="", id="allianceauth.checks.B005"))
@@ -33,15 +36,15 @@ def django_settings(app_configs, **kwargs) -> List[CheckMessage]:


@register()
-def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
+def system_package_redis(app_configs, **kwargs) -> list[CheckMessage]:
+    errors: list[CheckMessage] = []
    try:
        redis_version = Pep440Version(get_redis_client().info()['redis_version'])
    except InvalidVersion:
        errors.append(Warning("Unable to confirm Redis Version"))
        return errors

-    if redis_version.major == 7 and redis_version.minor == 2 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc):
+    if redis_version.major == 7 and redis_version.minor == 2 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=datetime.timezone.utc):
        errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
    elif redis_version.major == 7 and redis_version.minor == 0:
        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A002"))
@@ -54,8 +57,8 @@ def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:


@register()
-def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
+def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
+    errors: list[CheckMessage] = []

    for connection in db.connections.all():
        if connection.vendor == "mysql":
@@ -66,7 +69,7 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
                return errors

            # MySQL 8
-            if mysql_version.major == 8 and mysql_version.minor == 4 and timezone.now() > timezone.datetime(year=2032, month=4, day=30, tzinfo=timezone.utc):
+            if mysql_version.major == 8 and mysql_version.minor == 4 and timezone.now() > timezone.datetime(year=2032, month=4, day=30, tzinfo=datetime.timezone.utc):
                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A004"))
            elif mysql_version.major == 8 and mysql_version.minor == 3:
                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A005"))
@@ -74,7 +77,7 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A006"))
            elif mysql_version.major == 8 and mysql_version.minor == 1:
                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A007"))
-            elif mysql_version.major == 8 and mysql_version.minor == 0 and timezone.now() > timezone.datetime(year=2026, month=4, day=30, tzinfo=timezone.utc):
+            elif mysql_version.major == 8 and mysql_version.minor == 0 and timezone.now() > timezone.datetime(year=2026, month=4, day=30, tzinfo=datetime.timezone.utc):
                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A008"))
            elif mysql_version.major < 8:  # This will also catch Mariadb 5.x
                errors.append(Error(f"MySQL or MariaDB {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A009"))
@@ -82,8 +85,8 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:


@register()
-def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
+def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:
+    errors: list[CheckMessage] = []

    for connection in db.connections.all():
        if connection.vendor == "mysql":  # Still to find a way to determine MySQL vs MariaDB
@@ -94,25 +97,24 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
                return errors

            # MariaDB 11
-            if mariadb_version.major == 11 and mariadb_version.minor == 4 and timezone.now() > timezone.datetime(year=2029, month=5, day=19, tzinfo=timezone.utc):
+            if mariadb_version.major == 11 and mariadb_version.minor == 4 and timezone.now() > timezone.datetime(year=2029, month=5, day=19, tzinfo=datetime.timezone.utc):
                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A010"))
            elif mariadb_version.major == 11 and mariadb_version.minor == 2:
                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A018"))
-                if timezone.now() > timezone.datetime(year=2024, month=11, day=21, tzinfo=timezone.utc):
+                if timezone.now() > timezone.datetime(year=2024, month=11, day=21, tzinfo=datetime.timezone.utc):
                    errors.append(Error(f"MariaDB {mariadb_version.public}  EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A011"))
            elif mariadb_version.major == 11 and mariadb_version.minor == 1:
                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A019"))
-                if timezone.now() > timezone.datetime(year=2024, month=8, day=21, tzinfo=timezone.utc):
-                    errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A012"))
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A012"))
            elif mariadb_version.major == 11 and mariadb_version.minor in [0, 3]:  # Demote versions down here once EOL
                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A013"))

            # MariaDB 10
-            elif mariadb_version.major == 10 and mariadb_version.minor == 11 and timezone.now() > timezone.datetime(year=2028, month=2, day=10, tzinfo=timezone.utc):
+            elif mariadb_version.major == 10 and mariadb_version.minor == 11 and timezone.now() > timezone.datetime(year=2028, month=2, day=10, tzinfo=datetime.timezone.utc):
                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A014"))
-            elif mariadb_version.major == 10 and mariadb_version.minor == 6 and timezone.now() > timezone.datetime(year=2026, month=7, day=6, tzinfo=timezone.utc):
+            elif mariadb_version.major == 10 and mariadb_version.minor == 6 and timezone.now() > timezone.datetime(year=2026, month=7, day=6, tzinfo=datetime.timezone.utc):
                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A0015"))
-            elif mariadb_version.major == 10 and mariadb_version.minor == 5 and timezone.now() > timezone.datetime(year=2025, month=6, day=24, tzinfo=timezone.utc):
+            elif mariadb_version.major == 10 and mariadb_version.minor == 5 and timezone.now() > timezone.datetime(year=2025, month=6, day=24, tzinfo=datetime.timezone.utc):
                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A016"))
            elif mariadb_version.major == 10 and mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:  # Demote versions down here once EOL
                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A017"))
@@ -121,8 +123,8 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:


@register()
-def system_package_sqlite(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
+def system_package_sqlite(app_configs, **kwargs) -> list[CheckMessage]:
+    errors: list[CheckMessage] = []
    for connection in db.connections.all():
        if connection.vendor == "sqlite":
            try:
@@ -136,8 +138,8 @@ def system_package_sqlite(app_configs, **kwargs) -> List[CheckMessage]:


@register()
-def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
+def sql_settings(app_configs, **kwargs) -> list[CheckMessage]:
+    errors: list[CheckMessage] = []
    for connection in db.connections.all():
        if connection.vendor == "mysql":
            try:
@@ -159,8 +161,8 @@ def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:


@register()
-def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
-    errors: List[CheckMessage] = []
+def celery_settings(app_configs, **kwargs) -> list[CheckMessage]:
+    errors: list[CheckMessage] = []

    try:
        if current_app.conf.broker_transport_options != {'priority_steps': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 'queue_order_strategy': 'priority'}:
@@ -169,7 +171,7 @@ def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
        errors.append(Error("Celery Priorities are not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))

    try:
-        if current_app.conf.broker_connection_retry_on_startup != True:
+        if current_app.conf.broker_connection_retry_on_startup is not True:
            errors.append(Error("Celery broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
    except KeyError:
        errors.append(Error("Celery broker_connection_retry_on_startup not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
--- a/allianceauth/context_processors.py
+++ b/allianceauth/context_processors.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+
 from .views import NightModeRedirectView


--- a/allianceauth/corputils/admin.py
+++ b/allianceauth/corputils/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin

-from .models import CorpStats, CorpMember
+from .models import CorpMember, CorpStats

 admin.site.register(CorpStats)
 admin.site.register(CorpMember)
--- a/allianceauth/corputils/auth_hooks.py
+++ b/allianceauth/corputils/auth_hooks.py
@@ -1,8 +1,9 @@
-from allianceauth.menu.hooks import MenuItemHook
-from allianceauth.services.hooks import UrlHook
 from django.utils.translation import gettext_lazy as _
+
 from allianceauth import hooks
 from allianceauth.corputils import urls
+from allianceauth.menu.hooks import MenuItemHook
+from allianceauth.services.hooks import UrlHook


 class CorpStats(MenuItemHook):
--- a/allianceauth/corputils/managers.py
+++ b/allianceauth/corputils/managers.py
@@ -1,6 +1,7 @@
-from django.db import models
 import logging

+from django.db import models
+
 logger = logging.getLogger(__name__)


@@ -8,7 +9,7 @@ class CorpStatsQuerySet(models.QuerySet):
    def visible_to(self, user):
        # superusers get all visible
        if user.is_superuser:
-            logger.debug('Returning all corpstats for superuser %s.' % user)
+            logger.debug(f'Returning all corpstats for superuser {user}.')
            return self

        try:
@@ -36,7 +37,7 @@ class CorpStatsQuerySet(models.QuerySet):
                query |= q
            return self.filter(query)
        except AssertionError:
-            logger.debug('User %s has no main character. No corpstats visible.' % user)
+            logger.debug(f'User {user} has no main character. No corpstats visible.')
            return self.none()


--- a/allianceauth/corputils/migrations/0001_initial.py
+++ b/allianceauth/corputils/migrations/0001_initial.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.10.1 on 2016-12-14 21:36

-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models


 class Migration(migrations.Migration):
--- a/allianceauth/corputils/migrations/0002_migrate_permissions.py
+++ b/allianceauth/corputils/migrations/0002_migrate_permissions.py
@@ -66,7 +66,7 @@ def forward(apps, schema_editor):
        g.permissions.add(perm_dict['corpstats']['alliance_apis'].pk)
        g.permissions.add(perm_dict['corpstats']['view_alliance_corpstats'].pk)

-    for name, perm in perm_dict['user'].items():
+    for _name, perm in perm_dict['user'].items():
        perm.delete()


--- a/allianceauth/corputils/migrations/0004_member_models.py
+++ b/allianceauth/corputils/migrations/0004_member_models.py
@@ -1,9 +1,10 @@
 # Generated by Django 1.10.5 on 2017-03-26 20:13

-from django.db import migrations, models
-import django.db.models.deletion
 import json

+import django.db.models.deletion
+from django.db import migrations, models
+

 def convert_json_to_members(apps, schema_editor):
    CorpStats = apps.get_model('corputils', 'CorpStats')
--- a/allianceauth/corputils/models.py
+++ b/allianceauth/corputils/models.py
@@ -1,15 +1,17 @@
 import logging
 import os

-from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
+
 from django.db import models
+
 from esi.errors import TokenError
 from esi.models import Token
-from allianceauth.eveonline.models import EveCorporationInfo, EveCharacter, EveAllianceInfo
-from allianceauth.notifications import notify

+from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from allianceauth.corputils.managers import CorpStatsManager
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
+from allianceauth.notifications import notify

 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """
@@ -31,6 +33,7 @@ class CorpStats(models.Model):
    corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE)
    last_update = models.DateTimeField(auto_now=True)

+    objects = CorpStatsManager()
    class Meta:
        permissions = (
            ('view_corp_corpstats', 'Can view corp stats of their corporation.'),
@@ -40,7 +43,7 @@ class CorpStats(models.Model):
        verbose_name = "corp stats"
        verbose_name_plural = "corp stats"

-    objects = CorpStatsManager()
+

    def __str__(self):
        return f"{self.__class__.__name__} for {self.corp}"
@@ -76,21 +79,21 @@ class CorpStats(models.Model):
            logger.warning(f"{self} failed to update: {e}")
            if self.token.user:
                notify(
-                    self.token.user, "%s failed to update with your ESI token." % self,
+                    self.token.user, f"{self} failed to update with your ESI token.",
                    message="Your token has expired or is no longer valid. Please add a new one to create a new CorpStats.",
                    level="error")
            self.delete()
        except HTTPForbidden as e:
            logger.warning(f"{self} failed to update: {e}")
            if self.token.user:
-                notify(self.token.user, "%s failed to update with your ESI token." % self, message=f"{e.status_code}: {e.message}", level="error")
+                notify(self.token.user, f"{self} failed to update with your ESI token.", message=f"{e.status_code}: {e.message}", level="error")
            self.delete()
        except AssertionError:
-            logger.warning("%s token character no longer in corp." % self)
+            logger.warning(f"{self} token character no longer in corp.")
            if self.token.user:
                notify(
-                    self.token.user, "%s cannot update with your ESI token." % self,
-                    message="%s cannot update with your ESI token as you have left corp." % self, level="error")
+                    self.token.user, f"{self} cannot update with your ESI token.",
+                    message=f"{self} cannot update with your ESI token as you have left corp.", level="error")
            self.delete()

    @property
--- a/allianceauth/corputils/tasks.py
+++ b/allianceauth/corputils/tasks.py
@@ -1,4 +1,5 @@
 from celery import shared_task
+
 from allianceauth.corputils.models import CorpStats


--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@@ -1,6 +1,5 @@
 {% extends 'corputils/base.html' %}

-{% load aa_i18n %}
 {% load i18n %}
 {% load humanize %}

@@ -239,12 +238,9 @@
 {% block extra_javascript %}
    {% include 'bundles/datatables-js-bs5.html' %}

-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
    <script>
        $(document).ready(() => {
            $('#table-mains').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                "columnDefs": [
                    { "sortable": false, "targets": [1] },
                ],
@@ -253,7 +249,6 @@
            });

            $('#table-members').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                "columnDefs": [
                    { "searchable": false, "targets": [0, 2] },
                    { "sortable": false, "targets": [0, 2] },
@@ -264,7 +259,6 @@
            });

            $('#table-unregistered').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                "columnDefs": [
                    { "searchable": false, "targets": [0, 2] },
                    { "sortable": false, "targets": [0, 2] },
--- a/allianceauth/corputils/templates/corputils/search.html
+++ b/allianceauth/corputils/templates/corputils/search.html
@@ -1,6 +1,5 @@
 {% extends "corputils/base.html" %}

-{% load aa_i18n %}
 {% load i18n %}

 {% block member_data %}
@@ -43,12 +42,9 @@
 {% block extra_javascript %}
    {% include 'bundles/datatables-js-bs5.html' %}

-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-
    <script>
        $(document).ready(() => {
            $('#table-search').DataTable({
-                "language": {"url": '{{ DT_LANG_PATH }}'},
                "stateSave": true,
                "stateDuration": 0
            });
--- a/allianceauth/corputils/tests.py
+++ b/allianceauth/corputils/tests.py
@@ -1,14 +1,18 @@
 from unittest import mock

-from django.test import TestCase
-from allianceauth.tests.auth_utils import AuthUtils
-from .models import CorpStats, CorpMember
-from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo, EveCharacter
-from esi.models import Token
-from esi.errors import TokenError
 from bravado.exception import HTTPForbidden
+
 from django.contrib.auth.models import Permission
+from django.test import TestCase
+
+from esi.errors import TokenError
+from esi.models import Token
+
 from allianceauth.authentication.models import CharacterOwnership
+from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
+from allianceauth.tests.auth_utils import AuthUtils
+
+from .models import CorpMember, CorpStats


 class CorpStatsManagerTestCase(TestCase):
--- a/allianceauth/corputils/urls.py
+++ b/allianceauth/corputils/urls.py
@@ -1,4 +1,5 @@
 from django.urls import path
+
 from . import views

 app_name = 'corputils'
--- a/allianceauth/corputils/views.py
+++ b/allianceauth/corputils/views.py
@@ -1,16 +1,19 @@
 import os

 from bravado.exception import HTTPError
+
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required, user_passes_test
-from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db import IntegrityError
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.translation import gettext_lazy as _
+
 from esi.decorators import token_required
+
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo

-from .models import CorpStats, CorpMember
+from .models import CorpMember, CorpStats

 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """
--- a/allianceauth/crontab/init.py
+++ b/allianceauth/crontab/init.py
@@ -1,3 +0,0 @@
-"""
-Alliance Auth Crontab Utilities
-"""
--- a/allianceauth/crontab/apps.py
+++ b/allianceauth/crontab/apps.py
@@ -1,14 +0,0 @@
-"""
-Crontab App Config
-"""
-
-from django.apps import AppConfig
-
-
-class CrontabConfig(AppConfig):
-    """
-    Crontab App Config
-    """
-
-    name = "allianceauth.crontab"
-    label = "crontab"
--- a/allianceauth/crontab/models.py
+++ b/allianceauth/crontab/models.py
@@ -1,23 +0,0 @@
-from random import random
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from solo.models import SingletonModel
-
-
-def random_default() -> float:
-    return random()
-
-
-class CronOffset(SingletonModel):
-
-    minute = models.FloatField(_("Minute Offset"), default=random_default)
-    hour = models.FloatField(_("Hour Offset"), default=random_default)
-    day_of_month = models.FloatField(_("Day of Month Offset"), default=random_default)
-    month_of_year = models.FloatField(_("Month of Year Offset"), default=random_default)
-    day_of_week = models.FloatField(_("Day of Week Offset"), default=random_default)
-
-    def __str__(self) -> str:
-        return "Cron Offsets"
-
-    class Meta:
-        verbose_name = "Cron Offsets"
--- a/allianceauth/crontab/schedulers.py
+++ b/allianceauth/crontab/schedulers.py
@@ -1,63 +0,0 @@
-from django.core.exceptions import ObjectDoesNotExist
-from django_celery_beat.schedulers import (
-    DatabaseScheduler
-)
-from django_celery_beat.models import CrontabSchedule
-from django.db.utils import OperationalError, ProgrammingError
-
-from celery import schedules
-from celery.utils.log import get_logger
-
-from allianceauth.crontab.models import CronOffset
-from allianceauth.crontab.utils import offset_cron
-
-logger = get_logger(__name__)
-
-
-class OffsetDatabaseScheduler(DatabaseScheduler):
-    """
-    Customization of Django Celery Beat, Database Scheduler
-    Takes the Celery Schedule from local.py and applies our AA Framework Cron Offset, if apply_offset is true
-    Otherwise it passes it through as normal
-    """
-    def update_from_dict(self, mapping):
-        s = {}
-
-        try:
-            cron_offset = CronOffset.get_solo()
-        except (OperationalError, ProgrammingError, ObjectDoesNotExist) as exc:
-            # This is just incase we haven't migrated yet or something
-            logger.warning(
-                "OffsetDatabaseScheduler: Could not fetch CronOffset (%r). "
-                "Defering to DatabaseScheduler",
-                exc
-            )
-            return super().update_from_dict(mapping)
-
-        for name, entry_fields in mapping.items():
-            try:
-                apply_offset = entry_fields.pop("apply_offset", False)
-                entry = self.Entry.from_entry(name, app=self.app, **entry_fields)
-
-                if entry.model.enabled and apply_offset:
-                    schedule_obj = entry.schedule
-                    if isinstance(schedule_obj, schedules.crontab):
-                        offset_cs = CrontabSchedule.from_schedule(offset_cron(schedule_obj))
-                        offset_cs, created = CrontabSchedule.objects.get_or_create(
-                            minute=offset_cs.minute,
-                            hour=offset_cs.hour,
-                            day_of_month=offset_cs.day_of_month,
-                            month_of_year=offset_cs.month_of_year,
-                            day_of_week=offset_cs.day_of_week,
-                            timezone=offset_cs.timezone,
-                        )
-                        entry.model.crontab = offset_cs
-                        entry.model.save()
-                        logger.debug(f"Offset applied for '{name}' due to 'apply_offset' = True.")
-
-                s[name] = entry
-
-            except Exception as e:
-                logger.exception("Error updating schedule for %s: %r", name, e)
-
-        self.schedule.update(s)
--- a/allianceauth/crontab/tests/init.py
+++ b/allianceauth/crontab/tests/init.py
--- a/allianceauth/crontab/tests/test_models.py
+++ b/allianceauth/crontab/tests/test_models.py
@@ -1,63 +0,0 @@
-from unittest.mock import patch
-from django.test import TestCase
-
-from allianceauth.crontab.models import CronOffset
-
-
-class CronOffsetModelTest(TestCase):
-    def test_cron_offset_is_singleton(self):
-        """
-        Test that CronOffset is indeed a singleton and that
-        multiple calls to get_solo() return the same instance.
-        """
-        offset1 = CronOffset.get_solo()
-        offset2 = CronOffset.get_solo()
-
-        # They should be the exact same object in memory
-        self.assertEqual(offset1.pk, offset2.pk)
-
-    def test_default_values_random(self):
-        """
-        Test that the default values are set via random_default() when
-        no explicit value is provided. We'll patch 'random.random' to
-        produce predictable output.
-        """
-        with patch('allianceauth.crontab.models.random', return_value=0.1234):
-            # Force creation of a new CronOffset by clearing the existing one
-            CronOffset.objects.all().delete()
-
-            offset = CronOffset.get_solo()  # This triggers creation
-
-            # All fields should be 0.1234, because we patched random()
-            self.assertAlmostEqual(offset.minute, 0.1234)
-            self.assertAlmostEqual(offset.hour, 0.1234)
-            self.assertAlmostEqual(offset.day_of_month, 0.1234)
-            self.assertAlmostEqual(offset.month_of_year, 0.1234)
-            self.assertAlmostEqual(offset.day_of_week, 0.1234)
-
-    def test_update_offset_values(self):
-        """
-        Test that we can update the offsets and retrieve them.
-        """
-        offset = CronOffset.get_solo()
-        offset.minute = 0.5
-        offset.hour = 0.25
-        offset.day_of_month = 0.75
-        offset.month_of_year = 0.99
-        offset.day_of_week = 0.33
-        offset.save()
-
-        # Retrieve again to ensure changes persist
-        saved_offset = CronOffset.get_solo()
-        self.assertEqual(saved_offset.minute, 0.5)
-        self.assertEqual(saved_offset.hour, 0.25)
-        self.assertEqual(saved_offset.day_of_month, 0.75)
-        self.assertEqual(saved_offset.month_of_year, 0.99)
-        self.assertEqual(saved_offset.day_of_week, 0.33)
-
-    def test_str_representation(self):
-        """
-        Verify the __str__ method returns 'Cron Offsets'.
-        """
-        offset = CronOffset.get_solo()
-        self.assertEqual(str(offset), "Cron Offsets")
--- a/allianceauth/crontab/tests/test_utils.py
+++ b/allianceauth/crontab/tests/test_utils.py
@@ -1,80 +0,0 @@
-# myapp/tests/test_tasks.py
-
-import logging
-from unittest.mock import patch
-from django.test import TestCase
-from django.db import ProgrammingError
-from celery.schedules import crontab
-
-from allianceauth.crontab.utils import offset_cron
-from allianceauth.crontab.models import CronOffset
-
-logger = logging.getLogger(__name__)
-
-
-class TestOffsetCron(TestCase):
-
-    def test_offset_cron_normal(self):
-        """
-        Test that offset_cron modifies the minute/hour fields
-        based on the CronOffset values when everything is normal.
-        """
-        # We'll create a mock CronOffset instance
-        mock_offset = CronOffset(minute=0.5, hour=0.5)
-
-        # Our initial crontab schedule
-        original_schedule = crontab(
-            minute=[0, 5, 55],
-            hour=[0, 3, 23],
-            day_of_month='*',
-            month_of_year='*',
-            day_of_week='*'
-        )
-
-        # Patch CronOffset.get_solo to return our mock offset
-        with patch('allianceauth.crontab.models.CronOffset.get_solo', return_value=mock_offset):
-            new_schedule = offset_cron(original_schedule)
-
-        # Check the new minute/hour
-        # minute 0 -> 0 + round(60 * 0.5) = 30 % 60 = 30
-        # minute 5 -> 5 + 30 = 35 % 60 = 35
-        # minute 55 -> 55 + 30 = 85 % 60 = 25  --> sorted => 25,30,35
-        self.assertEqual(new_schedule._orig_minute, '25,30,35')
-
-        # hour 0 -> 0 + round(24 * 0.5) = 12 % 24 = 12
-        # hour 3 -> 3 + 12 = 15 % 24 = 15
-        # hour 23 -> 23 + 12 = 35 % 24 = 11 --> sorted => 11,12,15
-        self.assertEqual(new_schedule._orig_hour, '11,12,15')
-
-        # Check that other fields are unchanged
-        self.assertEqual(new_schedule._orig_day_of_month, '*')
-        self.assertEqual(new_schedule._orig_month_of_year, '*')
-        self.assertEqual(new_schedule._orig_day_of_week, '*')
-
-    def test_offset_cron_programming_error(self):
-        """
-        Test that if a ProgrammingError is raised (e.g. before migrations),
-        offset_cron just returns the original schedule.
-        """
-        original_schedule = crontab(minute=[0, 15, 30], hour=[1, 2, 3])
-
-        # Force get_solo to raise ProgrammingError
-        with patch('allianceauth.crontab.models.CronOffset.get_solo', side_effect=ProgrammingError()):
-            new_schedule = offset_cron(original_schedule)
-
-        # Should return the original schedule unchanged
-        self.assertEqual(new_schedule, original_schedule)
-
-    def test_offset_cron_unexpected_exception(self):
-        """
-        Test that if any other exception is raised, offset_cron
-        also returns the original schedule, and logs the error.
-        """
-        original_schedule = crontab(minute='0', hour='0')
-
-        # Force get_solo to raise a generic Exception
-        with patch('allianceauth.crontab.models.CronOffset.get_solo', side_effect=Exception("Something bad")):
-            new_schedule = offset_cron(original_schedule)
-
-        # Should return the original schedule unchanged
-        self.assertEqual(new_schedule, original_schedule)
--- a/allianceauth/crontab/utils.py
+++ b/allianceauth/crontab/utils.py
@@ -1,41 +0,0 @@
-from celery.schedules import crontab
-import logging
-from allianceauth.crontab.models import CronOffset
-from django.db import ProgrammingError
-
-
-logger = logging.getLogger(__name__)
-
-
-def offset_cron(schedule: crontab) -> crontab:
-    """Take a crontab and apply a series of precalculated offsets to spread out tasks execution on remote resources
-
-    Args:
-        schedule (crontab): celery.schedules.crontab()
-
-    Returns:
-        crontab: A crontab with offsetted Minute and Hour fields
-    """
-
-    try:
-        cron_offset = CronOffset.get_solo()
-        new_minute = [(m + (round(60 * cron_offset.minute))) % 60 for m in schedule.minute]
-        new_hour = [(m + (round(24 * cron_offset.hour))) % 24 for m in schedule.hour]
-
-        return crontab(
-            minute=",".join(str(m) for m in sorted(new_minute)),
-            hour=",".join(str(h) for h in sorted(new_hour)),
-            day_of_month=schedule._orig_day_of_month,
-            month_of_year=schedule._orig_month_of_year,
-            day_of_week=schedule._orig_day_of_week)
-
-    except ProgrammingError as e:
-        # If this is called before migrations are run hand back the default schedule
-        # These offsets are stored in a Singleton Model,
-        logger.error(e)
-        return schedule
-
-    except Exception as e:
-        # We absolutely cant fail to hand back a schedule
-        logger.error(e)
-        return schedule
--- a/allianceauth/custom_css/admin.py
+++ b/allianceauth/custom_css/admin.py
@@ -3,14 +3,15 @@ Admin classes for custom_css app
 """

 # Django
-from django.contrib import admin
-
 # Django Solos
 from solo.admin import SingletonModelAdmin

+from django.contrib import admin
+
+from allianceauth.custom_css.forms import CustomCSSAdminForm
+
 # Alliance Auth Custom CSS
 from allianceauth.custom_css.models import CustomCSS
-from allianceauth.custom_css.forms import CustomCSSAdminForm


@admin.register(CustomCSS)
--- a/allianceauth/custom_css/forms.py
+++ b/allianceauth/custom_css/forms.py
@@ -3,12 +3,12 @@ Forms for custom_css app
 """

 # Alliance Auth Custom CSS
-from allianceauth.custom_css.models import CustomCSS
-from allianceauth.custom_css.widgets import CssEditorWidget
-
 # Django
 from django import forms

+from allianceauth.custom_css.models import CustomCSS
+from allianceauth.custom_css.widgets import CssEditorWidget
+

 class CustomCSSAdminForm(forms.ModelForm):
    """
--- a/allianceauth/custom_css/models.py
+++ b/allianceauth/custom_css/models.py
@@ -21,7 +21,6 @@ class CustomCSS(SingletonModel):

    css = models.TextField(
        blank=True,
-        null=True,
        verbose_name=_("Your custom CSS"),
        help_text=_("This CSS will be added to the site after the default CSS."),
    )
--- a/allianceauth/custom_css/templatetags/custom_css.py
+++ b/allianceauth/custom_css/templatetags/custom_css.py
@@ -3,7 +3,7 @@ Custom template tags for custom_css app
 """

 # Alliance Auth Custom CSS
-from allianceauth.custom_css.models import CustomCSS
+from pathlib import Path

 # Django
 from django.conf import settings
@@ -11,7 +11,7 @@ from django.template.defaulttags import register
 from django.templatetags.static import static
 from django.utils.safestring import mark_safe

-from pathlib import Path
+from allianceauth.custom_css.models import CustomCSS


@register.simple_tag
--- a/allianceauth/custom_css/widgets.py
+++ b/allianceauth/custom_css/widgets.py
@@ -6,7 +6,6 @@ Form widgets for custom_css app
 from django import forms

 # Alliance Auth
-from allianceauth.custom_css.models import CustomCSS


 class CssEditorWidget(forms.Textarea):
--- a/allianceauth/eveonline/admin.py
+++ b/allianceauth/eveonline/admin.py
@@ -1,12 +1,9 @@
 from django import forms
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
-from .providers import ObjectNotFound

-from .models import EveAllianceInfo
-from .models import EveCharacter
-from .models import EveCorporationInfo
-from .models import EveFactionInfo
+from .models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+from .providers import ObjectNotFound


 class EveEntityExistsError(forms.ValidationError):
--- a/allianceauth/eveonline/autogroups/admin.py
+++ b/allianceauth/eveonline/autogroups/admin.py
@@ -1,9 +1,9 @@
-from django.contrib import admin
-from django.db import models
-from .models import AutogroupsConfig, ManagedCorpGroup, ManagedAllianceGroup
-
 import logging

+from django.contrib import admin
+from django.db import models
+
+from .models import AutogroupsConfig, ManagedAllianceGroup, ManagedCorpGroup

 logger = logging.getLogger(__name__)

--- a/allianceauth/eveonline/autogroups/apps.py
+++ b/allianceauth/eveonline/autogroups/apps.py
@@ -6,4 +6,4 @@ class EveAutogroupsConfig(AppConfig):
    label = 'eve_autogroups'

    def ready(self):
-        import allianceauth.eveonline.autogroups.signals
+        pass
--- a/allianceauth/eveonline/autogroups/migrations/0001_initial.py
+++ b/allianceauth/eveonline/autogroups/migrations/0001_initial.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.6 on 2017-12-23 04:30

-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models


 class Migration(migrations.Migration):
--- a/allianceauth/eveonline/autogroups/models.py
+++ b/allianceauth/eveonline/autogroups/models.py
@@ -1,10 +1,11 @@
 import logging
-from django.db import models, transaction
+
 from django.contrib.auth.models import Group, User
 from django.core.exceptions import ObjectDoesNotExist
+from django.db import models, transaction

 from allianceauth.authentication.models import State
-from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo
+from allianceauth.eveonline.models import EveAllianceInfo, EveCorporationInfo

 logger = logging.getLogger(__name__)

@@ -80,15 +81,15 @@ class AutogroupsConfig(models.Model):

    objects = AutogroupsConfigManager()

+    def __str__(self):
+        return 'States: ' + (' '.join(list(self.states.all().values_list('name', flat=True))) if self.pk else str(None))
+
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)

    def __repr__(self):
        return self.__class__.__name__

-    def __str__(self):
-        return 'States: ' + (' '.join(list(self.states.all().values_list('name', flat=True))) if self.pk else str(None))
-
    def update_all_states_group_membership(self):
        list(map(self.update_group_membership_for_state, self.states.all()))

@@ -235,7 +236,7 @@ class ManagedGroup(models.Model):
        abstract = True

    def __str__(self):
-        return "Managed Group: %s" % self.group.name
+        return f"Managed Group: {self.group.name}"

 class ManagedCorpGroup(ManagedGroup):
    corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE)
--- a/allianceauth/eveonline/autogroups/signals.py
+++ b/allianceauth/eveonline/autogroups/signals.py
@@ -1,7 +1,9 @@
 import logging
+
+from django.db.models.signals import m2m_changed, post_save, pre_delete, pre_save
 from django.dispatch import receiver
-from django.db.models.signals import pre_save, post_save, pre_delete, m2m_changed
-from allianceauth.authentication.models import UserProfile, State
+
+from allianceauth.authentication.models import State, UserProfile
 from allianceauth.eveonline.models import EveCharacter

 from .models import AutogroupsConfig
--- a/allianceauth/eveonline/autogroups/tests/init.py
+++ b/allianceauth/eveonline/autogroups/tests/init.py
@@ -1,7 +1,10 @@
 from unittest import mock
-from django.db.models.signals import pre_save, post_save, pre_delete, m2m_changed
+
+from django.db.models.signals import m2m_changed, post_save, pre_delete, pre_save
+
 from allianceauth.authentication.models import UserProfile
 from allianceauth.authentication.signals import reassess_on_profile_save
+
 from .. import signals
 from ..models import AutogroupsConfig

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joel Falknau	c4cbaac454	Add Git Blame Ignore	2024-09-13 23:19:30 +10:00
Joel Falknau	a99315ea55	formatting storm	2024-09-13 23:10:37 +10:00
Joel Falknau	ec5cf08eef	update classifiers and dependencies	2024-09-13 23:09:12 +10:00
Ariel Rin	27cf74f507	Merge branch 'ruff' into 'v5.x' Linting and Formatting changes for 5.x See merge request allianceauth/allianceauth!1644	2024-09-13 10:50:16 +00:00
Ariel Rin	98509b0dbf	Linting and Formatting changes for 5.x	2024-09-13 10:50:15 +00:00
Joel Falknau	a14038c61a	Merge branch 'master' of gitlab.com:allianceauth/allianceauth into v5.x	2024-09-13 20:29:08 +10:00
Joel Falknau	63fb449060	django now doesnt like unsaved models, fair	2024-08-24 15:42:11 +10:00
Joel Falknau	235675fa9b	django.utils.timezone.utc was removed. (shame it was handy)	2024-08-24 15:41:37 +10:00
Joel Falknau	a065f043eb	correct index for new page name	2024-08-24 15:09:12 +10:00
Joel Falknau	0839920032	use defined pygments	2024-08-24 15:09:02 +10:00
Joel Falknau	29ad4acff7	bring docs up to python 312 across the board	2024-08-24 15:08:41 +10:00
Joel Falknau	3a5b84d1f9	remove \u2060 from image name	2024-08-24 13:42:55 +10:00
Joel Falknau	bbcb94021e	run pyupgrade	2024-08-23 13:55:25 +10:00
Joel Falknau	d50f13528b	add python 3.13 RC to tox allow fail	2024-08-22 12:58:54 +10:00
Joel Falknau	c88521af88	django-celery-beat >=2.7.0	2024-08-22 12:54:31 +10:00
Joel Falknau	2bd5ff8723	Merge branch 'master' of gitlab.com:allianceauth/allianceauth into v5.x	2024-08-12 13:23:34 +10:00
Joel Falknau	84484cebcb	move to django 5.1.x	2024-08-12 13:20:27 +10:00
Joel Falknau	5ee34fcb2d	bring docker major up	2024-08-12 13:20:11 +10:00
Joel Falknau	046473def1	use 3.12 in builds	2024-08-12 13:19:57 +10:00
Joel Falknau	6aaba2bf3d	Drop Python 3.8 and 3.9	2024-08-12 13:19:08 +10:00