aa-structures 2.7.1__tar.gz → 2.8.0__tar.gz

{aa_structures-2.7.1 → aa_structures-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.7.1
+Version: 2.8.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
@@ -8,6 +8,7 @@ Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{aa_structures-2.7.1 → aa_structures-2.8.0}/pyproject.toml

@@ -13,6 +13,7 @@ classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",
     "Framework :: Django :: 4.0",
+    "Framework :: Django :: 4.2",
     "Intended Audience :: End Users/Desktop",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "2.7.1"
+__version__ = "2.8.0"
 __title__ = "Structures"

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/models/notifications.py

@@ -8,6 +8,7 @@ from typing import Optional, Tuple, Union
 import dhooks_lite
 import yaml
 from multiselectfield import MultiSelectField
+from multiselectfield.utils import get_max_length
 from requests.exceptions import HTTPError
 
 from django.contrib.auth.models import Group
@@ -67,6 +68,7 @@ class Webhook(WebhookBase):
 
     notification_types = MultiSelectField(
         choices=NotificationType.choices,
+        max_length=get_max_length(NotificationType.choices, None),
         default=NotificationType.webhook_defaults(),
         verbose_name=_("notification types"),
         help_text=_(

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/tests/models/test_notifications_1.py

@@ -592,7 +592,8 @@ class TestNotificationSendToWebhook(NoSocketsTestCase):
 @patch(MODULE_PATH + ".Webhook.send_message", spec=True)
 class TestNotificationSendMessage(NoSocketsTestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):  # Can not be setUpTestData due to conflict with redis client
+        super().setUpClass()
         load_eveuniverse()
         load_eve_entities()
         cls.owner = OwnerFactory(is_alliance_main=True)

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/tests/models/test_notifications_2.py

@@ -33,7 +33,8 @@ MODULE_PATH = "structures.models.notifications"
 @patch(MODULE_PATH + ".Webhook.send_message", spec=True)
 class TestStructureFuelAlerts(NoSocketsTestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):  # Can not be setUpTestData due to conflict with redis client
+        super().setUpClass()
         load_eveuniverse()
         load_eve_entities()
         cls.owner = OwnerFactory()

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/tests/test_admin.py

@@ -52,7 +52,8 @@ class MockRequest(object):
 
 class TestFuelNotificationConfigAdminView(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):
+        super().setUpClass()
         cls.defaults = {
             "is_enabled": True,
             "channel_ping_type": Webhook.PingType.HERE,
@@ -213,7 +214,8 @@ class TestFuelNotificationConfigAdminView(TestCase):
 
 class TestStructureFuelAlertAdmin(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):
+        super().setUpClass()
         cls.modeladmin = StructureFuelAlertConfigAdmin(
             model=FuelAlertConfig, admin_site=AdminSite()
         )
@@ -235,7 +237,8 @@ class TestStructureFuelAlertAdmin(TestCase):
 
 class TestNotificationAdmin(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):
+        super().setUpClass()
         cls.factory = RequestFactory()
         load_eveuniverse()
         cls.modeladmin = NotificationAdmin(model=Notification, admin_site=AdminSite())
@@ -355,7 +358,8 @@ class TestNotificationAdmin(TestCase):
 
 class TestOwnerAdmin(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):
+        super().setUpClass()
         cls.factory = RequestFactory()
         cls.modeladmin = OwnerAdmin(model=Owner, admin_site=AdminSite())
         load_eveuniverse()
@@ -454,7 +458,8 @@ class TestOwnerAdmin(TestCase):
 
 class TestStructureAdmin(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):
+        super().setUpClass()
         cls.factory = RequestFactory()
         load_eveuniverse()
         cls.modeladmin = StructureAdmin(model=Structure, admin_site=AdminSite())
@@ -609,7 +614,8 @@ class TestStructureAdmin(TestCase):
 
 class TestWebhookAdmin(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):
+        super().setUpClass()
         cls.modeladmin = WebhookAdmin(model=Webhook, admin_site=AdminSite())
         cls.user = SuperuserFactory()
 

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/tests/test_tasks.py

@@ -26,7 +26,8 @@ MODULE_PATH_MODELS_OWNERS = "structures.models.owners"
 @patch(MODULE_PATH + ".Webhook.send_queued_messages", spec=True)
 class TestSendMessagesForWebhook(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):  # Can not be setUpTestData due to conflict with redis client
+        super().setUpClass()
         cls.webhook = WebhookFactory()
 
     def test_normal(self, mock_send_queued_messages):

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/webhooks/models.py

@@ -7,6 +7,7 @@ from .core import DiscordWebhookMixin
 from .managers import WebhookBaseManager
 
 
+# TODO: Investigate if this can be changed to a dependency injection to use fakes
 class WebhookBase(DiscordWebhookMixin, models.Model):
     """Base model for a Webhook"""
 

{aa_structures-2.7.1 → aa_structures-2.8.0}/structures/webhooks/tests/test_core.py

@@ -33,7 +33,8 @@ class Webhook(core.DiscordWebhookMixin):
 @patch(MODULE_PATH + ".sleep", lambda _: None)
 class TestDiscordWebhookMixin(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):  # Can not be setUpTestData due to conflict with redis client
+        super().setUpClass()
         cls.webhook = WebhookFactory.build(name="Dummy 1", url="dummy-1-url")
 
     def setUp(self) -> None:
@@ -144,7 +145,8 @@ class TestDiscordWebhookMixin(TestCase):
 @patch(MODULE_PATH + ".dhooks_lite.Webhook.execute")
 class TestSendTestMessage(TestCase):
     @classmethod
-    def setUpTestData(cls):
+    def setUpClass(cls):  # Can not be setUpTestData due to conflict with redis client
+        super().setUpClass()
         cls.webhook = WebhookFactory(name="Dummy 1", url="dummy-1-url")
 
     def setUp(self) -> None: