aa-alumni 0.1.4a0__py3-none-any.whl → 0.2.0__py3-none-any.whl

{aa_alumni-0.1.4a0.dist-info → aa_alumni-0.2.0.dist-info}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Joel Falknau
+Copyright (c) 2021 Joel Falknau
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{aa_alumni-0.1.4a0.dist-info → aa_alumni-0.2.0.dist-info}/METADATA

@@ -1,14 +1,16 @@
 Metadata-Version: 2.1
-Name: aa-alumni
-Version: 0.1.4a0
+Name: aa_alumni
+Version: 0.2.0
 Summary: Integration with Alliance Auths State System, creates and maintains an Alumni State for past members of an Alliance and/or Corporation
-Home-page: https://gitlab.com/tactical-supremacy/aa-alumni
-Author: Joel Falknau
-Author-email: joel.falknau@gmail.com
-License: MIT
+Keywords: allianceauth,eveonline
+Author-email: Joel Falknau <joel.falknau@gmail.com>
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
+Classifier: Framework :: Celery
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -18,13 +20,15 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Python: ~=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: allianceauth (>=3.0.0)
+Requires-Dist: allianceauth>=3.0.0,<5.0.0
+Requires-Dist: django-solo>=2.0.0,<3.0.0
+Project-URL: Homepage, https://gitlab.com/tactical-supremacy/aa-alumni
+Project-URL: Source, https://gitlab.com/tactical-supremacy/aa-alumni
+Project-URL: Tracker, https://gitlab.com/tactical-supremacy/aa-alumni/-/issues
 
 # Alliance Auth - Alumni
 
@@ -35,13 +39,17 @@ Requires-Dist: allianceauth (>=3.0.0)
 ## Installation
 
 ### Step 1 - Prepare Auth
+
 Remove/Promote any state with a priority of `1`, Alumni is considered slightly better than the built in Guest State.
+
 ### Step 2 - Install from pip
-```bash
+
+```shell
 pip install aa-alumni
 ```
 
 ### Step 3 - Configure Auth settings
+
 Configure your Auth settings (`local.py`) as follows:
 
 - Add `'alumni'` to `INSTALLED_APPS`
@@ -49,7 +57,7 @@ Configure your Auth settings (`local.py`) as follows:
 
 ```python
 ## Settings for AA-Alumni
