Version Bump 4.8.0

Updates for project Alliance Auth

See merge request allianceauth/allianceauth!1732

.git-blame-ignore-revs

@@ -1,6 +0,0 @@
-# git config blame.ignoreRevsFile .git-blame-ignore-revs
-
-
-
-# Ruff initial formatting storm
-a99315ea55339f0b6010b5c9d8703e51278fcf29

.gitignore

@@ -71,7 +71,6 @@ celerybeat-schedule
 
 #other
 .flake8
-.ruff_cache
 .pylintrc
 Makefile
 alliance_auth.sqlite3

.gitlab-ci.yml

@@ -25,7 +25,7 @@ before_script:
 pre-commit-check:
   <<: *only-default
   stage: pre-commit
-  image: python:3.12-bookworm
+  image: python:3.11-bookworm
   # variables:
   #   PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
   # cache:
@@ -51,6 +51,30 @@ 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
@@ -87,11 +111,23 @@ test-3.12-core:
         coverage_format: cobertura
         path: coverage.xml
 
-test-3.13-core:
+test-3.8-all:
   <<: *only-default
-  image: python:3.13-rc-bookworm
+  image: python:3.8-bookworm
   script:
-    - tox -e py313-core
+    - 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
   artifacts:
     when: always
     reports:
@@ -136,21 +172,9 @@ 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
-
 build-test:
   stage: test
-  image: python:3.12-bookworm
+  image: python:3.11-bookworm
 
   before_script:
     - python -m pip install --upgrade pip
@@ -169,13 +193,13 @@ build-test:
 
 test-docs:
   <<: *only-default
-  image: python:3.12-bookworm
+  image: python:3.11-bookworm
   script:
     - tox -e docs
 
 deploy_production:
   stage: deploy
-  image: python:3.12-bookworm
+  image: python:3.11-bookworm
 
   before_script:
     - python -m pip install --upgrade pip
@@ -191,10 +215,10 @@ deploy_production:
 
 build-image:
   before_script: []
-  image: docker:27
+  image: docker:24.0
   stage: docker
   services:
-    - docker:27-dind
+    - docker:24.0-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
@@ -215,10 +239,10 @@ build-image:
 
 build-image-dev:
   before_script: []
-  image: docker:27
+  image: docker:24.0
   stage: docker
   services:
-    - docker:27-dind
+    - docker:24.0-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
@@ -236,10 +260,10 @@ build-image-dev:
 
 build-image-mr:
   before_script: []
-  image: docker:27
+  image: docker:24.0
   stage: docker
   services:
-    - docker:27-dind
+    - docker:24.0-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

.pre-commit-config.yaml

@@ -19,22 +19,21 @@ exclude: |
     \.po|
     \.mo|
     swagger\.json|
-    static/(.*)/libs/|
+    static/(.*)/libs/
-    telnetlib\.py
   )
 
 repos:
   # Code Upgrades
-  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.25.0
-    hooks:
-      - id: django-upgrade
-        args: [--target-version=5.2]
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.20.0
     hooks:
       - id: pyupgrade
-        args: [--py310-plus]
+        args: [--py38-plus]
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.25.0
+    hooks:
+      - id: django-upgrade
+        args: [--target-version=4.2]
 
   # Formatting
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -77,21 +76,20 @@ repos:
         language: node
         args:
           - --disable=MD013
-
   # Infrastructure
   - repo: https://github.com/tox-dev/pyproject-fmt
     rev: v2.6.0
     hooks:
       - id: pyproject-fmt
+        name: pyproject.toml formatter
+        description: "Format the pyproject.toml file."
         args:
           - --indent=4
         additional_dependencies:
-          - tox==4.26.0 # https://github.com/tox-dev/tox/releases/latest
+          - tox==4.24.1 # https://github.com/tox-dev/tox/releases/latest
-  - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.5.0
-    hooks:
-      - id: tox-ini-fmt
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.24.1
     hooks:
       - id: validate-pyproject
+        name: Validate pyproject.toml
+        description: "Validate the pyproject.toml file."

.readthedocs.yml

@@ -7,11 +7,11 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-24.04
+  os: ubuntu-22.04
   apt_packages:
     - redis
   tools:
-    python: "3.12"
+    python: "3.11"
   jobs:
     post_system_dependencies:
       - redis-server --daemonize yes

README.md

@@ -1,15 +1,15 @@
 # Alliance Auth
 
