Compare commits

...

49 Commits

Author SHA1 Message Date
Joel Falknau
826198e5a7
django.utils.timezone.utc alias is removed 2025-03-04 11:59:37 +10:00
Joel Falknau
cc8f53af12
version Bump 5.0.0a1 2025-03-03 15:24:03 +10:00
Joel Falknau
f134b17c66
thirdparty bundle telnetlib for python 3.13 2025-03-03 15:18:11 +10:00
Joel Falknau
4036b0272c
dont allow py313 tests to fail 2025-03-03 14:49:29 +10:00
Joel Falknau
33b3c5b36e
fix tests after precommit 2025-03-03 14:48:10 +10:00
Joel Falknau
9547826272
precommit 2025-03-03 14:15:39 +10:00
Joel Falknau
15fc38ccfd
Merge branch 'master' of gitlab.com:allianceauth/allianceauth into v5.x 2025-03-03 12:52:12 +10:00
Joel Falknau
d10562e9fc
remove more bs3 fallback remnants 2024-12-28 14:15:09 +10:00
Joel Falknau
168b023a72
u_id param not needed 2024-12-28 13:41:39 +10:00
Joel Falknau
9df76443b1
correct discourse user updater 2024-12-28 13:35:24 +10:00
Joel Falknau
5c07f75eb5
Merge branch 'v5.x' of gitlab.com:allianceauth/allianceauth into v5.x 2024-12-28 13:14:49 +10:00
Ariel Rin
d61a49f2d9 Use lts tag for mariadb docker 2024-12-19 02:36:46 +00:00
Joel Falknau
a3c6d5345b
These are warnings, id needs to be unique 2024-12-05 11:07:44 +10:00
Joel Falknau
5e836c4285
pre-commit fixes 2024-12-04 22:08:47 +10:00
Joel Falknau
dc0c1a2818
collapse docker compose to make discord less unhappy 2024-12-04 21:33:48 +10:00
Joel Falknau
eaba01ad97
remove checks that have expired and bump others 2024-12-04 21:33:20 +10:00
Joel Falknau
f4c024d199
pre-commit fixes 2024-12-04 21:32:54 +10:00
Joel Falknau
8f4daea14f
sphinx theme v3 is now stable 2024-12-04 21:32:28 +10:00
Joel Falknau
b95f393a4c
update pre-commit 2024-12-04 21:31:16 +10:00
Joel Falknau
757c6fa491
Drop BS3 templates 2024-09-16 11:59:35 +10:00
Joel Falknau
cc11761d8e
docker-compose version is deprecated 2024-09-16 11:47:10 +10:00
Joel Falknau
30bb855381
bump infra 2024-09-16 11:46:52 +10:00
Joel Falknau
4bda887234
Use Python 3.12 2024-09-16 11:45:56 +10:00
Joel Falknau
dd255664d4
Move to Mariadb 11.4 LTS 2024-09-16 11:45:33 +10:00
Joel Falknau
f54fc26a1c
BS 5.3.3 (for login page) 2024-09-16 11:24:07 +10:00
Joel Falknau
23259e919c
jqueryui 1.14 2024-09-16 11:22:34 +10:00
Joel Falknau
c9bee08a6e
moment.js 2.30.1 2024-09-16 11:21:36 +10:00
Joel Falknau
c0cc927788
Fontawesome 6.6 2024-09-16 11:21:19 +10:00
Joel Falknau
ae16a3de81
Datatables 2.x 2024-09-16 11:20:29 +10:00
Joel Falknau
c4cbaac454
Add Git Blame Ignore 2024-09-13 23:19:30 +10:00
Joel Falknau
a99315ea55
formatting storm 2024-09-13 23:10:37 +10:00
Joel Falknau
ec5cf08eef
update classifiers and dependencies 2024-09-13 23:09:12 +10:00
Ariel Rin
27cf74f507 Merge branch 'ruff' into 'v5.x'
Linting and Formatting changes for 5.x

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

6
.git-blame-ignore-revs Normal file
View File

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

1
.gitignore vendored
View File

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

View File

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

View File

@ -19,21 +19,28 @@ exclude: |
\.po|
\.mo|
swagger\.json|
static/(.*)/libs/
static/(.*)/libs/|
telnetlib\.py
)
repos:
# Code Upgrades
- repo: https://github.com/asottile/pyupgrade
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.9
hooks:
# Run the linter, and only the linter
- id: ruff
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.23.1
hooks:
- id: django-upgrade
args: [--target-version=5.1]
- repo: https://github.com/asottile/pyupgrade # Ruff doesnt get everything.
rev: v3.19.1
hooks:
- id: pyupgrade
args: [--py38-plus]
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.22.2
hooks:
- id: django-upgrade
args: [--target-version=4.2]
args: [--py310-plus]
# Formatting
- repo: https://github.com/pre-commit/pre-commit-hooks

View File

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

View File

@ -5,7 +5,7 @@ manage online service access.
# This will make sure the app is always imported when
# Django starts so that shared_task will use this app.
__version__ = '4.6.4'
__version__ = '5.0.0a1'
__title__ = 'Alliance Auth'
__url__ = 'https://gitlab.com/allianceauth/allianceauth'
NAME = f'{__title__} v{__version__}'

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
# Generated by Django 3.1.4 on 2020-12-30 08:53
from django.db import migrations
from django.core.exceptions import ObjectDoesNotExist
from django.db import migrations
def add_aa_team_token(apps, schema_editor):
@ -51,7 +51,7 @@ def remove_aa_team_token(apps, schema_editor):
# Have to define some code to remove this identifier
# In case of migration rollback?
Tokens = apps.get_model('analytics', 'AnalyticsTokens')
token = Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
class Migration(migrations.Migration):

View File

@ -1,8 +1,10 @@
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):
@ -15,7 +17,6 @@ class AnalyticsIdentifier(SingletonModel):
class Meta:
verbose_name = "Analytics Identifier"
class AnalyticsTokens(models.Model):
class Analytics_Type(models.TextChoices):
@ -27,3 +28,6 @@ class AnalyticsTokens(models.Model):
token = models.CharField(max_length=254, blank=False)
secret = models.CharField(max_length=254, blank=True)
send_stats = models.BooleanField(default=False)
def __str__(self) -> str:
return self.name

View File

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

View File

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

View File

@ -2,12 +2,9 @@ import requests_mock
from django.test.utils import override_settings
from allianceauth.analytics.tasks import (
analytics_event,
send_ga_tracking_celery_event)
from allianceauth.analytics.tasks import analytics_event, send_ga_tracking_celery_event
from allianceauth.utils.testing import NoSocketsTestCase
GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'

View File

@ -1,10 +1,9 @@
from django.apps import apps
from allianceauth.authentication.models import User
from esi.models import Token
from allianceauth.analytics.utils import install_stat_users, install_stat_tokens, install_stat_addons
from django.test.testcases import TestCase
from allianceauth.analytics.utils import install_stat_addons, install_stat_users
from allianceauth.authentication.models import User
def create_testdata():
User.objects.all().delete()

View File

@ -1,8 +1,11 @@
import os
from django.apps import apps
from allianceauth.authentication.models import User
from esi.models import Token
from allianceauth.authentication.models import User
def install_stat_users() -> int:
"""Count and Return the number of User accounts

View File

@ -1,43 +1,21 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import Group
from django.contrib.auth.models import Permission as BasePermission
from django.contrib.auth.models import User as BaseUser
from django.contrib.auth.models import Group, Permission as BasePermission, User as BaseUser
from django.db.models import Count, Q
from django.db.models.functions import Lower
from django.db.models.signals import (
m2m_changed,
post_delete,
post_save,
pre_delete,
pre_save
)
from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
from django.dispatch import receiver
from django.urls import reverse
from django.utils.html import format_html
from django.utils.text import slugify
from allianceauth.authentication.models import (
CharacterOwnership,
OwnershipRecord,
State,
UserProfile,
get_guest_state
)
from allianceauth.eveonline.models import (
EveAllianceInfo,
EveCharacter,
EveCorporationInfo,
EveFactionInfo
)
from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
from allianceauth.eveonline.tasks import update_character
from allianceauth.hooks import get_hooks
from allianceauth.services.hooks import ServicesHook
from .app_settings import (
AUTHENTICATION_ADMIN_USERS_MAX_CHARS,
AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
)
from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_CHARS, AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
from .forms import UserChangeForm, UserProfileForm
@ -132,10 +110,7 @@ def user_username(obj):
To be used for all user based admin lists
"""
link = reverse(
'admin:{}_{}_change'.format(
obj._meta.app_label,
type(obj).__name__.lower()
),
f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
args=(obj.pk,)
)
user_obj = obj.user if hasattr(obj, 'user') else obj
@ -548,7 +523,7 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
def get_readonly_fields(self, request, obj=None):
if obj and obj.pk:
return 'owner_hash', 'character'
return tuple()
return ()
@admin.register(OwnershipRecord)

View File

@ -25,7 +25,7 @@ def _clean_setting(
if not required_type:
required_type = type(default_value)
if min_value is None and required_type == int:
if min_value is None and required_type is int:
min_value = 0
if (hasattr(settings, name)

View File

@ -1,5 +1,5 @@
from django.apps import AppConfig
from django.core.checks import register, Tags
from django.core.checks import Tags, register
class AuthenticationConfig(AppConfig):

View File

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

View File

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

View File

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

View File

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

View File

@ -1,14 +1,11 @@
from django.urls import include
from django.contrib.auth.decorators import user_passes_test
from django.core.exceptions import PermissionDenied
from collections.abc import Callable, Iterable
from functools import wraps
from typing import Callable, Iterable, Optional
from django.urls import include
from django.contrib import messages
from django.contrib.auth.decorators import login_required, user_passes_test
from django.core.exceptions import PermissionDenied
from django.shortcuts import redirect
from django.urls import include
from django.utils.translation import gettext_lazy as _
@ -17,7 +14,7 @@ def user_has_main_character(user):
def decorate_url_patterns(
urls, decorator: Callable, excluded_views: Optional[Iterable] = None
urls, decorator: Callable, excluded_views: Iterable | None = None
):
"""Decorate views given in url patterns except when they are explicitly excluded.

View File

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

View File

@ -1,5 +1,6 @@
from django.urls import include, path, re_path
from allianceauth.authentication import views
from django.urls import include, re_path, path
urlpatterns = [
path('activate/complete/', views.activation_complete, name='registration_activation_complete'),

View File

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

View File

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

View File

@ -1,8 +1,8 @@
import logging
from django.conf import settings
from django.utils.deprecation import MiddlewareMixin
import logging
logger = logging.getLogger(__name__)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,11 +1,12 @@
# Generated by Django 1.10.5 on 2017-03-22 23:09
import allianceauth.authentication.models
import django.db.models.deletion
from django.conf import settings
from django.contrib.auth.hashers import make_password
from django.db import migrations, models
import allianceauth.authentication.models
def create_guest_state(apps, schema_editor):
State = apps.get_model('authentication', 'State')

View File

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

View File

@ -1,11 +1,11 @@
import logging
from django.contrib.auth.models import User, Permission
from django.contrib.auth.models import Permission, User
from django.db import models, transaction
from django.utils.translation import gettext_lazy as _
from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
from allianceauth.notifications import notify
from django.conf import settings
from .managers import CharacterOwnershipManager, StateManager
@ -60,8 +60,7 @@ def get_guest_state_pk():
class UserProfile(models.Model):
class Meta:
default_permissions = ('change',)
class Language(models.TextChoices):
"""
@ -108,10 +107,15 @@ class UserProfile(models.Model):
_("Theme"),
max_length=200,
blank=True,
null=True,
help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps"
)
class Meta:
default_permissions = ('change',)
def __str__(self) -> str:
return str(self.user)
def assign_state(self, state=None, commit=True):
if not state:
state = State.objects.get_for_user(self.user)
@ -122,7 +126,7 @@ class UserProfile(models.Model):
self.save(update_fields=['state'])
notify(
self.user,
_('State changed to: %s' % state),
_(f'State changed to: {state}'),
_('Your user\'s state is now: %(state)s')
% ({'state': state}),
'info'
@ -137,19 +141,18 @@ class UserProfile(models.Model):
sender=self.__class__, user=self.user, state=self.state
)
def __str__(self):
return str(self.user)
class CharacterOwnership(models.Model):
class Meta:
default_permissions = ('change', 'delete')
ordering = ['user', 'character__character_name']
character = models.OneToOneField(EveCharacter, on_delete=models.CASCADE, related_name='character_ownership')
owner_hash = models.CharField(max_length=28, unique=True)
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')
objects = CharacterOwnershipManager()
class Meta:
default_permissions = ('change', 'delete')
ordering = ['user', 'character__character_name']
def __str__(self):
return f"{self.user}: {self.character}"

View File

@ -1,19 +1,16 @@
import logging
from .models import (
CharacterOwnership,
UserProfile,
get_guest_state,
State,
OwnershipRecord)
from django.contrib.auth.models import User
from django.db.models import Q
from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
from django.dispatch import receiver, Signal
from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
from django.dispatch import Signal, receiver
from esi.models import Token
from allianceauth.eveonline.models import EveCharacter
from .models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
logger = logging.getLogger(__name__)
state_changed = Signal()
@ -108,8 +105,7 @@ def record_character_ownership(sender, instance, created, *args, **kwargs):
def validate_main_character(sender, instance, *args, **kwargs):
try:
if instance.user.profile.main_character == instance.character:
logger.info("Ownership of a main character {} has been revoked. Resetting {} main character.".format(
instance.character, instance.user))
logger.info(f"Ownership of a main character {instance.character} has been revoked. Resetting {instance.user} main character.")
# clear main character as user no longer owns them
instance.user.profile.main_character = None
instance.user.profile.save()

View File

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

View File

@ -2,7 +2,6 @@
import datetime as dt
import logging
from typing import List, Optional
from pytz import utc
from redis import Redis
@ -17,7 +16,7 @@ class EventSeries:
_ROOT_KEY = "ALLIANCEAUTH_EVENT_SERIES"
def __init__(self, key_id: str, redis: Optional[Redis] = None) -> None:
def __init__(self, key_id: str, redis: Redis | None = None) -> None:
self._redis = get_redis_client_or_stub() if not redis else redis
self._key_id = str(key_id)
self.clear()
@ -46,7 +45,7 @@ class EventSeries:
my_id = self._redis.incr(self._key_counter)
self._redis.zadd(self._key_sorted_set, {my_id: event_time.timestamp()})
def all(self) -> List[dt.datetime]:
def all(self) -> list[dt.datetime]:
"""List of all known events."""
return [
event[1]
@ -75,7 +74,7 @@ class EventSeries:
maximum = "+inf" if not latest else latest.timestamp()
return self._redis.zcount(self._key_sorted_set, min=minimum, max=maximum)
def first_event(self, earliest: dt.datetime = None) -> Optional[dt.datetime]:
def first_event(self, earliest: dt.datetime = None) -> dt.datetime | None:
"""Date/Time of first event. Returns `None` if series has no events.
Args:

View File

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

View File

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

View File

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

View File

@ -10,8 +10,8 @@ from allianceauth.authentication.task_statistics.counters import (
succeeded_tasks,
)
from allianceauth.authentication.task_statistics.signals import (
reset_counters,
is_enabled,
reset_counters,
)
from allianceauth.eveonline.tasks import update_character

View File

@ -1,9 +1,10 @@
import logging
from esi.errors import TokenExpiredError, TokenInvalidError, IncompleteResponseError
from esi.models import Token
from celery import shared_task
from esi.errors import IncompleteResponseError, TokenExpiredError, TokenInvalidError
from esi.models import Token
from allianceauth.authentication.models import CharacterOwnership
logger = logging.getLogger(__name__)
@ -22,8 +23,7 @@ def check_character_ownership(owner_hash):
continue
except (KeyError, IncompleteResponseError):
# We can't validate the hash hasn't changed but also can't assume it has. Abort for now.
logger.warning("Failed to validate owner hash of {} due to problems contacting SSO servers.".format(
tokens[0].character_name))
logger.warning(f"Failed to validate owner hash of {tokens[0].character_name} due to problems contacting SSO servers.")
break
if not t.character_owner_hash == old_hash:
@ -33,7 +33,7 @@ def check_character_ownership(owner_hash):
break
if not Token.objects.filter(character_owner_hash=owner_hash).exists():
logger.info('No tokens found with owner hash %s. Revoking ownership.' % owner_hash)
logger.info(f'No tokens found with owner hash {owner_hash}. Revoking ownership.')
CharacterOwnership.objects.filter(owner_hash=owner_hash).delete()

View File

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

View File

@ -1,12 +1,7 @@
from django.db.models.signals import (
m2m_changed,
post_save,
pre_delete,
pre_save
)
from django.urls import reverse
from unittest import mock
from django.urls import reverse
MODULE_PATH = 'allianceauth.authentication'
@ -17,9 +12,7 @@ def patch(target, *args, **kwargs):
def get_admin_change_view_url(obj: object) -> str:
"""returns URL to admin change view for given object"""
return reverse(
'admin:{}_{}_change'.format(
obj._meta.app_label, type(obj).__name__.lower()
),
f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
args=(obj.pk,)
)

View File

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

View File

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

View File

@ -1,4 +1,5 @@
from unittest.mock import Mock, patch
from django.test import TestCase
from .. import app_settings
@ -83,7 +84,7 @@ class TestSetAppSetting(TestCase):
self.assertEqual(result, 50)
@patch(MODULE_PATH + '.app_settings.settings')
def test_default_for_invalid_type_int(self, mock_settings):
def test_default_for_outofrange_int(self, mock_settings):
mock_settings.TEST_SETTING_DUMMY = 1000
result = app_settings._clean_setting(
'TEST_SETTING_DUMMY',
@ -96,7 +97,7 @@ class TestSetAppSetting(TestCase):
def test_default_is_none_needs_required_type(self, mock_settings):
mock_settings.TEST_SETTING_DUMMY = 'invalid type'
with self.assertRaises(ValueError):
result = app_settings._clean_setting(
app_settings._clean_setting(
'TEST_SETTING_DUMMY',
default_value=None
)

View File

@ -1,13 +1,13 @@
from django.contrib.auth.models import User, Group
from django.contrib.auth.models import Group, User
from django.test import TestCase
from esi.models import Token
from allianceauth.eveonline.models import EveCharacter
from allianceauth.tests.auth_utils import AuthUtils
from esi.models import Token
from ..backends import StateBackend
from ..models import CharacterOwnership, UserProfile, OwnershipRecord
from ..models import CharacterOwnership, OwnershipRecord, UserProfile
MODULE_PATH = 'allianceauth.authentication'

View File

@ -6,12 +6,11 @@ from django.contrib.auth.models import AnonymousUser
from django.http.response import HttpResponse
from django.test import TestCase
from django.test.client import RequestFactory
from django.urls import reverse, URLPattern
from django.urls import URLPattern, reverse
from allianceauth.eveonline.models import EveCharacter
from allianceauth.tests.auth_utils import AuthUtils
from ..decorators import decorate_url_patterns, main_character_required
from ..models import CharacterOwnership
@ -47,7 +46,7 @@ class DecoratorTestCase(TestCase):
@mock.patch(MODULE_PATH + '.decorators.messages')
def test_login_redirect(self, m):
setattr(self.request, 'user', AnonymousUser())
self.request.user = AnonymousUser()
response = self.dummy_view(self.request)
self.assertEqual(response.status_code, 302)
url = getattr(response, 'url', None)
@ -55,7 +54,7 @@ class DecoratorTestCase(TestCase):
@mock.patch(MODULE_PATH + '.decorators.messages')
def test_main_character_redirect(self, m):
setattr(self.request, 'user', self.no_main_user)
self.request.user = self.no_main_user
response = self.dummy_view(self.request)
self.assertEqual(response.status_code, 302)
url = getattr(response, 'url', None)
@ -63,7 +62,7 @@ class DecoratorTestCase(TestCase):
@mock.patch(MODULE_PATH + '.decorators.messages')
def test_successful_request(self, m):
setattr(self.request, 'user', self.main_user)
self.request.user = self.main_user
response = self.dummy_view(self.request)
self.assertEqual(response.status_code, 200)

View File

@ -1,10 +1,10 @@
from unittest import mock
from allianceauth.authentication.middleware import UserSettingsMiddleware
from unittest.mock import Mock
from django.http import HttpResponse
from django.http import HttpResponse
from django.test.testcases import TestCase
from allianceauth.authentication.middleware import UserSettingsMiddleware
class TestUserSettingsMiddlewareSaveLang(TestCase):
@ -39,7 +39,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
of a non-existent (anonymous) user
"""
self.request.user.is_anonymous = True
response = self.middleware.process_response(
self.middleware.process_response(
self.request,
self.response
)
@ -52,7 +52,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
does the middleware change a language not set in the DB
"""
self.request.user.profile.language = None
response = self.middleware.process_response(
self.middleware.process_response(
self.request,
self.response
)
@ -64,7 +64,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
"""
Tests the middleware will change a language setting
"""
response = self.middleware.process_response(
self.middleware.process_response(
self.request,
self.response
)
@ -158,7 +158,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
tests the middleware will set night_mode if not set
"""
self.request.session = {}
response = self.middleware.process_response(
self.middleware.process_response(
self.request,
self.response
)
@ -168,7 +168,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
"""
tests the middleware will set night_mode if set.
"""
response = self.middleware.process_response(
self.middleware.process_response(
self.request,
self.response
)

View File

@ -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

View File

@ -1,19 +1,10 @@
from django.db.models.signals import post_save
from django.test.testcases import TestCase
from allianceauth.authentication.models import User, UserProfile
from allianceauth.eveonline.models import (
EveCharacter,
EveCorporationInfo,
EveAllianceInfo
)
from django.db.models.signals import (
pre_save,
post_save,
pre_delete,
m2m_changed
)
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
from allianceauth.tests.auth_utils import AuthUtils
from django.test.testcases import TestCase
from unittest.mock import Mock
from . import patch

View File

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

View File

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

View File

@ -38,7 +38,6 @@ 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'),
]

View File

@ -1,11 +1,6 @@
import logging
import requests
from django_registration.backends.activation.views import (
REGISTRATION_SALT, ActivationView as BaseActivationView,
RegistrationView as BaseRegistrationView,
)
from django_registration.signals import user_registered
from django.conf import settings
from django.contrib import messages
@ -18,6 +13,12 @@ from django.shortcuts import redirect, render
from django.template.loader import render_to_string
from django.urls import reverse, reverse_lazy
from django.utils.translation import gettext_lazy as _
from django_registration.backends.activation.views import (
REGISTRATION_SALT,
ActivationView as BaseActivationView,
RegistrationView as BaseRegistrationView,
)
from django_registration.signals import user_registered
from esi.decorators import token_required
from esi.models import Token
@ -32,7 +33,7 @@ from .models import CharacterOwnership
if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
_has_auto_groups = True
from allianceauth.eveonline.autogroups.models import * # noqa: F401, F403
from allianceauth.eveonline.autogroups.models import * # noqa: F403
else:
_has_auto_groups = False
@ -87,7 +88,7 @@ def dashboard_esi_check(request):
@login_required
def dashboard(request):
_dash_items = list()
_dash_items = []
hooks = get_hooks('dashboard_hook')
items = [fn() for fn in hooks]
items.sort(key=lambda i: i.order)
@ -164,9 +165,7 @@ def main_character_change(request, token):
request.user.profile.save(update_fields=['main_character'])
messages.success(request, _('Changed main character to %s') % co.character)
logger.info(
'Changed user {user} main character to {char}'.format(
user=request.user, char=co.character
)
f'Changed user {request.user} main character to {co.character}'
)
return redirect("authentication:dashboard")
@ -176,10 +175,9 @@ def add_character(request, token):
if CharacterOwnership.objects.filter(character__character_id=token.character_id).filter(
owner_hash=token.character_owner_hash).filter(user=request.user).exists():
messages.success(request, _(
'Added %(name)s to your account.' % ({'name': token.character_name})))
f'Added {token.character_name} to your account.'))
else:
messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % (
{'name': token.character_name})))
messages.error(request, _(f'Failed to add {token.character_name} to your account: they already have an account.'))
return redirect('authentication:dashboard')
@ -294,7 +292,7 @@ class RegistrationView(BaseRegistrationView):
return redirect(settings.LOGIN_URL)
if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
# Keep the request so the user can be automagically logged in.
setattr(self, 'request', request)
self.request = request
return super().dispatch(request, *args, **kwargs)
def register(self, form):
@ -394,12 +392,3 @@ 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')

View File

@ -2,6 +2,7 @@
import os
import shutil
from optparse import OptionParser
from django.core.management import call_command
from django.core.management.commands.startproject import Command as BaseStartProject
@ -43,7 +44,7 @@ def create_project(parser, options, args):
# Call the command with extra context
call_command(StartProject(), *args, **command_options)
print(f"Success! {args[0]} has been created.") # noqa
print(f"Success! {args[0]} has been created.")
def update_settings(parser, options, args):
@ -62,7 +63,7 @@ def update_settings(parser, options, args):
# next check if given path is to the project, so the app is within it
settings_path = os.path.join(project_path, project_name, 'settings/base.py')
if not os.path.exists(settings_path):
parser.error("Unable to locate the Alliance Auth project at %s" % project_path)
parser.error(f"Unable to locate the Alliance Auth project at {project_path}")
# first find the path to the Alliance Auth template settings
import allianceauth

View File

@ -2,16 +2,18 @@
Django system checks for Alliance Auth
"""
from typing import List
from django import db
from django.core.checks import CheckMessage, Error, register, Warning
from allianceauth.utils.cache import get_redis_client
from django.utils import timezone
from packaging.version import InvalidVersion, Version as Pep440Version
from celery import current_app
from django.conf import settings
from datetime import datetime, timezone
from sqlite3.dbapi2 import sqlite_version_info
from celery import current_app
from packaging.version import InvalidVersion, Version as Pep440Version
from django import db
from django.conf import settings
from django.core.checks import CheckMessage, Error, Warning, register
from allianceauth.utils.cache import get_redis_client
"""
A = System Packages
B = Configuration
@ -19,7 +21,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
@ -31,7 +33,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"):
@ -109,7 +111,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
@ -123,7 +125,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"])
@ -135,8 +137,8 @@ def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
if (
redis_version.major == 7
and redis_version.minor == 2
and timezone.now()
> timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
and datetime.now(timezone.utc)
> datetime(year=2025, month=8, day=31, tzinfo=timezone.utc)
):
errors.append(
Error(
@ -174,7 +176,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
@ -188,7 +190,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":
@ -203,7 +205,7 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
# MySQL 8
if mysql_version.major == 8:
if mysql_version.minor == 4 and timezone.now() > timezone.datetime(
if mysql_version.minor == 4 and datetime.now(timezone.utc) > datetime(
year=2032, month=4, day=30, tzinfo=timezone.utc
):
errors.append(
@ -213,7 +215,8 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
id="allianceauth.checks.A004",
)
)
elif mysql_version.minor == 3:
# Demote versions down here once EOL
elif mysql_version.minor in [1, 2, 3]:
errors.append(
Warning(
msg=f"MySQL {mysql_version.public} Non LTS",
@ -221,23 +224,7 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
id="allianceauth.checks.A005",
)
)
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(
elif mysql_version.minor == 0 and datetime.now(timezone.utc) > datetime(
year=2026, month=4, day=30, tzinfo=timezone.utc
):
errors.append(
@ -263,21 +250,14 @@ def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
@register()
def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]: # noqa: C901
"""
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
@ -293,7 +273,7 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
# MariaDB 11
if mariadb_version.major == 11:
if mariadb_version.minor == 4 and timezone.now() > timezone.datetime(
if mariadb_version.minor == 4 and datetime.now(timezone.utc) > datetime(
year=2029, month=5, day=19, tzinfo=timezone.utc
):
errors.append(
@ -303,46 +283,8 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
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, 3]:
elif mariadb_version.minor in [0, 1, 2, 3, 5, 6]:
errors.append(
Error(
msg=f"MariaDB {mariadb_version.public} EOL",
@ -353,7 +295,7 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
# MariaDB 10
elif mariadb_version.major == 10:
if mariadb_version.minor == 11 and timezone.now() > timezone.datetime(
if mariadb_version.minor == 11 and datetime.now(timezone.utc) > datetime(
year=2028, month=2, day=10, tzinfo=timezone.utc
):
errors.append(
@ -363,7 +305,7 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
id="allianceauth.checks.A014",
)
)
elif mariadb_version.minor == 6 and timezone.now() > timezone.datetime(
elif mariadb_version.minor == 6 and datetime.now(timezone.utc) > datetime(
year=2026, month=7, day=6, tzinfo=timezone.utc
):
errors.append(
@ -373,7 +315,7 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
id="allianceauth.checks.A0015",
)
)
elif mariadb_version.minor == 5 and timezone.now() > timezone.datetime(
elif mariadb_version.minor == 5 and datetime.now(timezone.utc) > datetime(
year=2025, month=6, day=24, tzinfo=timezone.utc
):
errors.append(
@ -397,7 +339,7 @@ def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
@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
@ -409,7 +351,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":
@ -434,7 +376,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
@ -446,7 +388,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":
@ -496,7 +438,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
@ -508,7 +450,7 @@ def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
:rtype:
"""
errors: List[CheckMessage] = []
errors: list[CheckMessage] = []
try:
if current_app.conf.broker_transport_options != {

View File

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

View File

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

View File

@ -1,8 +1,9 @@
from allianceauth.menu.hooks import MenuItemHook
from allianceauth.services.hooks import UrlHook
from django.utils.translation import gettext_lazy as _
from allianceauth import hooks
from allianceauth.corputils import urls
from allianceauth.menu.hooks import MenuItemHook
from allianceauth.services.hooks import UrlHook
class CorpStats(MenuItemHook):

View File

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

View File

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

View File

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

View File

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

View File

@ -1,15 +1,17 @@
import logging
import os
from allianceauth.authentication.models import CharacterOwnership, UserProfile
from bravado.exception import HTTPForbidden
from django.db import models
from esi.errors import TokenError
from esi.models import Token
from allianceauth.eveonline.models import EveCorporationInfo, EveCharacter, EveAllianceInfo
from allianceauth.notifications import notify
from allianceauth.authentication.models import CharacterOwnership, UserProfile
from allianceauth.corputils.managers import CorpStatsManager
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
from allianceauth.notifications import notify
SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
"""
@ -31,6 +33,7 @@ class CorpStats(models.Model):
corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE)
last_update = models.DateTimeField(auto_now=True)
objects = CorpStatsManager()
class Meta:
permissions = (
('view_corp_corpstats', 'Can view corp stats of their corporation.'),
@ -40,7 +43,7 @@ class CorpStats(models.Model):
verbose_name = "corp stats"
verbose_name_plural = "corp stats"
objects = CorpStatsManager()
def __str__(self):
return f"{self.__class__.__name__} for {self.corp}"
@ -76,21 +79,21 @@ class CorpStats(models.Model):
logger.warning(f"{self} failed to update: {e}")
if self.token.user:
notify(
self.token.user, "%s failed to update with your ESI token." % self,
self.token.user, f"{self} failed to update with your ESI token.",
message="Your token has expired or is no longer valid. Please add a new one to create a new CorpStats.",
level="error")
self.delete()
except HTTPForbidden as e:
logger.warning(f"{self} failed to update: {e}")
if self.token.user:
notify(self.token.user, "%s failed to update with your ESI token." % self, message=f"{e.status_code}: {e.message}", level="error")
notify(self.token.user, f"{self} failed to update with your ESI token.", message=f"{e.status_code}: {e.message}", level="error")
self.delete()
except AssertionError:
logger.warning("%s token character no longer in corp." % self)
logger.warning(f"{self} token character no longer in corp.")
if self.token.user:
notify(
self.token.user, "%s cannot update with your ESI token." % self,
message="%s cannot update with your ESI token as you have left corp." % self, level="error")
self.token.user, f"{self} cannot update with your ESI token.",
message=f"{self} cannot update with your ESI token as you have left corp.", level="error")
self.delete()
@property

View File

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

View File

@ -1,14 +1,18 @@
from unittest import mock
from django.test import TestCase
from allianceauth.tests.auth_utils import AuthUtils
from .models import CorpStats, CorpMember
from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo, EveCharacter
from esi.models import Token
from esi.errors import TokenError
from bravado.exception import HTTPForbidden
from django.contrib.auth.models import Permission
from django.test import TestCase
from esi.errors import TokenError
from esi.models import Token
from allianceauth.authentication.models import CharacterOwnership
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
from allianceauth.tests.auth_utils import AuthUtils
from .models import CorpMember, CorpStats
class CorpStatsManagerTestCase(TestCase):

View File

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

View File

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

View File

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

View File

@ -1,7 +1,9 @@
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:

View File

@ -1,12 +1,10 @@
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
@ -28,7 +26,7 @@ class OffsetDatabaseScheduler(DatabaseScheduler):
s = {}
try:
cron_offset = CronOffset.get_solo()
cron_offset = CronOffset.get_solo() # noqa: F841
except (OperationalError, ProgrammingError, ObjectDoesNotExist) as exc:
# This is just incase we haven't migrated yet or something
logger.warning(

View File

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

View File

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

View File

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

View File

@ -3,14 +3,15 @@ Admin classes for custom_css app
"""
# Django
from django.contrib import admin
# Django Solos
from solo.admin import SingletonModelAdmin
from django.contrib import admin
from allianceauth.custom_css.forms import CustomCSSAdminForm
# Alliance Auth Custom CSS
from allianceauth.custom_css.models import CustomCSS
from allianceauth.custom_css.forms import CustomCSSAdminForm
@admin.register(CustomCSS)

View File

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

View File

@ -21,7 +21,6 @@ class CustomCSS(SingletonModel):
css = models.TextField(
blank=True,
null=True,
verbose_name=_("Your custom CSS"),
help_text=_("This CSS will be added to the site after the default CSS."),
)

View File

@ -3,7 +3,7 @@ Custom template tags for custom_css app
"""
# Alliance Auth Custom CSS
from allianceauth.custom_css.models import CustomCSS
from pathlib import Path
# Django
from django.conf import settings
@ -11,7 +11,7 @@ from django.template.defaulttags import register
from django.templatetags.static import static
from django.utils.safestring import mark_safe
from pathlib import Path
from allianceauth.custom_css.models import CustomCSS
@register.simple_tag

View File

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

View File

@ -1,12 +1,9 @@
from django import forms
from django.contrib import admin
from django.core.exceptions import ObjectDoesNotExist
from .providers import ObjectNotFound
from .models import EveAllianceInfo
from .models import EveCharacter
from .models import EveCorporationInfo
from .models import EveFactionInfo
from .models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
from .providers import ObjectNotFound
class EveEntityExistsError(forms.ValidationError):
@ -52,8 +49,8 @@ class EveFactionForm(EveEntityForm):
def clean_id(self):
try:
assert self.Meta.model.provider.get_faction(self.cleaned_data['id'])
except (AssertionError, ObjectNotFound):
raise EveEntityNotFoundError('faction', self.cleaned_data['id'])
except (AssertionError, ObjectNotFound) as e:
raise EveEntityNotFoundError('faction', self.cleaned_data['id']) from e
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']
@ -73,8 +70,8 @@ class EveCharacterForm(EveEntityForm):
def clean_id(self):
try:
assert self.Meta.model.provider.get_character(self.cleaned_data['id'])
except (AssertionError, ObjectNotFound):
raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id'])
except (AssertionError, ObjectNotFound) as e:
raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id']) from e
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']
@ -93,8 +90,8 @@ class EveCorporationForm(EveEntityForm):
def clean_id(self):
try:
assert self.Meta.model.provider.get_corporation(self.cleaned_data['id'])
except (AssertionError, ObjectNotFound):
raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id'])
except (AssertionError, ObjectNotFound) as e:
raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id']) from e
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']
@ -113,8 +110,8 @@ class EveAllianceForm(EveEntityForm):
def clean_id(self):
try:
assert self.Meta.model.provider.get_alliance(self.cleaned_data['id'])
except (AssertionError, ObjectNotFound):
raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id'])
except (AssertionError, ObjectNotFound) as e:
raise EveEntityNotFoundError(self.entity_type_name, self.cleaned_data['id']) from e
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']

View File

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

View File

@ -6,4 +6,4 @@ class EveAutogroupsConfig(AppConfig):
label = 'eve_autogroups'
def ready(self):
import allianceauth.eveonline.autogroups.signals
pass

View File

@ -1,7 +1,7 @@
# Generated by Django 1.11.6 on 2017-12-23 04:30
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):

View File

@ -1,10 +1,11 @@
import logging
from django.db import models, transaction
from django.contrib.auth.models import Group, User
from django.core.exceptions import ObjectDoesNotExist
from django.db import models, transaction
from allianceauth.authentication.models import State
from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo
from allianceauth.eveonline.models import EveAllianceInfo, EveCorporationInfo
logger = logging.getLogger(__name__)
@ -80,15 +81,15 @@ class AutogroupsConfig(models.Model):
objects = AutogroupsConfigManager()
def __str__(self):
return 'States: ' + (' '.join(list(self.states.all().values_list('name', flat=True))) if self.pk else str(None))
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def __repr__(self):
return self.__class__.__name__
def __str__(self):
return 'States: ' + (' '.join(list(self.states.all().values_list('name', flat=True))) if self.pk else str(None))
def update_all_states_group_membership(self):
list(map(self.update_group_membership_for_state, self.states.all()))
@ -235,7 +236,7 @@ class ManagedGroup(models.Model):
abstract = True
def __str__(self):
return "Managed Group: %s" % self.group.name
return f"Managed Group: {self.group.name}"
class ManagedCorpGroup(ManagedGroup):
corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE)

View File

@ -1,7 +1,9 @@
import logging
from django.db.models.signals import m2m_changed, post_save, pre_delete, pre_save
from django.dispatch import receiver
from django.db.models.signals import pre_save, post_save, pre_delete, m2m_changed
from allianceauth.authentication.models import UserProfile, State
from allianceauth.authentication.models import State, UserProfile
from allianceauth.eveonline.models import EveCharacter
from .models import AutogroupsConfig

View File

@ -1,7 +1,10 @@
from unittest import mock
from django.db.models.signals import pre_save, post_save, pre_delete, m2m_changed
from django.db.models.signals import m2m_changed, post_save, pre_delete, pre_save
from allianceauth.authentication.models import UserProfile
from allianceauth.authentication.signals import reassess_on_profile_save
from .. import signals
from ..models import AutogroupsConfig

View File

@ -1,4 +1,5 @@
from django.test import TestCase
from allianceauth.tests.auth_utils import AuthUtils
from ..models import AutogroupsConfig

View File

@ -1,15 +1,11 @@
from django.test import TestCase
from django.contrib.auth.models import Group
from django.db import transaction
from django.test import TestCase
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
from allianceauth.tests.auth_utils import AuthUtils
from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo
from ..models import AutogroupsConfig, get_users_for_state
from . import patch, connect_signals, disconnect_signals
from . import connect_signals, disconnect_signals, patch
class AutogroupsConfigTestCase(TestCase):

View File

@ -1,13 +1,11 @@
from django.test import TestCase
from django.contrib.auth.models import User
from django.test import TestCase
from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
from allianceauth.tests.auth_utils import AuthUtils
from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo
from ..models import AutogroupsConfig
from . import patch, disconnect_signals, connect_signals
from . import connect_signals, disconnect_signals, patch
class SignalsTestCase(TestCase):

View File

@ -1,14 +1,8 @@
# this module generates profile URLs for dotlan
from urllib.parse import urljoin, quote
from . import (
_ESI_CATEGORY_ALLIANCE,
_ESI_CATEGORY_CORPORATION,
_ESI_CATEGORY_REGION,
_ESI_CATEGORY_SOLARSYSTEM
)
from urllib.parse import quote, urljoin
from . import _ESI_CATEGORY_ALLIANCE, _ESI_CATEGORY_CORPORATION, _ESI_CATEGORY_REGION, _ESI_CATEGORY_SOLARSYSTEM
_BASE_URL = 'https://evemaps.dotlan.net'

View File

@ -1,10 +1,4 @@
from . import (
_ESI_CATEGORY_ALLIANCE,
_ESI_CATEGORY_CHARACTER,
_ESI_CATEGORY_CORPORATION,
_ESI_CATEGORY_INVENTORYTYPE
)
from . import _ESI_CATEGORY_ALLIANCE, _ESI_CATEGORY_CHARACTER, _ESI_CATEGORY_CORPORATION, _ESI_CATEGORY_INVENTORYTYPE
_EVE_IMAGE_SERVER_URL = 'https://images.evetech.net'
_DEFAULT_IMAGE_SIZE = 32
@ -70,10 +64,7 @@ def _eve_entity_image_url(
if variant:
if variant not in categories[category]['variants']:
raise ValueError('Invalid variant {} for category {}'.format(
variant,
category
))
raise ValueError(f'Invalid variant {variant} for category {category}')
else:
variant = categories[category]['variants'][0]
@ -81,13 +72,7 @@ def _eve_entity_image_url(
raise ValueError(f'Invalid tenant {tenant}')
# compose result URL
result = '{}/{}/{}/{}?size={}'.format(
_EVE_IMAGE_SERVER_URL,
endpoint,
entity_id,
variant,
size
)
result = f'{_EVE_IMAGE_SERVER_URL}/{endpoint}/{entity_id}/{variant}?size={size}'
if tenant:
result += f'&tenant={tenant}'

View File

@ -4,11 +4,10 @@ from urllib.parse import urljoin
from . import (
_ESI_CATEGORY_ALLIANCE,
_ESI_CATEGORY_CORPORATION,
_ESI_CATEGORY_CHARACTER,
_ESI_CATEGORY_CORPORATION,
)
_BASE_URL = 'https://evewho.com'

Some files were not shown because too many files have changed in this diff Show More