-# Market Orders
+# Tasks
 CELERYBEAT_SCHEDULE['alumni_run_alumni_check_all'] = {
     'task': 'alumni.tasks.run_alumni_check_all',
     'schedule': crontab(minute=0, hour=0, day_of_week=4),
@@ -62,18 +70,22 @@ CELERYBEAT_SCHEDULE['alumni_run_update_all_models'] = {
 
 ### Step 4 - Update AA's State system
 
-```bash
+```shell
 python myauth/manage.py alumni_state
 ```
 
 ### Step 5 - Maintain Alliance Auth
+
 - Run migrations `python manage.py migrate`
 - Gather your staticfiles `python manage.py collectstatic`
 - Restart your project `supervisorctl restart myauth:`
 
 ### Step 6 - Configure Further
+
 In the Admin interface, visit `alumni > config > add` or `<AUTH-URL>/admin/alumni/config/add/`
 Select the Alliances and/or Corporations for which characters with historical membership are Alumni
 
 ## Contributing
+
 Make sure you have signed the [License Agreement](https://developers.eveonline.com/resource/license-agreement) by logging in at <https://developers.eveonline.com> before submitting any pull requests. All bug fixes or features must not include extra superfluous formatting changes.
+

aa_alumni-0.2.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+alumni/__init__.py,sha256=ZJgYGwc1dwuqfSOB6cIFy4HdOI9wOkRyhQHe8lhKsNc,186
+alumni/admin.py,sha256=VUDXqxBX-Dw_3T4QGXDTtz-Ulgc_WkoCW54OXbd3a5o,737
+alumni/app_settings.py,sha256=SoV6HhuvBaHSAgBHD6MxNf74Qjdsi_fmB6aZU__Vwlw,172
+alumni/apps.py,sha256=JNO5V_uldj3Y2OEJL0h4u86LoPZr5UOhzkcTFZ6VeNI,239
+alumni/models.py,sha256=tgcy4FtHFZNyfCl_Rma3igPgxfaY433YG2CObBrsMe8,2206
+alumni/providers.py,sha256=g0i7nqSdnfScx-ZjByFZGoHw-ptNkiey5g_yycobSCQ,999
+alumni/signals.py,sha256=ZiWER0gs-0KCS6nWhCwE1_-iDXr9yrS7NSPBfLBDjak,789
+alumni/tasks.py,sha256=hXd340JHb3HM-ZVdMI4GHJDQ7C6mMrQcwVMYVU9MsR8,8058
+alumni/locale/en/LC_MESSAGES/django.po,sha256=doek11ISIJRXg-vClnCNxdlObAeUweAKs50jR5bAEVE,1249
+alumni/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alumni/management/commands/alumni_state.py,sha256=OyJKnkzk9eksk-vULSVBdGvMEhxZX_xa7eH5RXFjeJ8,759
+alumni/migrations/0001_initial.py,sha256=C8R2k4y5KvpTLU_etBQ0J3jkGYd3HAgevAekUZvzxDw,3283
+alumni/migrations/0002_auto_20211230_0147.py,sha256=p3sK1Ohdf6O20tDbMmuPJwC2vVFH-AR0kkXFy9H34_Y,626
+alumni/migrations/0003_alter_alumnisetup_options_and_more.py,sha256=JyXQqo9vR-hRx7CHsNpXLxZEjEijSBLW3zX7Zmw3Y50,1012
+alumni/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alumni/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aa_alumni-0.2.0.dist-info/LICENSE,sha256=6TxpZBZY7OLGLrJXe6vREu--u7CjCfW19u4oXW_uZKs,1069
+aa_alumni-0.2.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_alumni-0.2.0.dist-info/METADATA,sha256=lcQ9lHHulZDVqOxJwavmCg2OV_Rc02GbB_zs0WCcCWM,3262
+aa_alumni-0.2.0.dist-info/RECORD,,

{aa_alumni-0.1.4a0.dist-info → aa_alumni-0.2.0.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: flit 3.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

alumni/__init__.py

@@ -1 +1,5 @@
-__version__ = "0.1.4a"
+"""
+Integration with Alliance Auths State System, creates and maintains an Alumni State for past members of an Alliance and/or Corporation
+"""
+__version__ = "0.2.0"
+__title__ = "Alumni"

alumni/admin.py

@@ -8,6 +8,7 @@ from .models import (
 @admin.register(AlumniSetup)
 class AlumniSetupAdmin(admin.ModelAdmin):
     search_fields = ['alumni_corporations', ]
+    filter_horizontal = ["alumni_corporations", "alumni_alliances"]
 
 
 @admin.register(CorporationAllianceHistory)

alumni/app_settings.py

@@ -2,4 +2,4 @@ from django.conf import settings
 
 ALUMNI_STATE_NAME = getattr(settings, 'ALUMNI_STATE_NAME', "Alumni")
 
-ALUMNI_TASK_PRIORITY = getattr(settings, 'ALUMNI_TASK_PRIORITY', "7")
+ALUMNI_TASK_PRIORITY = getattr(settings, 'ALUMNI_TASK_PRIORITY', 7)

alumni/apps.py

@@ -1,5 +1,4 @@
 from django.apps import AppConfig
-from django.core.checks import register
 
 from . import __version__
 
@@ -8,8 +7,4 @@ class AlumniConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = "alumni"
     label = "alumni"
-    verbose_name = f"alumni v{__version__}"
-
-    def ready(self):
-        from alumni.checks import esi_endpoint_offline
-        register()(esi_endpoint_offline)
+    verbose_name = f"AA Alumni v{__version__}"

alumni/locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-05-11 18:13+1000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: alumni/models.py:14
+msgid ""
+"Characters with these Corps in their History will be given Alumni Status"
+msgstr ""
+
+#: alumni/models.py:18
+msgid ""
+"Characters with these Alliances in their History will be given Alumni Status"
+msgstr ""
+
+#: alumni/models.py:21 alumni/models.py:24 alumni/models.py:25
+msgid "Alumni Config"
+msgstr ""
+
+#: alumni/models.py:37 alumni/models.py:52
+msgid "True if the corporation has been deleted"
+msgstr ""
+
+#: alumni/models.py:39 alumni/models.py:54
+msgid ""
+"An incrementing ID that can be used to canonically establish order of "
+"records in cases where dates may be ambiguous"
+msgstr ""

alumni/migrations/0003_alter_alumnisetup_options_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.10 on 2024-05-11 08:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('alumni', '0002_auto_20211230_0147'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='alumnisetup',
+            options={'verbose_name': 'Alumni Config', 'verbose_name_plural': 'Alumni Config'},
+        ),
+        migrations.AlterField(
+            model_name='charactercorporationhistory',
+            name='record_id',
+            field=models.PositiveIntegerField(help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous'),
+        ),
+        migrations.AlterField(
+            model_name='corporationalliancehistory',
+            name='record_id',
+            field=models.PositiveIntegerField(help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous'),
+        ),
+    ]

alumni/models.py

@@ -1,31 +1,29 @@
-from django.core.exceptions import ValidationError
+from solo.models import SingletonModel
+
 from django.db import models
+from django.utils.translation import gettext as _
 
 from allianceauth.eveonline.models import (
     EveAllianceInfo, EveCharacter, EveCorporationInfo,
 )
 
 
-class AlumniSetup(models.Model):
+class AlumniSetup(SingletonModel):
     alumni_corporations = models.ManyToManyField(
         EveCorporationInfo,
         blank=True,
-        help_text="Characters with these Corps in their History will be given Alumni Status")
+        help_text=_("Characters with these Corps in their History will be given Alumni Status"))
     alumni_alliances = models.ManyToManyField(
         EveAllianceInfo,
         blank=True,
-        help_text="Characters with these Alliances in their History will be given Alumni Status")
+        help_text=_("Characters with these Alliances in their History will be given Alumni Status"))
 
-    def save(self, *args, **kwargs):
-        if not self.pk and AlumniSetup.objects.exists():
-            # Force a single object
-            raise ValidationError('There is can be only one \
-                                AlumniCorp instance')
-        self.pk = self.id = 1  # If this happens to be deleted and recreated, force it to be 1
-        return super().save(*args, **kwargs)
+    def __str__(self):
+        return _("Alumni Config")
 
     class Meta:
-        verbose_name_plural = "Alumni Config"
+        verbose_name = _("Alumni Config")
+        verbose_name_plural = _("Alumni Config")
 
 
 class CorporationAllianceHistory(models.Model):
@@ -37,9 +35,9 @@ class CorporationAllianceHistory(models.Model):
     alliance_id = models.PositiveIntegerField(blank=True, null=True, db_index=True)
     is_deleted = models.BooleanField(
         default=False,
-        help_text='True if the corporation has been deleted')
-    record_id = models.IntegerField(
-        help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous')
+        help_text=_("True if the corporation has been deleted"))
+    record_id = models.PositiveIntegerField(
+        help_text=_("An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous"))
     start_date = models.DateTimeField()
 
 
@@ -48,13 +46,11 @@ class CharacterCorporationHistory(models.Model):
         constraints = [
             models.UniqueConstraint(fields=['character', 'record_id'], name="CharacterCorporationRecord"),
         ]
-    character = models.ForeignKey(
-        EveCharacter,
-        on_delete=models.CASCADE)
+    character = models.ForeignKey(EveCharacter, on_delete=models.CASCADE)
     corporation_id = models.PositiveIntegerField()
     is_deleted = models.BooleanField(
         default=False,
-        help_text='True if the corporation has been deleted')
-    record_id = models.IntegerField(
-        help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous')
+        help_text=_("True if the corporation has been deleted"))
+    record_id = models.PositiveIntegerField(
+        help_text=_("An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous"))
     start_date = models.DateTimeField()

alumni/providers.py

@@ -1,6 +1,14 @@
-from esi.clients import esi_client_factory
+from typing import Dict
 
-from . import __version__
+from allianceauth import __version__ as aa__version__
+from allianceauth.services.hooks import get_extension_logger
+from esi.clients import EsiClientProvider
+
+from . import __version__ as a__version__
+
+logger = get_extension_logger(__name__)
+
+APP_INFO_TEXT = f"allianceauth v{aa__version__} & aa-alumni v{a__version__}"
 
 """
 Swagger spec operations:
@@ -8,16 +16,18 @@ get_corporations_corporation_id_alliancehistory
 get_characters_character_id_corporationhistory
 """
 
+esi = EsiClientProvider(app_info_text=APP_INFO_TEXT)
 
-class EsiResponseClient:
-    def __init__(self, token=None):
-        self._client = None
 
-    @property
-    def client(self):
-        if self._client is None:
-            self._client = esi_client_factory(app_info_text="AA Alumni v" + __version__,)
-        return self._client
+def get_corporations_corporation_id_alliancehistory(corporation_id: int) -> Dict:
+    result = esi.client.Corporation.get_corporations_corporation_id_alliancehistory(
+        corporation_id=corporation_id
+    ).results()
+    return result
 
 
-esi = EsiResponseClient()
+def get_characters_character_id_corporationhistory(character_id: int) -> Dict:
+    result = esi.client.Character.get_characters_character_id_corporationhistory(
+        character_id=character_id
+    ).results()
+    return result

alumni/tasks.py

@@ -10,7 +10,10 @@ from .app_settings import ALUMNI_STATE_NAME, ALUMNI_TASK_PRIORITY
 from .models import (
     AlumniSetup, CharacterCorporationHistory, CorporationAllianceHistory,
 )
-from .providers import esi
+from .providers import (
+    get_characters_character_id_corporationhistory,
+    get_corporations_corporation_id_alliancehistory,
+)
 
 logger = get_extension_logger(__name__)
 
@@ -50,7 +53,8 @@ def alumni_check_character(character_id: int) -> bool:
         alumni_state.member_characters.add(character)
         return True
 
-    char_corp_history = CharacterCorporationHistory.objects.filter(character=character)
+    char_corp_history = CharacterCorporationHistory.objects.filter(
+        character=character)
 
     for char_corp in char_corp_history:
         # print(alumni_setup.alumni_corporations.values_list('corporation_id', flat=True))
@@ -154,7 +158,8 @@ def update_all_models_followup():
 
     for char_corp_record in CharacterCorporationHistory.objects.values('corporation_id').distinct():
         update_corporationalliancehistory.apply_async(
-            args=[char_corp_record['corporation_id']], priority=ALUMNI_TASK_PRIORITY
+            args=[char_corp_record['corporation_id']],
+            priority=ALUMNI_TASK_PRIORITY
         )
 
 
@@ -166,14 +171,7 @@ def update_corporationalliancehistory(corporation_id: int):
     ----------
     corporation_id: int """
 
-    try:
-        data = esi.client.Corporation.get_corporations_corporation_id_alliancehistory(
-            corporation_id=corporation_id).result()
-    except Exception as e:
-        logger.error(e)
-        return
-
-    for dat in data:
+    for dat in get_corporations_corporation_id_alliancehistory(corporation_id):
         try:
             if dat['is_deleted'] == 'true':
                 deleted = True
@@ -199,20 +197,13 @@ def update_charactercorporationhistory(character_id: int):
     character_id: int
         Should match an existing EveCharacter model"""
 
-    try:
-        data = esi.client.Character.get_characters_character_id_corporationhistory(
-            character_id=character_id).result()
-    except Exception as e:
-        logger.error(e)
-        return
-
     try:
         character = EveCharacter.objects.get(character_id=character_id)
     except Exception as e:
         logger.error(e)
         return
 
-    for dat in data:
+    for dat in get_characters_character_id_corporationhistory(character_id):
         try:
             if dat['is_deleted'] == 'true':
                 deleted = True

aa_alumni-0.1.4a0.dist-info/RECORD

@@ -1,25 +0,0 @@
-alumni/__init__.py,sha256=SjNawyfReODX_p9pqO4JrmYJBlIecZXWUXejFcIuTAo,23
-alumni/admin.py,sha256=Tzt-wIT9so_HWTWMHEEiYcB0zuZTz8RazSolfdlYumw,669
-alumni/app_settings.py,sha256=fmhFSNdpH7ky2TTVI7JjHp_IUFUiD_fz0JmLqriwk5o,174
-alumni/apps.py,sha256=EtaFYJcRfLkbtUl_VjkiPPq-Ns9pDFPp5yodiZNB2WY,394
-alumni/checks.py,sha256=6eOPzclpVGul2On80oInagWaHSvVhRs4__i7LMy6zf0,363
-alumni/models.py,sha256=gFvdrMxJ5JIm7cYm8FCrFqKQ9AMIfH-guu3JixW0yns,2432
-alumni/providers.py,sha256=qpUmlDW8IKCJO0RXnJ-qZ1UZbj5cTvqjirAcyQLKfUg,506
-alumni/signals.py,sha256=ZiWER0gs-0KCS6nWhCwE1_-iDXr9yrS7NSPBfLBDjak,789
-alumni/tasks.py,sha256=r6VSHeFtn023DkZlhQA1bmbrd5clGsiQrmhMIqvAtLk,8240
-alumni/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alumni/management/commands/alumni_state.py,sha256=OyJKnkzk9eksk-vULSVBdGvMEhxZX_xa7eH5RXFjeJ8,759
-alumni/migrations/0001_initial.py,sha256=C8R2k4y5KvpTLU_etBQ0J3jkGYd3HAgevAekUZvzxDw,3283
-alumni/migrations/0002_auto_20211230_0147.py,sha256=p3sK1Ohdf6O20tDbMmuPJwC2vVFH-AR0kkXFy9H34_Y,626
-alumni/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alumni/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-testauth/__init__.py,sha256=Dy_rC-Y3pLicUCmjF3XJ6EvGmK0cH03KZRHmKYiRbqk,46
-testauth/celery.py,sha256=cFOpfaLxQzrnxUiPMhGp6iiVp57Mg8Z4qCbiA9oI6iY,612
-testauth/settingsAA3.py,sha256=G3sI5Sss3NfJe8mLIfXgqEI5eDfxBKGMGvDWUFaY26k,10988
-testauth/urls.py,sha256=20dkGVhioIL1PThFyk_a0ETcMVzNI2OfUGg3nvKE9EU,167
-testauth/wsgi.py,sha256=SpDyhXudlWKD64pUxlf4j3lSiJD9ZRbbIx9tPekVziI,397
-aa_alumni-0.1.4a0.dist-info/LICENSE,sha256=v_N-M2kGobYDwkxwc51OaXqrMaybHRz_UZigPPwMWlw,1069
-aa_alumni-0.1.4a0.dist-info/METADATA,sha256=qRGjEAvQOwc7jHHUluEwf1ln4DKiGq8T6vx2mgu_CAE,2943
-aa_alumni-0.1.4a0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-aa_alumni-0.1.4a0.dist-info/top_level.txt,sha256=T0Ozron6S-V_rgm5e3io0O1JFji3PtOtkWfeENAPKzs,16
-aa_alumni-0.1.4a0.dist-info/RECORD,,

aa_alumni-0.1.4a0.dist-info/top_level.txt

@@ -1,2 +0,0 @@
-alumni
-testauth

alumni/checks.py

@@ -1,9 +0,0 @@
-from django.core.checks import Info
-
-
-def esi_endpoint_offline(*args, **kwargs):
-    errors = []
-    errors.append(Info(
-        'Corp History Endpoint Offline',
-        hint='Alumni will be unable to update Character Corporation Histories until CCP restore this endpoint https://github.com/esi/esi-issues/blob/master/changelog.md#2023-01-09'))
-    return errors

testauth/__init__.py

@@ -1 +0,0 @@
-from .celery import app as celery_app  # noqa

testauth/celery.py

@@ -1,18 +0,0 @@
-import os
-
-from celery import Celery
-
-# set the default Django settings module for the 'celery' program.
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testauth.settings.local")
-
-from django.conf import settings  # noqa
-
-app = Celery("testauth")
-
-# Using a string here means the worker don't have to serialize
-# the configuration object to child processes.
-app.config_from_object("django.conf:settings")
-app.conf.ONCE = {"backend": "allianceauth.services.tasks.DjangoBackend", "settings": {}}
-
-# Load task modules from all registered Django app configs.
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)

testauth/settingsAA3.py

@@ -1,340 +0,0 @@
-"""
-DO NOT EDIT THIS FILE
-
-This settings file contains everything needed for Alliance Auth projects to function.
-It gets overwritten by the 'allianceauth update' command.
-If you wish to make changes, overload the setting in your project's settings file (local.py).
-"""
-
-import os
-
-from celery.schedules import crontab
-
-from django.contrib import messages
-
-INSTALLED_APPS = [
-    'allianceauth',  # needs to be on top of this list to support favicons in Django admin (see https://gitlab.com/allianceauth/allianceauth/-/issues/1301)
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.humanize',
-    'django_celery_beat',
-    'bootstrapform',
-    'sortedm2m',
-    'esi',
-    'allianceauth.authentication',
-    'allianceauth.services',
-    'allianceauth.eveonline',
-    'allianceauth.groupmanagement',
-    'allianceauth.notifications',
-    'allianceauth.thirdparty.navhelper',
-    'allianceauth.analytics',
-]
-
-SECRET_KEY = "wow I'm a really bad default secret key"
-
-# Celery configuration
-BROKER_URL = 'redis://localhost:6379/0'
-CELERYBEAT_SCHEDULER = "django_celery_beat.schedulers.DatabaseScheduler"
-CELERYBEAT_SCHEDULE = {
-    'esi_cleanup_callbackredirect': {
-        'task': 'esi.tasks.cleanup_callbackredirect',
-        'schedule': crontab(minute=0, hour='*/4'),
-    },
-    'esi_cleanup_token': {
-        'task': 'esi.tasks.cleanup_token',
-        'schedule': crontab(minute=0, hour=0),
-    },
-    'run_model_update': {
-        'task': 'allianceauth.eveonline.tasks.run_model_update',
-        'schedule': crontab(minute=0, hour="*/6"),
-    },
-    'check_all_character_ownership': {
-        'task': 'allianceauth.authentication.tasks.check_all_character_ownership',
-        'schedule': crontab(minute=0, hour='*/4'),
-    },
-    'analytics_daily_stats': {
-        'task': 'allianceauth.analytics.tasks.analytics_daily_stats',
-        'schedule': crontab(minute=0, hour=2),
-    }
-}
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-BASE_DIR = os.path.dirname(PROJECT_DIR)
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'allianceauth.analytics.middleware.AnalyticsMiddleware',
-]
-
-ROOT_URLCONF = 'allianceauth.urls'
-
-LOCALE_PATHS = (
-    os.path.join(BASE_DIR, 'locale/'),
-)
-
-LANGUAGES = (
-    ("en", "English"),
-    ("de", "German"),
-    ("es", "Spanish"),
-    ("zh-hans", "Chinese Simplified"),
-    ("ru", "Russian"),
-    ("ko", "Korean"),
-    ("fr", "French"),
-    ("ja", "Japanese"),
-    ("it", "Italian"),
-)
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(PROJECT_DIR, 'templates')],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-                'django.template.context_processors.i18n',
-                'django.template.context_processors.media',
-                'django.template.context_processors.static',
-                'django.template.context_processors.tz',
-                'allianceauth.context_processors.auth_settings',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'allianceauth.wsgi.application'
-
-# Password validation
-# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-AUTHENTICATION_BACKENDS = [
-    'allianceauth.authentication.backends.StateBackend',
-    'django.contrib.auth.backends.ModelBackend'
-]
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.10/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-LANGUAGE_COOKIE_AGE = 1209600
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.10/howto/static-files/
-STATIC_URL = '/static/'
-STATICFILES_DIRS = [
-    os.path.join(PROJECT_DIR, 'static'),
-]
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-
-# Bootstrap messaging css workaround
-MESSAGE_TAGS = {
-    messages.ERROR: 'danger error'
-}
-
-CACHES = {
-    "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": "redis://127.0.0.1:6379/1"  # change the 1 here to change the database used
-    }
-}
-
-
-SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
-
-DEBUG = True
-ALLOWED_HOSTS = ['*']
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': str(os.path.join(BASE_DIR, 'alliance_auth.sqlite3')),
-    },
-}
-
-SITE_NAME = 'Alliance Auth'
-
-LOGIN_URL = 'auth_login_user'  # view that handles login logic
-
-LOGIN_REDIRECT_URL = 'authentication:dashboard'  # default destination when logging in if no redirect specified
-LOGOUT_REDIRECT_URL = 'authentication:dashboard'  # destination after logging out
-# Both of these redirects accept values as per the django redirect shortcut
-# https://docs.djangoproject.com/en/1.11/topics/http/shortcuts/#redirect
-# - url names eg 'authentication:dashboard'
-# - relative urls eg '/dashboard'
-# - absolute urls eg 'http://example.com/dashboard'
-
-# scopes required on new tokens when logging in. Cannot be blank.
-LOGIN_TOKEN_SCOPES = ['publicData']
-
-# number of days email verification links are valid for
-ACCOUNT_ACTIVATION_DAYS = 1
-
-ESI_API_URL = 'https://esi.evetech.net/'
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': {
-            'format': "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s",
-            'datefmt': "%d/%b/%Y %H:%M:%S"
-        },
-        'simple': {
-            'format': '%(levelname)s %(message)s'
-        },
-    },
-    'handlers': {
-        'log_file': {
-            'level': 'INFO',  # edit this line to change logging level to file
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': os.path.join(BASE_DIR, 'allianceauth.log'),
-            'formatter': 'verbose',
-            'maxBytes': 1024 * 1024 * 5,  # edit this line to change max log file size
-            'backupCount': 5,  # edit this line to change number of log backups
-        },
-        'extension_file': {
-            'level': 'INFO',
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': os.path.join(BASE_DIR, 'extensions.log'),
-            'formatter': 'verbose',
-            'maxBytes': 1024 * 1024 * 5,  # edit this line to change max log file size
-            'backupCount': 5,  # edit this line to change number of log backups
-        },
-        'console': {
-            'level': 'DEBUG',  # edit this line to change logging level to console
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose',
-        },
-        'notifications': {  # creates notifications for users with logging_notifications permission
-            'level': 'ERROR',  # edit this line to change logging level to notifications
-            'class': 'allianceauth.notifications.handlers.NotificationHandler',
-            'formatter': 'verbose',
-        },
-    },
-    'loggers': {
-        'allianceauth': {
-            'handlers': ['log_file', 'console', 'notifications'],
-            'level': 'DEBUG',
-        },
-        'extensions': {
-            'handlers': ['extension_file', 'console'],
-            'level': 'DEBUG',
-        },
-        'django': {
-            'handlers': ['log_file', 'console'],
-            'level': 'ERROR',
-        },
-        'esi': {
-            'handlers': ['log_file', 'console'],
-            'level': 'DEBUG',
-        },
-    }
-}
-
-DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
-
-########################################################
-# local.py settings
-
-# Every setting in base.py can be overloaded by redefining it here.
-# from .base import *
-
-# These are required for Django to function properly. Don't touch.
-ROOT_URLCONF = "testauth.urls"
-WSGI_APPLICATION = "testauth.wsgi.application"
-SECRET_KEY = "t$@h+j#yqhmuy$x7$fkhytd&drajgfsb-6+j9pqn*vj0)gq&-2"
-
-# This is where css/images will be placed for your webserver to read
-STATIC_ROOT = "/var/www/testauth/static/"
-
-# Change this to change the name of the auth site displayed
-# in page titles and the site header.
-SITE_NAME = "testauth"
-
-# Change this to enable/disable debug mode, which displays
-# useful error messages but can leak sensitive data.
-DEBUG = False
-
-# Add any additional apps to this list.
-INSTALLED_APPS += [
-    "alumni",
-]
-
-# Enter credentials to use MySQL/MariaDB. Comment out to use sqlite3
-"""
-DATABASES['default'] = {
-    'ENGINE': 'django.db.backends.mysql',
-    'NAME': 'alliance_auth',
-    'USER': '',
-    'PASSWORD': '',
-    'HOST': '127.0.0.1',
-    'PORT': '3306',
-    'OPTIONS': {'charset': 'utf8mb4'},
-}
-"""
-
-# Register an application at https://developers.eveonline.com for Authentication
-# & API Access and fill out these settings. Be sure to set the callback URL
-# to https://example.com/sso/callback substituting your domain for example.com
-# Logging in to auth requires the publicData scope (can be overridden through the
-# LOGIN_TOKEN_SCOPES setting). Other apps may require more (see their docs).
-ESI_SSO_CLIENT_ID = "dummy"
-ESI_SSO_CLIENT_SECRET = "dummy"
-ESI_SSO_CALLBACK_URL = "http://localhost:8000"
-
-# By default emails are validated before new users can log in.
-# It's recommended to use a free service like SparkPost or Elastic Email to send email.
-# https://www.sparkpost.com/docs/integrations/django/
-# https://elasticemail.com/resources/settings/smtp-api/
-# Set the default from email to something like 'noreply@example.com'
-# Email validation can be turned off by uncommenting the line below. This
-# can break some services.
-REGISTRATION_VERIFY_EMAIL = False
-EMAIL_HOST = ""
-EMAIL_PORT = 587
-EMAIL_HOST_USER = ""
-EMAIL_HOST_PASSWORD = ""
-EMAIL_USE_TLS = True
-DEFAULT_FROM_EMAIL = ""
-
-#######################################
-# Add any custom settings below here. #
-#######################################

testauth/urls.py

@@ -1,10 +0,0 @@
-# Django
-from django.urls import include, path
-
-# Alliance Auth
-from allianceauth import urls
-
-urlpatterns = [
-    # Alliance Auth URLs
-    path("", include(urls)),
-]

testauth/wsgi.py

@@ -1,14 +0,0 @@
-"""
-WSGI config for testauth project.
-It exposes the WSGI callable as a module-level variable named ``application``.
-For more information on this file, see
-https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
-"""
-
-import os
-
-from django.core.wsgi import get_wsgi_application
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testauth.settings.local")
-
-application = get_wsgi_application()