-[![license](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
+[![License](https://img.shields.io/badge/license-GPLv2-green)](https://pypi.org/project/allianceauth/)
-[![python](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/allianceauth)](https://pypi.org/project/allianceauth/)
-[![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
+[![Django Versions](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/)
+[![Stable AA 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)
+[![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)
-[![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
+[![Test 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)
 
-An auth system for EVE Online to help in-game organizations manage online service access.
+A flexible authentication platform for EVE Online to help in-game organizations manage access to applications and services. AA provides both, a stable core, and a robust framework for community development and custom applications.
 
 ## Content
 
@@ -22,17 +22,17 @@ An auth system for EVE Online to help in-game organizations manage online servic
 
 ## Overview
 
-Alliance Auth (AA) is a web site that helps Eve Online organizations efficiently manage access to applications and services.
+Alliance Auth (AA) is a platform that helps Eve Online organizations efficiently manage access to applications and services.
 
 Main features:
 
-- Automatically grants or revokes user access to external services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
+- Automatically grants or revokes user access to external services (e.g.: Discord, Mumble) based on the user's current membership to [a variety of EVE Online affiliation](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
 
 - Provides a central web site where users can directly access web apps (e.g. SRP requests, Fleet Schedule) and manage their access to external services and groups.
 
-- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
+- Includes a set of connectors (called ["Services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
 
-- Includes a set of web [apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
+- Includes a set of web [Apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
 
 - Can be easily extended with additional services and apps. Many are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)
 
@@ -42,9 +42,15 @@ For further details about AA - including an installation guide and a full list o
 
 ## Screenshot
 
-Here is an example of the Alliance Auth web site with some plug-ins apps and services enabled:
+Here is an example of the Alliance Auth web site with a mixture of Services, Apps and Community Creations enabled:
 
-![screenshot](https://i.imgur.com/2tnX9kD.png)
+### Flatly Theme
+
+![Flatly Theme](docs/_static/images/promotion/SampleInstallation-Flatly.png)
+
+### Darkly Theme
+
+![Darkly Theme](docs/_static/images/promotion/SampleInstallation-Darkly.png)
 
 ## Support
 

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__ = '5.0.0a3'
+__version__ = '4.8.0'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/analytics/admin.py

@@ -1,8 +1,7 @@
-from solo.admin import SingletonModelAdmin
-
 from django.contrib import admin
 
 from .models import AnalyticsIdentifier, AnalyticsTokens
+from solo.admin import SingletonModelAdmin
 
 
 @admin.register(AnalyticsIdentifier)

allianceauth/analytics/apps.py

@@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class AnalyticsConfig(AppConfig):
     name = 'allianceauth.analytics'
     label = 'analytics'
+    verbose_name = _('Analytics')

allianceauth/analytics/migrations/0001_initial.py

@@ -1,8 +1,7 @@
 # Generated by Django 3.1.4 on 2020-12-30 13:11
 
-import uuid
-
 from django.db import migrations, models
+import uuid
 
 
 class Migration(migrations.Migration):

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')
-    Tokens.objects.filter(token="UA-186249766-2").delete()
+    token = Tokens.objects.filter(token="UA-186249766-2").delete()
 
 
 class Migration(migrations.Migration):

allianceauth/analytics/migrations/0003_Generate_Identifier.py

@@ -1,5 +1,6 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53
 
+from uuid import uuid4
 from django.db import migrations
 
 

allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token .py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53
 
-from django.core.exceptions import ObjectDoesNotExist
 from django.db import migrations
+from django.core.exceptions import ObjectDoesNotExist
 
 
 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')
-    Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
+    token = Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
 
 
 class Migration(migrations.Migration):

allianceauth/analytics/models.py

@@ -1,10 +1,8 @@
 from typing import Literal
-from uuid import uuid4
-
-from solo.models import SingletonModel
-
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from solo.models import SingletonModel
+from uuid import uuid4
 
 
 class AnalyticsIdentifier(SingletonModel):
@@ -17,6 +15,7 @@ class AnalyticsIdentifier(SingletonModel):
     class Meta:
         verbose_name = "Analytics Identifier"
 
+
 class AnalyticsTokens(models.Model):
 
     class Analytics_Type(models.TextChoices):
@@ -28,6 +27,3 @@ 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

allianceauth/analytics/tasks.py

@@ -1,16 +1,17 @@
-import logging
-
 import requests
-from celery import shared_task
+import logging
-
-from django.apps import apps
 from django.conf import settings
+from django.apps import apps
+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 allianceauth import __version__
 
-from .models import AnalyticsIdentifier, AnalyticsTokens
-from .utils import existence_baremetal_or_docker, install_stat_addons, install_stat_tokens, install_stat_users
-
 logger = logging.getLogger(__name__)
 
 BASE_URL = "https://www.google-analytics.com"

allianceauth/analytics/tests/test_models.py

@@ -1,8 +1,9 @@
-from uuid import uuid4
+from allianceauth.analytics.models import AnalyticsIdentifier
 
 from django.test.testcases import TestCase
 
-from allianceauth.analytics.models import AnalyticsIdentifier
+from uuid import uuid4
+
 
 # Identifiers
 uuid_1 = "ab33e241fbf042b6aa77c7655a768af7"

allianceauth/analytics/tests/test_tasks.py

@@ -2,9 +2,12 @@ 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'
 
 

allianceauth/analytics/tests/test_utils.py

@@ -1,8 +1,9 @@
 from django.apps import apps
-from django.test.testcases import TestCase
-
-from allianceauth.analytics.utils import install_stat_addons, install_stat_users
 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
 
 
 def create_testdata():

allianceauth/analytics/utils.py

@@ -1,10 +1,7 @@
 import os
-
 from django.apps import apps
-
-from esi.models import Token
-
 from allianceauth.authentication.models import User
+from esi.models import Token
 
 
 def install_stat_users() -> int:

allianceauth/authentication/admin.py

@@ -1,21 +1,43 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import Group, Permission as BasePermission, User as BaseUser
+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.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.authentication.models import (
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+    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
 
 
@@ -110,7 +132,10 @@ def user_username(obj):
     To be used for all user based admin lists
     """
     link = reverse(
-        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label,
+            type(obj).__name__.lower()
+        ),
         args=(obj.pk,)
     )
     user_obj = obj.user if hasattr(obj, 'user') else obj
@@ -523,7 +548,7 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
     def get_readonly_fields(self, request, obj=None):
         if obj and obj.pk:
             return 'owner_hash', 'character'
-        return ()
+        return tuple()
 
 
 @admin.register(OwnershipRecord)

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 is int:
+    if min_value is None and required_type == int:
         min_value = 0
 
     if (hasattr(settings, name)

allianceauth/authentication/apps.py

@@ -1,10 +1,12 @@
 from django.apps import AppConfig
-from django.core.checks import Tags, register
+from django.core.checks import register, Tags
+from django.utils.translation import gettext_lazy as _
 
 
 class AuthenticationConfig(AppConfig):
     name = "allianceauth.authentication"
     label = "authentication"
+    verbose_name = _("Authentication")
 
     def ready(self):
         from allianceauth.authentication import checks, signals  # noqa: F401

allianceauth/authentication/auth_hooks.py

@@ -1,7 +1,6 @@
-from allianceauth import hooks
 from allianceauth.hooks import DashboardItemHook
-
+from allianceauth import hooks
-from .views import dashboard_admin, dashboard_characters, dashboard_esi_check, dashboard_groups
+from .views import dashboard_characters, dashboard_esi_check, dashboard_groups, dashboard_admin
 
 
 class UserCharactersHook(DashboardItemHook):

allianceauth/authentication/backends.py

@@ -1,9 +1,10 @@
 import logging
 
 from django.contrib.auth.backends import ModelBackend
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User, Permission
+
+from .models import UserProfile, CharacterOwnership, OwnershipRecord
 
-from .models import CharacterOwnership, OwnershipRecord, UserProfile
 
 logger = logging.getLogger(__name__)
 

allianceauth/authentication/checks.py

@@ -1,5 +1,5 @@
-from django.conf import settings
 from django.core.checks import Error
+from django.conf import settings
 
 
 def check_login_scopes_setting(*args, **kwargs):

allianceauth/authentication/core/celery_workers.py

@@ -2,6 +2,7 @@
 
 import itertools
 import logging
+from typing import Optional
 
 from amqp.exceptions import ChannelError
 from celery import current_app
@@ -11,7 +12,7 @@ from django.conf import settings
 logger = logging.getLogger(__name__)
 
 
-def active_tasks_count() -> int | None:
+def active_tasks_count() -> Optional[int]:
     """Return count of currently active tasks
     or None if celery workers are not online.
     """
@@ -19,7 +20,7 @@ def active_tasks_count() -> int | None:
     return _tasks_count(inspect.active())
 
 
-def _tasks_count(data: dict) -> int | None:
+def _tasks_count(data: dict) -> Optional[int]:
     """Return count of tasks in data from celery inspect API."""
     try:
         tasks = itertools.chain(*data.values())
@@ -28,7 +29,7 @@ def _tasks_count(data: dict) -> int | None:
     return len(list(tasks))
 
 
-def queued_tasks_count() -> int | None:
+def queued_tasks_count() -> Optional[int]:
     """Return count of queued tasks. Return None if there was an error."""
     try:
         with current_app.connection_or_acquire() as conn:

allianceauth/authentication/decorators.py

@@ -1,11 +1,14 @@
-from collections.abc import Callable, Iterable
+from django.urls import include
+from django.contrib.auth.decorators import user_passes_test
+from django.core.exceptions import PermissionDenied
 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 _
 
 
@@ -14,7 +17,7 @@ def user_has_main_character(user):
 
 
 def decorate_url_patterns(
-    urls, decorator: Callable, excluded_views: Iterable | None = None
+    urls, decorator: Callable, excluded_views: Optional[Iterable] = None
 ):
     """Decorate views given in url patterns except when they are explicitly excluded.
 

allianceauth/authentication/forms.py

@@ -60,7 +60,7 @@ class UserChangeForm(BaseUserChangeForm):
                     {
                         "groups": _(
                             "You are not allowed to add or remove these "
-                            "restricted groups: {}".format(restricted_names)
+                            "restricted groups: %s" % restricted_names
                         )
                     }
                 )

allianceauth/authentication/hmac_urls.py

@@ -1,6 +1,5 @@
-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'),

allianceauth/authentication/management/commands/checkmains.py

@@ -1,5 +1,4 @@
 from django.core.management.base import BaseCommand
-
 from allianceauth.authentication.models import UserProfile
 
 
@@ -12,7 +11,8 @@ class Command(BaseCommand):
         if profiles.exists():
             for profile in profiles:
                 self.stdout.write(self.style.ERROR(
-                    f'{profile.main_character} does not have an ownership. Resetting user {profile.user} main character.'))
+                    '{} does not have an ownership. Resetting user {} main character.'.format(profile.main_character,
+                                                                                                profile.user)))
                 profile.main_character = None
                 profile.save()
             self.stdout.write(self.style.WARNING(f'Reset {profiles.count()} main characters.'))

allianceauth/authentication/managers.py

@@ -1,7 +1,7 @@
 import logging
 
 from django.db import transaction
-from django.db.models import Manager, Q, QuerySet
+from django.db.models import Manager, QuerySet, Q
 
 from allianceauth.eveonline.models import EveCharacter
 

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__)
 
 

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):

allianceauth/authentication/migrations/0004_create_permissions.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations
 
-
 def create_permissions(apps, schema_editor):
     User = apps.get_model('auth', 'User')
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0005_delete_perms.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations
 
-
 def delete_permissions(apps, schema_editor):
     User = apps.get_model('auth', 'User')
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0010_only_one_authservicesinfo.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations
 
-
 def count_completed_fields(model):
     return len([True for key, value in model.__dict__.items() if bool(value)])
 

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):

allianceauth/authentication/migrations/0012_remove_add_delete_authservicesinfo_permissions.py

@@ -1,7 +1,6 @@
 # Generated by Django 1.10.5 on 2017-01-12 00:59
 
-from django.db import migrations
+from django.db import migrations, models
-
 
 def remove_permissions(apps, schema_editor):
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0013_service_modules.py

@@ -1,9 +1,9 @@
 # Generated by Django 1.10.2 on 2016-12-11 23:14
 
-import logging
-
 from django.db import migrations
 
+import logging
+
 logger = logging.getLogger(__name__)
 
 

allianceauth/authentication/migrations/0015_user_profiles.py

@@ -1,12 +1,11 @@
 # 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')

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):

allianceauth/authentication/models.py

@@ -1,11 +1,12 @@
 import logging
+from typing import ClassVar
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User, Permission
 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
 
@@ -27,12 +28,12 @@ class State(models.Model):
                                             help_text="Factions to whose members this state is available.")
     public = models.BooleanField(default=False, help_text="Make this state available to any character.")
 
-    objects = StateManager()
+    objects: ClassVar[StateManager] = StateManager()
 
     class Meta:
         ordering = ['-priority']
 
-    def __str__(self) -> str:
+    def __str__(self):
         return self.name
 
     def available_to_character(self, character):
@@ -60,7 +61,8 @@ def get_guest_state_pk():
 
 
 class UserProfile(models.Model):
-
+    class Meta:
+        default_permissions = ('change',)
 
     class Language(models.TextChoices):
         """
@@ -107,15 +109,10 @@ 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)
@@ -126,7 +123,7 @@ class UserProfile(models.Model):
                 self.save(update_fields=['state'])
                 notify(
                     self.user,
-                    _(f'State changed to: {state}'),
+                    _('State changed to: %s' % state),
                     _('Your user\'s state is now: %(state)s')
                     % ({'state': state}),
                     'info'
@@ -141,19 +138,22 @@ class UserProfile(models.Model):
                     sender=self.__class__, user=self.user, state=self.state
                 )
 
+    def __str__(self) -> str:
+        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()
+    objects: ClassVar[CharacterOwnershipManager] = CharacterOwnershipManager()
-    class Meta:
+
-        default_permissions = ('change', 'delete')
+    def __str__(self):
-        ordering = ['user', 'character__character_name']
-    def __str__(self) -> str:
         return f"{self.user}: {self.character}"
 
 
@@ -166,5 +166,5 @@ class OwnershipRecord(models.Model):
     class Meta:
         ordering = ['-created']
 
-    def __str__(self) -> str:
+    def __str__(self):
         return f"{self.user}: {self.character} on {self.created}"

allianceauth/authentication/signals.py

@@ -1,16 +1,19 @@
 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 m2m_changed, post_delete, post_save, pre_delete, pre_save
+from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
-from django.dispatch import Signal, receiver
+from django.dispatch import receiver, Signal
-
 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()
@@ -105,7 +108,8 @@ 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(f"Ownership of a main character {instance.character} has been revoked. Resetting {instance.user} main character.")
+            logger.info("Ownership of a main character {} has been revoked. Resetting {} main character.".format(
+                instance.character, instance.user))
             # clear main character as user no longer owns them
             instance.user.profile.main_character = None
             instance.user.profile.save()

allianceauth/authentication/task_statistics/counters.py

@@ -1,7 +1,7 @@
 """Counters for Task Statistics."""
 
 import datetime as dt
-from typing import NamedTuple
+from typing import NamedTuple, Optional
 
 from .event_series import EventSeries
 
@@ -16,7 +16,7 @@ class _TaskCounts(NamedTuple):
     retried: int
     failed: int
     total: int
-    earliest_task: dt.datetime | None
+    earliest_task: Optional[dt.datetime]
     hours: int
 
 

allianceauth/authentication/task_statistics/event_series.py

@@ -2,6 +2,7 @@
 
 import datetime as dt
 import logging
+from typing import List, Optional
 
 from pytz import utc
 from redis import Redis
@@ -16,7 +17,7 @@ class EventSeries:
 
     _ROOT_KEY = "ALLIANCEAUTH_EVENT_SERIES"
 
-    def __init__(self, key_id: str, redis: Redis | None = None) -> None:
+    def __init__(self, key_id: str, redis: Optional[Redis] = None) -> None:
         self._redis = get_redis_client_or_stub() if not redis else redis
         self._key_id = str(key_id)
         self.clear()
@@ -45,7 +46,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]
@@ -74,7 +75,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) -> dt.datetime | None:
+    def first_event(self, earliest: dt.datetime = None) -> Optional[dt.datetime]:
         """Date/Time of first event. Returns `None` if series has no events.
 
         Args:

allianceauth/authentication/task_statistics/signals.py

@@ -1,11 +1,7 @@
 """Signals for Task Statistics."""
 
 from celery.signals import (
-    task_failure,
+    task_failure, task_internal_error, task_retry, task_success, worker_ready,
-    task_internal_error,
-    task_retry,
-    task_success,
-    worker_ready,
 )
 
 from django.conf import settings

allianceauth/authentication/task_statistics/tests/test_counters.py

@@ -4,10 +4,7 @@ from django.test import TestCase
 from django.utils.timezone import now
 
 from allianceauth.authentication.task_statistics.counters import (
-    dashboard_results,
+    dashboard_results, failed_tasks, retried_tasks, succeeded_tasks,
-    failed_tasks,
-    retried_tasks,
-    succeeded_tasks,
 )
 
 

allianceauth/authentication/task_statistics/tests/test_helpers.py

@@ -4,8 +4,7 @@ from unittest.mock import patch
 from redis import RedisError
 
 from allianceauth.authentication.task_statistics.helpers import (
-    _RedisStub,
+    _RedisStub, get_redis_client_or_stub,
-    get_redis_client_or_stub,
 )
 
 MODULE_PATH = "allianceauth.authentication.task_statistics.helpers"

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 (
-    is_enabled,
     reset_counters,
+    is_enabled,
 )
 from allianceauth.eveonline.tasks import update_character
 

allianceauth/authentication/tasks.py

@@ -1,9 +1,8 @@
 import logging
 
-from celery import shared_task
+from esi.errors import TokenExpiredError, TokenInvalidError, IncompleteResponseError
-
-from esi.errors import IncompleteResponseError, TokenExpiredError, TokenInvalidError
 from esi.models import Token
+from celery import shared_task
 
 from allianceauth.authentication.models import CharacterOwnership
 
@@ -23,7 +22,8 @@ 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(f"Failed to validate owner hash of {tokens[0].character_name} due to problems contacting SSO servers.")
+                logger.warning("Failed to validate owner hash of {} due to problems contacting SSO servers.".format(
+                    tokens[0].character_name))
                 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(f'No tokens found with owner hash {owner_hash}. Revoking ownership.')
+        logger.info('No tokens found with owner hash %s. Revoking ownership.' % owner_hash)
         CharacterOwnership.objects.filter(owner_hash=owner_hash).delete()
 
 

allianceauth/authentication/templates/authentication/dashboard_bs3.html

@@ -0,0 +1,10 @@
+{% extends 'allianceauth/base.html' %}
+
+
+{% block page_title %}Dashboard{% endblock page_title %}
+
+{% block content %}
+    <div>
+        <h1>Dashboard Dummy</h1>
+    </div>
+{% endblock %}

allianceauth/authentication/templates/authentication/tokens.html

@@ -31,7 +31,7 @@
                     <tr>
                         <td style="white-space:initial;">
                             {% for s in t.scopes.all %}
-                                <span class="badge bg-secondary">{{ s.name }}</span>
+                                <span class="badge text-bg-secondary">{{ s.name }}</span>
                             {% endfor %}
                         </td>
 

allianceauth/authentication/templates/public/base.html

@@ -1,24 +1,24 @@
 {% load theme_tags %}
 {% load static %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" {% theme_html_tags %}>
     <head>
+        <!-- Required meta tags -->
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="">
+        <!-- End Required meta tags -->
-        <meta name="author" content="">
-        <!-- TODO Bundle all the site specific stuff up into its own template for easy override -->
-        <meta property="og:title" content="{{ SITE_NAME }}">
-        <meta property="og:image" content="{{ SITE_URL }}{% static 'allianceauth/icons/apple-touch-icon.png' %}">
-        <meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">
 
+        <!-- Meta tags -->
+        {% include 'allianceauth/opengraph.html' %}
         {% include 'allianceauth/icons.html' %}
+        <!-- Meta tags -->
 
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
         {% theme_css %}
+
         {% include 'bundles/fontawesome.html' %}
+        {% include 'bundles/auth-framework-css.html' %}
 
         {% block extra_include %}
         {% endblock %}

allianceauth/authentication/templates/public/lang_select.html

@@ -1,7 +1,6 @@
 {% load i18n %}
 
-<div class="dropdown">
+<form class="dropdown-item" action="{% url 'set_language' %}" method="post">
-    <form action="{% url 'set_language' %}" method="post">
     {% csrf_token %}
 
     <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
@@ -14,4 +13,3 @@
         {% endfor %}
     </select>
 </form>
-</div>

allianceauth/authentication/tests/__init__.py

@@ -1,6 +1,11 @@
-from unittest import mock
+from django.db.models.signals import (
-
+    m2m_changed,
+    post_save,
+    pre_delete,
+    pre_save
+)
 from django.urls import reverse
+from unittest import mock
 
 MODULE_PATH = 'allianceauth.authentication'
 
@@ -12,7 +17,9 @@ 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(
-        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label, type(obj).__name__.lower()
+        ),
         args=(obj.pk,)
     )
 

allianceauth/authentication/tests/core/test_celery_workers.py

@@ -5,8 +5,7 @@ from amqp.exceptions import ChannelError
 from django.test import TestCase
 
 from allianceauth.authentication.core.celery_workers import (
-    active_tasks_count,
+    active_tasks_count, queued_tasks_count,
-    queued_tasks_count,
 )
 
 MODULE_PATH = "allianceauth.authentication.core.celery_workers"

allianceauth/authentication/tests/test_admin.py

@@ -1,37 +1,42 @@
-from unittest.mock import MagicMock, patch
-from urllib.parse import quote
-
 from bs4 import BeautifulSoup
+from urllib.parse import quote
+from unittest.mock import patch, MagicMock
+
 from django_webtest import WebTest
 
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import Group
-from django.test import Client, RequestFactory, TestCase
+from django.test import TestCase, RequestFactory, Client
 
-from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State
+from allianceauth.authentication.models import (
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+    CharacterOwnership, State, OwnershipRecord
+)
+from allianceauth.eveonline.models import (
+    EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
+)
 from allianceauth.services.hooks import ServicesHook
 from allianceauth.tests.auth_utils import AuthUtils
 
 from ..admin import (
     BaseUserAdmin,
     CharacterOwnershipAdmin,
-    MainAllianceFilter,
+    StateAdmin,
     MainCorporationsFilter,
+    MainAllianceFilter,
     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'
 
 
@@ -322,15 +327,15 @@ class TestUserAdmin(TestCaseWithTestData):
 
     def test_user_username_u1(self):
         expected = (
-            f'<strong><a href="/admin/authentication/user/{self.user_1.pk}/change/">'
+            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Bruce_Wayne</a></strong><br>Bruce Wayne'
+            'Bruce_Wayne</a></strong><br>Bruce Wayne'.format(self.user_1.pk)
         )
         self.assertEqual(user_username(self.user_1), expected)
 
     def test_user_username_u3(self):
         expected = (
-            f'<strong><a href="/admin/authentication/user/{self.user_3.pk}/change/">'
+            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Lex_Luthor</a></strong>'
+            'Lex_Luthor</a></strong>'.format(self.user_3.pk)
         )
         self.assertEqual(user_username(self.user_3), expected)
 

allianceauth/authentication/tests/test_app_settings.py

@@ -1,5 +1,4 @@
 from unittest.mock import Mock, patch
-
 from django.test import TestCase
 
 from .. import app_settings
@@ -84,7 +83,7 @@ class TestSetAppSetting(TestCase):
         self.assertEqual(result, 50)
 
     @patch(MODULE_PATH + '.app_settings.settings')
-    def test_default_for_outofrange_int(self, mock_settings):
+    def test_default_for_invalid_type_int(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = 1000
         result = app_settings._clean_setting(
             'TEST_SETTING_DUMMY',
@@ -97,7 +96,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):
-            app_settings._clean_setting(
+            result = app_settings._clean_setting(
                 'TEST_SETTING_DUMMY',
                 default_value=None
             )

allianceauth/authentication/tests/test_backend.py

@@ -1,13 +1,13 @@
-from django.contrib.auth.models import Group, User
+from django.contrib.auth.models import User, Group
 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, OwnershipRecord, UserProfile
+from ..models import CharacterOwnership, UserProfile, OwnershipRecord
 
 MODULE_PATH = 'allianceauth.authentication'
 

allianceauth/authentication/tests/test_decorators.py

@@ -6,11 +6,12 @@ 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 URLPattern, reverse
+from django.urls import reverse, URLPattern
 
 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
 
@@ -46,7 +47,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_login_redirect(self, m):
-        self.request.user = AnonymousUser()
+        setattr(self.request, 'user', AnonymousUser())
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 302)
         url = getattr(response, 'url', None)
@@ -54,7 +55,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_main_character_redirect(self, m):
-        self.request.user = self.no_main_user
+        setattr(self.request, 'user', self.no_main_user)
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 302)
         url = getattr(response, 'url', None)
@@ -62,7 +63,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_successful_request(self, m):
-        self.request.user = self.main_user
+        setattr(self.request, 'user', self.main_user)
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 200)
 

allianceauth/authentication/tests/test_middleware.py

@@ -1,9 +1,9 @@
-from unittest.mock import Mock
+from unittest import mock
-
-from django.http import HttpResponse
-from django.test.testcases import TestCase
-
 from allianceauth.authentication.middleware import UserSettingsMiddleware
+from unittest.mock import Mock
+from django.http import HttpResponse
+
+from django.test.testcases import TestCase
 
 
 class TestUserSettingsMiddlewareSaveLang(TestCase):
@@ -39,7 +39,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         of a non-existent (anonymous) user
         """
         self.request.user.is_anonymous = True
-        self.middleware.process_response(
+        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
-        self.middleware.process_response(
+        response = self.middleware.process_response(
             self.request,
             self.response
             )
@@ -64,7 +64,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         """
         Tests the middleware will change a language setting
         """
-        self.middleware.process_response(
+        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 = {}
-        self.middleware.process_response(
+        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.
         """
-        self.middleware.process_response(
+        response = self.middleware.process_response(
             self.request,
             self.response
             )

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
 

allianceauth/authentication/tests/test_signals.py

@@ -1,10 +1,19 @@
-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 EveAllianceInfo, EveCharacter, EveCorporationInfo
+from allianceauth.eveonline.models import (
+    EveCharacter,
+    EveCorporationInfo,
+    EveAllianceInfo
+)
+from django.db.models.signals import (
+    pre_save,
+    post_save,
+    pre_delete,
+    m2m_changed
+)
 from allianceauth.tests.auth_utils import AuthUtils
 
+from django.test.testcases import TestCase
+from unittest.mock import Mock
 from . import patch
 
 

allianceauth/authentication/tests/test_templatetags.py

@@ -9,12 +9,8 @@ from django.core.cache import cache
 from django.test import TestCase
 
 from allianceauth.templatetags.admin_status import (
-    _current_notifications,
+    _current_notifications, _current_version_summary, _fetch_list_from_gitlab,
-    _current_version_summary,
+    _fetch_notification_issues_from_gitlab, _latests_versions, status_overview,
-    _fetch_list_from_gitlab,
-    _fetch_notification_issues_from_gitlab,
-    _latests_versions,
-    status_overview,
 )
 
 MODULE_PATH = 'allianceauth.templatetags'
@@ -131,7 +127,7 @@ class TestNotifications(TestCase):
         # when
         result = _current_notifications()
         # then
-        self.assertEqual(result['notifications'], [])
+        self.assertEqual(result['notifications'], list())
 
     @patch(MODULE_PATH + '.admin_status.cache')
     def test_current_notifications_is_none(self, mock_cache):
@@ -140,7 +136,7 @@ class TestNotifications(TestCase):
         # when
         result = _current_notifications()
         # then
-        self.assertEqual(result['notifications'], [])
+        self.assertEqual(result['notifications'], list())
 
 
 class TestCeleryQueueLength(TestCase):

allianceauth/authentication/tests/test_views.py

@@ -1,13 +1,12 @@
 import json
-from unittest.mock import patch
-
 import requests_mock
+from unittest.mock import patch
 
 from django.test import RequestFactory, TestCase
 
-from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES
+from allianceauth.authentication.views import task_counts, esi_check
-from allianceauth.authentication.views import esi_check, task_counts
 from allianceauth.tests.auth_utils import AuthUtils
+from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES
 
 MODULE_PATH = "allianceauth.authentication.views"
 

allianceauth/authentication/urls.py

@@ -38,6 +38,7 @@ urlpatterns = [
         name='token_refresh'
     ),
     path('dashboard/', views.dashboard, name='dashboard'),
+    path('dashboard_bs3/', views.dashboard_bs3, name='dashboard_bs3'),
     path('task-counts/', views.task_counts, name='task_counts'),
     path('esi-check/', views.esi_check, name='esi_check'),
 ]

allianceauth/authentication/views.py

@@ -1,6 +1,11 @@
 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
@@ -13,12 +18,6 @@ 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
@@ -33,7 +32,7 @@ from .models import CharacterOwnership
 
 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
     _has_auto_groups = True
-    from allianceauth.eveonline.autogroups.models import *  # noqa: F403
+    from allianceauth.eveonline.autogroups.models import *  # noqa: F401, F403
 else:
     _has_auto_groups = False
 
@@ -88,7 +87,7 @@ def dashboard_esi_check(request):
 
 @login_required
 def dashboard(request):
-    _dash_items = []
+    _dash_items = list()
     hooks = get_hooks('dashboard_hook')
     items = [fn() for fn in hooks]
     items.sort(key=lambda i: i.order)
@@ -165,7 +164,9 @@ 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(
-            f'Changed user {request.user} main character to {co.character}'
+            'Changed user {user} main character to {char}'.format(
+                user=request.user, char=co.character
+            )
         )
     return redirect("authentication:dashboard")
 
@@ -175,9 +176,10 @@ 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, _(
-            f'Added {token.character_name} to your account.'))
+            'Added %(name)s to your account.' % ({'name': token.character_name})))
     else:
-        messages.error(request, _(f'Failed to add {token.character_name} to your account: they already have an account.'))
+        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % (
+            {'name': token.character_name})))
     return redirect('authentication:dashboard')
 
 
@@ -292,7 +294,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.
-            self.request = request
+            setattr(self, 'request', request)
         return super().dispatch(request, *args, **kwargs)
 
     def register(self, form):
@@ -392,3 +394,12 @@ def esi_check(request) -> JsonResponse:
         "data": check_for_override_esi_error_message(_r)
     }
     return JsonResponse(data)
+
+
+@login_required
+def dashboard_bs3(request):
+    """Render dashboard view with BS3 theme.
+
+    This is an internal view used for testing BS3 backward compatibility in AA4 only.
+    """
+    return render(request, 'authentication/dashboard_bs3.html')

allianceauth/bin/allianceauth.py

@@ -2,7 +2,6 @@
 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
 
@@ -44,7 +43,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.")
+    print(f"Success! {args[0]} has been created.")  # noqa
 
 
 def update_settings(parser, options, args):
@@ -63,7 +62,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(f"Unable to locate the Alliance Auth project at {project_path}")
+            parser.error("Unable to locate the Alliance Auth project at %s" % project_path)
 
     # first find the path to the Alliance Auth template settings
     import allianceauth

allianceauth/checks.py

@@ -2,17 +2,15 @@
 Django system checks for Alliance Auth
 """
 
-from datetime import datetime, timezone
+from typing import List
-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, register, Warning
-from django.core.checks import CheckMessage, Error, Warning, register
-
 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
+from sqlite3.dbapi2 import sqlite_version_info
 
 """
 A = System Packages
@@ -21,7 +19,7 @@ B = Configuration
 
 
 @register()
-def django_settings(app_configs, **kwargs) -> list[CheckMessage]:
+def django_settings(app_configs, **kwargs) -> List[CheckMessage]:
     """
     Check that Django settings are correctly configured
 
@@ -33,7 +31,7 @@ def django_settings(app_configs, **kwargs) -> list[CheckMessage]:
     :rtype:
     """
 
-    errors: list[CheckMessage] = []
+    errors: List[CheckMessage] = []
 
     # Check for SITE_URL
     if hasattr(settings, "SITE_URL"):
@@ -111,7 +109,7 @@ def django_settings(app_configs, **kwargs) -> list[CheckMessage]:
 
 
 @register()
-def system_package_redis(app_configs, **kwargs) -> list[CheckMessage]:
+def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
     """
     Check that Redis is a supported version
 
@@ -125,7 +123,7 @@ def system_package_redis(app_configs, **kwargs) -> list[CheckMessage]:
 
     allianceauth_redis_install_link = "https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools"
 
-    errors: list[CheckMessage] = []
+    errors: List[CheckMessage] = []
 
     try:
         redis_version = Pep440Version(get_redis_client().info()["redis_version"])
@@ -137,8 +135,8 @@ def system_package_redis(app_configs, **kwargs) -> list[CheckMessage]:
     if (
         redis_version.major == 7
         and redis_version.minor == 2
-        and datetime.now(timezone.utc)
+        and timezone.now()
-        > datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
+        > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
     ):
         errors.append(
             Error(
@@ -176,7 +174,7 @@ def system_package_redis(app_configs, **kwargs) -> list[CheckMessage]:
 
 
 @register()
-def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
+def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
     """
     Check that MySQL is a supported version
 
@@ -190,7 +188,7 @@ def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
 
     mysql_quick_guide_link = "https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/"
 
-    errors: list[CheckMessage] = []
+    errors: List[CheckMessage] = []
 
     for connection in db.connections.all():
         if connection.vendor == "mysql":
@@ -205,7 +203,7 @@ def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
 
             #  MySQL 8
             if mysql_version.major == 8:
-                if mysql_version.minor == 4 and datetime.now(timezone.utc) > datetime(
+                if mysql_version.minor == 4 and timezone.now() > timezone.datetime(
                     year=2032, month=4, day=30, tzinfo=timezone.utc
                 ):
                     errors.append(
@@ -215,8 +213,7 @@ def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
                             id="allianceauth.checks.A004",
                         )
                     )
-                # Demote versions down here once EOL
+                elif mysql_version.minor == 3:
-                elif mysql_version.minor in [1, 2, 3]:
                     errors.append(
                         Warning(
                             msg=f"MySQL {mysql_version.public} Non LTS",
@@ -224,7 +221,23 @@ def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
                             id="allianceauth.checks.A005",
                         )
                     )
-                elif mysql_version.minor == 0 and datetime.now(timezone.utc) > datetime(
+                elif mysql_version.minor == 2:
+                    errors.append(
+                        Warning(
+                            msg=f"MySQL {mysql_version.public} Non LTS",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A006",
+                        )
+                    )
+                elif mysql_version.minor == 1:
+                    errors.append(
+                        Error(
+                            msg=f"MySQL {mysql_version.public} EOL",
+                            hint=mysql_quick_guide_link,
+                            id="allianceauth.checks.A007",
+                        )
+                    )
+                elif mysql_version.minor == 0 and timezone.now() > timezone.datetime(
                     year=2026, month=4, day=30, tzinfo=timezone.utc
                 ):
                     errors.append(
@@ -250,14 +263,21 @@ def system_package_mysql(app_configs, **kwargs) -> list[CheckMessage]:
 
 
 @register()
-def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa: C901
+def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
     """
     Check that MariaDB is a supported version
+
+    :param app_configs:
+    :type app_configs:
+    :param kwargs:
+    :type kwargs:
+    :return:
+    :rtype:
     """
 
     mariadb_download_link = "https://mariadb.org/download/?t=repo-config"
 
-    errors: list[CheckMessage] = []
+    errors: List[CheckMessage] = []
 
     for connection in db.connections.all():
         # TODO: Find a way to determine MySQL vs. MariaDB
@@ -273,7 +293,7 @@ def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa
 
             # MariaDB 11
             if mariadb_version.major == 11:
-                if mariadb_version.minor == 4 and datetime.now(timezone.utc) > datetime(
+                if mariadb_version.minor == 4 and timezone.now() > timezone.datetime(
                     year=2029, month=5, day=19, tzinfo=timezone.utc
                 ):
                     errors.append(
@@ -283,8 +303,46 @@ def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa
                             id="allianceauth.checks.A010",
                         )
                     )
+                elif mariadb_version.minor == 2:
+                    errors.append(
+                        Warning(
+                            msg=f"MariaDB {mariadb_version.public} Non LTS",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A018",
+                        )
+                    )
+
+                    if timezone.now() > timezone.datetime(
+                        year=2024, month=11, day=21, tzinfo=timezone.utc
+                    ):
+                        errors.append(
+                            Error(
+                                msg=f"MariaDB {mariadb_version.public} EOL",
+                                hint=mariadb_download_link,
+                                id="allianceauth.checks.A011",
+                            )
+                        )
+                elif mariadb_version.minor == 1:
+                    errors.append(
+                        Warning(
+                            msg=f"MariaDB {mariadb_version.public} Non LTS",
+                            hint=mariadb_download_link,
+                            id="allianceauth.checks.A019",
+                        )
+                    )
+
+                    if timezone.now() > timezone.datetime(
+                        year=2024, month=8, day=21, tzinfo=timezone.utc
+                    ):
+                        errors.append(
+                            Error(
+                                msg=f"MariaDB {mariadb_version.public} EOL",
+                                hint=mariadb_download_link,
+                                id="allianceauth.checks.A012",
+                            )
+                        )
                 # Demote versions down here once EOL
-                elif mariadb_version.minor in [0, 1, 2, 3, 5, 6]:
+                elif mariadb_version.minor in [0, 3]:
                     errors.append(
                         Error(
                             msg=f"MariaDB {mariadb_version.public} EOL",
@@ -295,7 +353,7 @@ def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa
 
             # MariaDB 10
             elif mariadb_version.major == 10:
-                if mariadb_version.minor == 11 and datetime.now(timezone.utc) > datetime(
+                if mariadb_version.minor == 11 and timezone.now() > timezone.datetime(
                     year=2028, month=2, day=10, tzinfo=timezone.utc
                 ):
                     errors.append(
@@ -305,7 +363,7 @@ def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa
                             id="allianceauth.checks.A014",
                         )
                     )
-                elif mariadb_version.minor == 6 and datetime.now(timezone.utc) > datetime(
+                elif mariadb_version.minor == 6 and timezone.now() > timezone.datetime(
                     year=2026, month=7, day=6, tzinfo=timezone.utc
                 ):
                     errors.append(
@@ -315,7 +373,7 @@ def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa
                             id="allianceauth.checks.A0015",
                         )
                     )
-                elif mariadb_version.minor == 5 and datetime.now(timezone.utc) > datetime(
+                elif mariadb_version.minor == 5 and timezone.now() > timezone.datetime(
                     year=2025, month=6, day=24, tzinfo=timezone.utc
                 ):
                     errors.append(
@@ -339,7 +397,7 @@ def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:  # noqa
 
 
 @register()
-def system_package_sqlite(app_configs, **kwargs) -> list[CheckMessage]:
+def system_package_sqlite(app_configs, **kwargs) -> List[CheckMessage]:
     """
     Check that SQLite is a supported version
 
@@ -351,7 +409,7 @@ def system_package_sqlite(app_configs, **kwargs) -> list[CheckMessage]:
     :rtype:
     """
 
-    errors: list[CheckMessage] = []
+    errors: List[CheckMessage] = []
 
     for connection in db.connections.all():
         if connection.vendor == "sqlite":
@@ -376,7 +434,7 @@ def system_package_sqlite(app_configs, **kwargs) -> list[CheckMessage]:
 
 
 @register()
-def sql_settings(app_configs, **kwargs) -> list[CheckMessage]:
+def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
     """
     Check that SQL settings are correctly configured
 
@@ -388,7 +446,7 @@ def sql_settings(app_configs, **kwargs) -> list[CheckMessage]:
     :rtype:
     """
 
-    errors: list[CheckMessage] = []
+    errors: List[CheckMessage] = []
 
     for connection in db.connections.all():
         if connection.vendor == "mysql":
@@ -438,7 +496,7 @@ def sql_settings(app_configs, **kwargs) -> list[CheckMessage]:
 
 
 @register()
-def celery_settings(app_configs, **kwargs) -> list[CheckMessage]:
+def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
     """
     Check that Celery settings are correctly configured
 
@@ -450,7 +508,7 @@ def celery_settings(app_configs, **kwargs) -> list[CheckMessage]:
     :rtype:
     """
 
-    errors: list[CheckMessage] = []
+    errors: List[CheckMessage] = []
 
     try:
         if current_app.conf.broker_transport_options != {

allianceauth/context_processors.py

@@ -1,5 +1,4 @@
 from django.conf import settings
-
 from .views import NightModeRedirectView
 
 

allianceauth/corputils/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import CorpMember, CorpStats
+from .models import CorpStats, CorpMember
 
 admin.site.register(CorpStats)
 admin.site.register(CorpMember)

allianceauth/corputils/apps.py

@@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class CorpUtilsConfig(AppConfig):
     name = 'allianceauth.corputils'
     label = 'corputils'
+    verbose_name = _('Corporation Stats')

allianceauth/corputils/auth_hooks.py

@@ -1,9 +1,8 @@
-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
+from django.utils.translation import gettext_lazy as _
+from allianceauth import hooks
+from allianceauth.corputils import urls
 
 
 class CorpStats(MenuItemHook):

allianceauth/corputils/managers.py

@@ -1,6 +1,5 @@
-import logging
-
 from django.db import models
+import logging
 
 logger = logging.getLogger(__name__)
 
@@ -9,7 +8,7 @@ class CorpStatsQuerySet(models.QuerySet):
     def visible_to(self, user):
         # superusers get all visible
         if user.is_superuser:
-            logger.debug(f'Returning all corpstats for superuser {user}.')
+            logger.debug('Returning all corpstats for superuser %s.' % user)
             return self
 
         try:
@@ -37,7 +36,7 @@ class CorpStatsQuerySet(models.QuerySet):
                 query |= q
             return self.filter(query)
         except AssertionError:
-            logger.debug(f'User {user} has no main character. No corpstats visible.')
+            logger.debug('User %s has no main character. No corpstats visible.' % user)
             return self.none()
 
 

allianceauth/corputils/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 1.10.1 on 2016-12-14 21:36
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allianceauth/corputils/migrations/0002_migrate_permissions.py

@@ -66,11 +66,11 @@ 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()
 
 
-def reverse(apps, schema_editor):  # noqa: C901
+def reverse(apps, schema_editor):
     perm_dict = user_permissions_dict(apps)
 
     corp_users = users_with_permission(apps, perm_dict['corpstats']['view_corp_corpstats'])

allianceauth/corputils/migrations/0004_member_models.py

@@ -1,9 +1,8 @@
 # Generated by Django 1.10.5 on 2017-03-26 20:13
 
-import json
-
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
+import json
 
 
 def convert_json_to_members(apps, schema_editor):

allianceauth/corputils/models.py

@@ -1,18 +1,17 @@
 import logging
 import os
-
+from typing import ClassVar
-from bravado.exception import HTTPForbidden
-
-from django.db import models
-
-from esi.errors import TokenError
-from esi.models import Token
 
 from allianceauth.authentication.models import CharacterOwnership, UserProfile
-from allianceauth.corputils.managers import CorpStatsManager
+from bravado.exception import HTTPForbidden
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
+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.corputils.managers import CorpStatsManager
+
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """
 Swagger spec operations:
@@ -33,7 +32,6 @@ 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.'),
@@ -43,7 +41,7 @@ class CorpStats(models.Model):
         verbose_name = "corp stats"
         verbose_name_plural = "corp stats"
 
-
+    objects: ClassVar[CorpStatsManager] = CorpStatsManager()
 
     def __str__(self) -> str:
         return f"{self.__class__.__name__} for {self.corp}"
@@ -79,21 +77,21 @@ class CorpStats(models.Model):
             logger.warning(f"{self} failed to update: {e}")
             if self.token.user:
                 notify(
-                    self.token.user, f"{self} failed to update with your ESI token.",
+                    self.token.user, "%s failed to update with your ESI token." % self,
                     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, f"{self} failed to update with your ESI token.", message=f"{e.status_code}: {e.message}", level="error")
+                notify(self.token.user, "%s failed to update with your ESI token." % self, message=f"{e.status_code}: {e.message}", level="error")
             self.delete()
         except AssertionError:
-            logger.warning(f"{self} token character no longer in corp.")
+            logger.warning("%s token character no longer in corp." % self)
             if self.token.user:
                 notify(
-                    self.token.user, f"{self} cannot update with your ESI token.",
+                    self.token.user, "%s cannot update with your ESI token." % self,
-                    message=f"{self} cannot update with your ESI token as you have left corp.", level="error")
+                    message="%s cannot update with your ESI token as you have left corp." % self, level="error")
             self.delete()
 
     @property
@@ -154,7 +152,7 @@ class CorpMember(models.Model):
         unique_together = ('corpstats', 'character_id')
         ordering = ['character_name']
 
-    def __str__(self) -> str:
+    def __str__(self):
         return self.character_name
 
     @property

allianceauth/corputils/tasks.py

@@ -1,5 +1,4 @@
 from celery import shared_task
-
 from allianceauth.corputils.models import CorpStats
 
 

allianceauth/corputils/templates/corputils/corpstats.html

@@ -138,7 +138,7 @@
                                                                 <td style="width: 30%;">{{ alt.corporation_name }}</td>
                                                                 <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
                                                                 <td style="width: 5%;">
-                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
+                                                                    <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                                         {% translate "Killboard" %}
                                                                     </a>
                                                                 </td>
@@ -175,7 +175,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member }}"></td>
                                                 <td>{{ member }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                 </td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
@@ -188,7 +188,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a>
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a>
                                                 </td>
                                                 <td></td>
                                                 <td></td>
@@ -219,7 +219,7 @@
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
-                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge bg-danger" target="_blank">
+                                                    <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="badge text-bg-danger" target="_blank">
                                                         {% translate "Killboard" %}
                                                     </a>
                                                 </td>

allianceauth/corputils/templates/corputils/search.html

@@ -28,7 +28,7 @@
                             <td><img src="{{ result.1.portrait_url }}" class="img-circle" alt="{{ result.1.character_name }}"></td>
                             <td>{{ result.1.character_name }}</td>
                             <td >{{ result.0.corp.corporation_name }}</td>
-                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
+                            <td><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="badge text-bg-danger" target="_blank">{% translate "Killboard" %}</a></td>
                             <td>{{ result.1.main_character.character_name }}</td>
                             <td>{{ result.1.main_character.corporation_name }}</td>
                             <td>{{ result.1.main_character.alliance_name }}</td>

allianceauth/corputils/tests.py

@@ -1,18 +1,14 @@
 from unittest import mock
 
-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 CorpStats, CorpMember
-from .models import CorpMember, CorpStats
+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 allianceauth.authentication.models import CharacterOwnership
 
 
 class CorpStatsManagerTestCase(TestCase):

allianceauth/corputils/urls.py

@@ -1,5 +1,4 @@
 from django.urls import path
-
 from . import views
 
 app_name = 'corputils'

allianceauth/corputils/views.py

@@ -1,19 +1,16 @@
 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 ObjectDoesNotExist, PermissionDenied
+from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
 from django.db import IntegrityError
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.translation import gettext_lazy as _
-
 from esi.decorators import token_required
-
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
 
-from .models import CorpMember, CorpStats
+from .models import CorpStats, CorpMember
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """
@@ -62,7 +59,7 @@ def corpstats_add(request, token):
 
 @login_required
 @user_passes_test(access_corpstats_test)
-def corpstats_view(request, corp_id=None):  # noqa: C901
+def corpstats_view(request, corp_id=None):
     corpstats = None
 
     # get requested model

allianceauth/crontab/apps.py

@@ -3,6 +3,7 @@ Crontab App Config
 """
 
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class CrontabConfig(AppConfig):
@@ -12,3 +13,4 @@ class CrontabConfig(AppConfig):
 
     name = "allianceauth.crontab"
     label = "crontab"
+    verbose_name = _("Crontab")

allianceauth/crontab/migrations/0001_initial.py

@@ -1,8 +1,7 @@
 # Generated by Django 4.2.16 on 2025-01-20 06:16
 
-from django.db import migrations, models
-
 import allianceauth.crontab.models
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

allianceauth/crontab/models.py

@@ -1,9 +1,7 @@
 from random import random
-
-from solo.models import SingletonModel
-
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from solo.models import SingletonModel
 
 
 def random_default() -> float:

allianceauth/crontab/schedulers.py

@@ -1,10 +1,12 @@
+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 django_celery_beat.models import CrontabSchedule
-from django_celery_beat.schedulers import DatabaseScheduler
-
-from django.core.exceptions import ObjectDoesNotExist
-from django.db.utils import OperationalError, ProgrammingError
 
 from allianceauth.crontab.models import CronOffset
 from allianceauth.crontab.utils import offset_cron
@@ -26,7 +28,7 @@ class OffsetDatabaseScheduler(DatabaseScheduler):
         s = {}
 
         try:
-            cron_offset = CronOffset.get_solo()  # noqa: F841
+            cron_offset = CronOffset.get_solo()
         except (OperationalError, ProgrammingError, ObjectDoesNotExist) as exc:
             # This is just incase we haven't migrated yet or something
             logger.warning(

allianceauth/crontab/tests/test_models.py

@@ -1,5 +1,4 @@
 from unittest.mock import patch
-
 from django.test import TestCase
 
 from allianceauth.crontab.models import CronOffset

allianceauth/crontab/tests/test_utils.py

@@ -2,14 +2,12 @@
 
 import logging
 from unittest.mock import patch
-
+from django.test import TestCase
+from django.db import ProgrammingError
 from celery.schedules import crontab
 
-from django.db import ProgrammingError
-from django.test import TestCase
-
-from allianceauth.crontab.models import CronOffset
 from allianceauth.crontab.utils import offset_cron
+from allianceauth.crontab.models import CronOffset
 
 logger = logging.getLogger(__name__)
 

allianceauth/crontab/utils.py

@@ -1,10 +1,8 @@
-import logging
-
 from celery.schedules import crontab
-
+import logging
+from allianceauth.crontab.models import CronOffset
 from django.db import ProgrammingError
 
-from allianceauth.crontab.models import CronOffset
 
 logger = logging.getLogger(__name__)
 

allianceauth/custom_css/admin.py

@@ -3,15 +3,14 @@ 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)

allianceauth/custom_css/forms.py

@@ -3,12 +3,12 @@ Forms for custom_css app
 """
 
 # Alliance Auth Custom CSS
-# Django
-from django import forms
-
 from allianceauth.custom_css.models import CustomCSS
 from allianceauth.custom_css.widgets import CssEditorWidget
 
+# Django
+from django import forms
+
 
 class CustomCSSAdminForm(forms.ModelForm):
     """

allianceauth/custom_css/models.py

@@ -21,6 +21,7 @@ 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."),
     )

allianceauth/custom_css/templatetags/custom_css.py

@@ -3,7 +3,7 @@ Custom template tags for custom_css app
 """
 
 # Alliance Auth Custom CSS
-from pathlib import Path
+from allianceauth.custom_css.models import CustomCSS
 
 # 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 allianceauth.custom_css.models import CustomCSS
+from pathlib import Path
 
 
 @register.simple_tag

allianceauth/custom_css/widgets.py

@@ -6,6 +6,7 @@ Form widgets for custom_css app
 from django import forms
 
 # Alliance Auth
+from allianceauth.custom_css.models import CustomCSS
 
 
 class CssEditorWidget(forms.Textarea):

allianceauth/eveonline/admin.py

@@ -1,10 +1,13 @@
 from django import forms
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
-
-from .models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from .providers import ObjectNotFound
 
+from .models import EveAllianceInfo
+from .models import EveCharacter
+from .models import EveCorporationInfo
+from .models import EveFactionInfo
+
 
 class EveEntityExistsError(forms.ValidationError):
     def __init__(self, entity_type_name, id):
@@ -49,8 +52,8 @@ class EveFactionForm(EveEntityForm):
     def clean_id(self):
         try:
             assert self.Meta.model.provider.get_faction(self.cleaned_data['id'])
-        except (AssertionError, ObjectNotFound) as e:
+        except (AssertionError, ObjectNotFound):
-            raise EveEntityNotFoundError('faction', self.cleaned_data['id']) from e
+            raise EveEntityNotFoundError('faction', self.cleaned_data['id'])
         if self.Meta.model.objects.filter(faction_id=self.cleaned_data['id']).exists():
             raise EveEntityExistsError('faction', self.cleaned_data['id'])
         return self.cleaned_data['id']
@@ -70,8 +73,8 @@ class EveCharacterForm(EveEntityForm):
     def clean_id(self):
         try:
             assert self.Meta.model.provider.get_character(self.cleaned_data['id'])
-        except (AssertionError, ObjectNotFound) as e:
+        except (AssertionError, ObjectNotFound):
-            raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id']) from e
+            raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id'])
         if self.Meta.model.objects.filter(character_id=self.cleaned_data['id']).exists():
             raise EveEntityExistsError(self.entity_type_name, self.cleaned_data['id'])
         return self.cleaned_data['id']
@@ -90,8 +93,8 @@ class EveCorporationForm(EveEntityForm):
     def clean_id(self):
         try:
             assert self.Meta.model.provider.get_corporation(self.cleaned_data['id'])
-        except (AssertionError, ObjectNotFound) as e:
+        except (AssertionError, ObjectNotFound):
-            raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id']) from e
+            raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id'])
         if self.Meta.model.objects.filter(corporation_id=self.cleaned_data['id']).exists():
             raise EveEntityExistsError(self.entity_type_name, self.cleaned_data['id'])
         return self.cleaned_data['id']
@@ -110,8 +113,8 @@ class EveAllianceForm(EveEntityForm):
     def clean_id(self):
         try:
             assert self.Meta.model.provider.get_alliance(self.cleaned_data['id'])
-        except (AssertionError, ObjectNotFound) as e:
+        except (AssertionError, ObjectNotFound):
-            raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id']) from e
+            raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id'])
         if self.Meta.model.objects.filter(alliance_id=self.cleaned_data['id']).exists():
             raise EveEntityExistsError(self.entity_type_name, self.cleaned_data['id'])
         return self.cleaned_data['id']

allianceauth/eveonline/apps.py

@@ -1,6 +1,8 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class EveonlineConfig(AppConfig):
     name = 'allianceauth.eveonline'
     label = 'eveonline'
+    verbose_name = _('EVE Online')

allianceauth/eveonline/autogroups/admin.py

@@ -1,9 +1,9 @@
-import logging
-
 from django.contrib import admin
 from django.db import models
+from .models import AutogroupsConfig, ManagedCorpGroup, ManagedAllianceGroup
+
+import logging
 
-from .models import AutogroupsConfig, ManagedAllianceGroup, ManagedCorpGroup
 
 logger = logging.getLogger(__name__)
 

allianceauth/eveonline/autogroups/apps.py

@@ -1,9 +1,11 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class EveAutogroupsConfig(AppConfig):
     name = 'allianceauth.eveonline.autogroups'
     label = 'eve_autogroups'
+    verbose_name = _('EVE Online Autogroups')
 
     def ready(self):
-        pass
+        import allianceauth.eveonline.autogroups.signals