diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a63fe09..be852702 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ before_script: pre-commit-check: <<: *only-default stage: pre-commit - image: python:3.11-bullseye + image: python:3.11-bookworm # variables: # PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit # cache: @@ -53,7 +53,7 @@ secret_detection: test-3.10-core: <<: *only-default - image: python:3.10-bullseye + image: python:3.10-bookworm script: - tox -e py310-core artifacts: @@ -65,7 +65,7 @@ test-3.10-core: test-3.11-core: <<: *only-default - image: python:3.11-bullseye + image: python:3.11-bookworm script: - tox -e py311-core artifacts: @@ -77,7 +77,7 @@ test-3.11-core: test-3.12-core: <<: *only-default - image: python:3.12-bullseye + image: python:3.12-bookworm script: - tox -e py312-core artifacts: @@ -89,7 +89,7 @@ test-3.12-core: test-3.10-all: <<: *only-default - image: python:3.10-bullseye + image: python:3.10-bookworm script: - tox -e py310-all artifacts: @@ -101,7 +101,7 @@ test-3.10-all: test-3.11-all: <<: *only-default - image: python:3.11-bullseye + image: python:3.11-bookworm script: - tox -e py311-all artifacts: @@ -114,7 +114,7 @@ test-3.11-all: test-3.12-all: <<: *only-default - image: python:3.12-bullseye + image: python:3.12-bookworm script: - tox -e py312-all artifacts: @@ -126,7 +126,7 @@ test-3.12-all: build-test: stage: test - image: python:3.12-bullseye + image: python:3.12-bookworm before_script: - python -m pip install --upgrade pip @@ -145,13 +145,13 @@ build-test: test-docs: <<: *only-default - image: python:3.12-bullseye + image: python:3.12-bookworm script: - tox -e docs deploy_production: stage: deploy - image: python:3.12-bullseye + image: python:3.12-bookworm before_script: - python -m pip install --upgrade pip diff --git a/allianceauth/__init__.py b/allianceauth/__init__.py index ee05a338..4edd6674 100644 --- a/allianceauth/__init__.py +++ b/allianceauth/__init__.py @@ -5,7 +5,7 @@ manage online service access. # This will make sure the app is always imported when # Django starts so that shared_task will use this app. -__version__ = '4.1.0' +__version__ = '4.2.2' __title__ = 'Alliance Auth' __url__ = 'https://gitlab.com/allianceauth/allianceauth' NAME = f'{__title__} v{__version__}' diff --git a/allianceauth/analytics/tasks.py b/allianceauth/analytics/tasks.py index 02a812a7..cc9ef160 100644 --- a/allianceauth/analytics/tasks.py +++ b/allianceauth/analytics/tasks.py @@ -101,11 +101,38 @@ def analytics_daily_stats(): event_type='Stats') for appconfig in apps.get_app_configs(): - analytics_event(namespace='allianceauth.analytics', - task='send_extension_stats', - label=appconfig.label, - value=1, - event_type='Stats') + if appconfig.label in [ + "django_celery_beat", + "bootstrapform", + "messages", + "sessions", + "auth", + "staticfiles", + "users", + "addons", + "admin", + "humanize", + "contenttypes", + "sortedm2m", + "django_bootstrap5", + "tokens", + "authentication", + "services", + "framework", + "notifications" + "eveonline", + "navhelper", + "analytics", + "menu", + "theme" + ]: + pass + else: + analytics_event(namespace='allianceauth.analytics', + task='send_extension_stats', + label=appconfig.label, + value=1, + event_type='Stats') @shared_task() diff --git a/allianceauth/apps.py b/allianceauth/apps.py index 053f71f8..098f50ba 100644 --- a/allianceauth/apps.py +++ b/allianceauth/apps.py @@ -5,26 +5,5 @@ from django.core.checks import Warning, Error, register class AllianceAuthConfig(AppConfig): name = 'allianceauth' - -@register() -def check_settings(app_configs, **kwargs): - from django.conf import settings - - errors = [] - if hasattr(settings, "SITE_URL"): - if settings.SITE_URL[-1] == "/": - errors.append(Warning( - "'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth.")) - else: - errors.append(Error( - "No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.")) - if hasattr(settings, "CSRF_TRUSTED_ORIGINS"): - if hasattr(settings, "SITE_URL"): - if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS: - errors.append(Warning( - "'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.")) - else: - errors.append(Error( - "No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified")) - - return errors + def ready(self) -> None: + import allianceauth.checks # noqa diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html index af1ece0d..640f2691 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.html +++ b/allianceauth/authentication/templates/authentication/dashboard.html @@ -7,7 +7,7 @@ {% translate "Dashboard" %} {% endblock %} {% block content %} -
{% translate 'Your Server received an ESI error response code of ' %}?
{{ error_message }}
+{{ error_message }}