Merge branch 'test-formtools' into 'master'

Update formtools and dependencies

See merge request !58

.gitlab-ci.yml

@@ -7,8 +7,6 @@ include:
     file: /ci/test/security.yml
   - project: "AlekSIS/official/AlekSIS"
     file: /ci/build/dist.yml
-  - project: "AlekSIS/official/AlekSIS"
-    file: /ci/docker/dist.yml
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive

aleksis/apps/paweljong/migrations/0029_alter_registrationstate_colour.py

+# Generated by Django 5.0.8 on 2024-08-06 18:52
+
+import colorfield.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('paweljong', '0028_add_eventadditionalfield'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='registrationstate',
+            name='colour',
+            field=colorfield.fields.ColorField(blank=True, default='', image_field=None, max_length=25, samples=None, verbose_name='Colour'),
+        ),
+    ]

aleksis/apps/paweljong/views.py

@@ -540,10 +540,16 @@ class RegisterEventWizardView(SessionWizardView):
 
     def done(self, form_list, **kwargs):
         event = Event.objects.get(slug=self.kwargs["slug"])
-        cleaned_data_email = self.get_cleaned_data_for_step("email")
+        try:
+            cleaned_data_email = self.get_cleaned_data_for_step("email")
+        except KeyError: # FIXME
+            cleaned_data_email = False
         cleaned_data_contact_details = self.get_cleaned_data_for_step("contact_details")
         cleaned_data_guardians = self.get_cleaned_data_for_step("guardians")
-        cleaned_data_register = self.get_cleaned_data_for_step("register")
+        try:
+            cleaned_data_register = self.get_cleaned_data_for_step("register")
+        except KeyError: # FIXME
+            cleaned_data_register = False
         cleaned_data_additional = self.get_cleaned_data_for_step("additional")
         cleaned_data_financial = self.get_cleaned_data_for_step("financial")
         cleaned_data_consent = self.get_cleaned_data_for_step("consent")

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Paweljong"
-version = "3.0.dev4"
+version = "3.0.dev5"
 packages = [
     { include = "aleksis" }
 ]
@@ -29,13 +29,13 @@ priority = "supplemental"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-aleksis-core = "^4.0.0.dev10"
+aleksis-core = "^4.0.0.dev11"
 django-localflavor = "^3.0"
-django-formtools = "2.3"
+django-formtools = "^2.5"
 django-starfield = "^1.0"
-aleksis-app-postbuero = "3.0.dev0"
-aleksis-app-tezor = "2.0.dev3"
-aleksis-app-kort = "0.5.dev1"
+aleksis-app-postbuero = "^3.0.dev4"
+aleksis-app-tezor = "^2.0.dev4"
+aleksis-app-kort = "^1.0.dev2"
 
 [tool.poetry.plugins."aleksis.app"]
 paweljong = "aleksis.apps.paweljong.apps:DefaultConfig"