aa-structures 2.7.1__py3-none-any.whl → 2.8.0__py3-none-any.whl

{aa_structures-2.7.1.dist-info → aa_structures-2.8.0.dist-info}/METADATA

@@ -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.dist-info → aa_structures-2.8.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-structures/__init__.py,sha256=Xmo3h-rujz5j5wH5VjIjqqQXma0xMzjMGrIeW_2YDj0,203
+structures/__init__.py,sha256=PFHURRAAwRO2isL71Yh4tt5zh27lozWI4fTy0d3LUYI,203
 structures/admin.py,sha256=2i08sj8vIOaSWq3sT_lHJi9YpWKtMtrL4Pg2V-Ly7OM,38634
 structures/app_settings.py,sha256=nNERL_qmuaa8EkzvT3rzVD8KhKeajS0fRaTPK4suArM,6267
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
@@ -59,7 +59,7 @@ structures/migrations/0004_improve_localization.py,sha256=R29j2Ki9I_yOvEQTxEu_zM
 structures/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/models/__init__.py,sha256=Da0-Z4BtsZ_mlnI6XtyvoE0UtTuOA0psGCuVhVPVKrM,916
 structures/models/eveuniverse.py,sha256=CifvydjKeci7bS20RYdkcn-J9YUUdrUwt6tI4EvPln4,2214
-structures/models/notifications.py,sha256=GCNnV7xeNfzgEQzB_6BBAyhzL2YJQMekkQ9WPBGFdQY,35052
+structures/models/notifications.py,sha256=3pwkZXW_tMalcanSzJWKsR3R-FhDCZasEqnC_TSNUMA,35169
 structures/models/owners.py,sha256=ryePMT-91krq2XLxIINFFGNhCj4vef-zyrwzwF26Pjw,53885
 structures/models/structures_1.py,sha256=e1sI-2zMSKcPi2PyYA--fcc8rn-yQwODzlUHKjeWgLI,29778
 structures/models/structures_2.py,sha256=g5Pct5jNmZC-n7fnpLs5UyiP9JLrGdI1vjYucHTV_wQ,10371
@@ -155,11 +155,11 @@ structures/templates/structures/templatetags/list_title.html,sha256=C2NWwo27TGfG
 structures/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/templatetags/structures.py,sha256=vSt5AnfYuo11q1SxiskT4oshSMsZ9ZgM0nYpYiMl8bA,1637
 structures/tests/__init__.py,sha256=9MrJzKr8DdsQY3-79v188pTpwqT4TDQ46vKnBJAGqic,75
-structures/tests/test_admin.py,sha256=lh9JXpJTQI9oBmn7wJOSmxJJ4lUIFLXlbuVkA4tjRm8,24177
+structures/tests/test_admin.py,sha256=_kV4giMVn-Pp77er0V5Pu10eBBohzT_oEdnl6D6q5bM,24333
 structures/tests/test_helpers.py,sha256=vYjUXWFcFzavbiRzQgq0Tcvix7AuCoe-BxVVS-BToM8,4291
 structures/tests/test_managers_1.py,sha256=mCOZLGLhHWPIEObdy194_VgkB6pdshhu4SNOPeYFwOM,34339
 structures/tests/test_managers_2.py,sha256=2jAkjVBu4CA7irFRp3oqPJneJbMON1ixznS4wZXGOTk,2916
-structures/tests/test_tasks.py,sha256=EQcbUwzgEl4E_u8se41wqVMsB0UgDuv_m6bipx0iddI,17025
+structures/tests/test_tasks.py,sha256=1gGG9Nm4ofV4YBjjgt7OT35vuh1vU9ri24NaBul5lqY,17113
 structures/tests/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/core/test_notification_structuretimers.py,sha256=ByE9pH2MuuEr-RcelzqCsvHqGxFWsCDng1fGx2NMb4Y,10827
 structures/tests/core/test_notification_types.py,sha256=WNJGXoxO3LbgxPgCH416IJElREWFBtwx5pw8IulsmYo,9881
@@ -175,8 +175,8 @@ structures/tests/integration/test_tasks.py,sha256=6CxJ0lmRWr_Li-8egLrZp1hvlB6k6m
 structures/tests/integration/test_views.py,sha256=2X_Hg5zJVYI0IZGwgsi-2QzjNlBn30pI51vvifmEYEI,4253
 structures/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/models/test_eveuniverse.py,sha256=kAWiNtWfalrrx_vz_hcDls1wtNHYrGYkctilu2Nw9ck,1597
-structures/tests/models/test_notifications_1.py,sha256=6Hb4vDZlSx-c8p2JytpuhHjdLap59tffOcfbgnZjKh0,30410
-structures/tests/models/test_notifications_2.py,sha256=gY8pue0_vgYK88Nq338suOpRHwcHghmEBsH6h0NAP9g,31849
+structures/tests/models/test_notifications_1.py,sha256=j1k-r23XPhFR5UxWpXCphGFKOOip74hZvvCjukNHcMQ,30498
+structures/tests/models/test_notifications_2.py,sha256=tgkcxKmmomDs3gE7jzEdt_w9wS-Sz0QkH6b1CiSQTZA,31937
 structures/tests/models/test_notifications_3.py,sha256=WaJKtlfV05-djV8F-R44jWRFu1dpT3hP9rIEpQ_gNO0,7179
 structures/tests/models/test_notifications_discord.py,sha256=XUCrgPQATEHEo2BicbioRdBNT6VoibLcK1U9CoRK3yI,5521
 structures/tests/models/test_owners_1.py,sha256=dOnsxXbRQeExOtGY5jbNVvT7QBdKZh3YWFxwE3VXieU,21692
@@ -211,11 +211,11 @@ structures/views/structures.py,sha256=XtQxYySOPqO9klPgF1o57pCejuo22EdU00h5LAdEVM
 structures/webhooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/core.py,sha256=mP25MbQG8Yv2YayDFcR6x2V30eqXhR2q5u4SRefblf4,6573
 structures/webhooks/managers.py,sha256=L3G3AmsyDeif_lfpWshmAxQ61UGJ9w8i9lZaF2jbOtQ,1117
-structures/webhooks/models.py,sha256=RXLFMSnTyC7hYAoxhD3BmJivaQtVE0-pXd-BG_MdnBw,1985
+structures/webhooks/models.py,sha256=kUkt9rnRQIJIrU9Bjcs34rvkb-TMbUubHdn-kny08kI,2067
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-structures/webhooks/tests/test_core.py,sha256=fE7p5iJ4EViR6WulHhFPSeSoNuwodxdJONeHquoSDhM,6586
+structures/webhooks/tests/test_core.py,sha256=4NcEAQgK2KhQkFOxYh2ad0S-qUWh1DNGDmLo5Mo5opI,6762
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-2.7.1.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.7.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.7.1.dist-info/METADATA,sha256=Xl0_n2qN9TcO3QzC0Kwg5IdI4ROjBQ8Z-5XaAV2eEIo,5931
-aa_structures-2.7.1.dist-info/RECORD,,
+aa_structures-2.8.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.8.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.8.0.dist-info/METADATA,sha256=gk_3PCb8cSvayCxZpRb8R0J78-88_w2EKNCvQq0Qv7g,5970
+aa_structures-2.8.0.dist-info/RECORD,,

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"

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=_(

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)

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

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

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

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

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: