[WIP] Upgrade django to 5.2 LTS

pyproject.toml

@@ -13,18 +13,18 @@ classifiers = [
 ########## DEPENDENCIES ##########
 
 dependencies = [
-    "Django==4.2.21",
-    "channels==4.2.2",
-    "channels-redis==4.2.1",
+    "Django==5.2.5",
+    "channels==4.3.1",
+    "channels-redis==4.3.0",
     "asyncio==3.4.3",
     "commonmark==0.9.1",
     "conference-scheduler==3.0.1",
     "django-allauth[mfa]==65.8.1",
-    "django-bootstrap5==25.1",
+    "django-bootstrap5==25.2",
     "django-colorfield==0.14.0",
     "django-cors-headers==4.7.0",
     "django-filter==25.1",
-    "django-leaflet==0.31.0",
+    "django-leaflet==0.32.0",
     "django-jsonview==2.0.0",
     "django-oauth-toolkit==3.0.1",
     "django-otp==1.6.0",

src/backoffice/templates/facility_form.html

@@ -6,6 +6,7 @@
 {% block extra_head %}
   {{ form.media }}
   {% leaflet_css plugins="forms" %}
+  <link href="{% static 'css/leaflet.css' %}" rel="stylesheet">
   {% leaflet_js plugins="forms" %}
   {{ mapData|json_script:"mapData" }}
   <script src="{% static 'js/maps/generic/mapVars.js' %}" type="text/javascript"></script>

src/backoffice/templates/maps_feature_form.html

@@ -9,6 +9,7 @@
   <link href="{% static 'vendor/leaflet-panel-layers/leaflet-panel-layers.min.css' %}" rel="stylesheet">
   {{ form.media }}
   {% leaflet_css plugins="forms" %}
+  <link href="{% static 'css/leaflet.css' %}" rel="stylesheet">
   {% leaflet_js plugins="forms" %}
   <script src="{% static 'vendor/leaflet/leaflet.awesome-markers.min.js' %}" type="text/javascript"></script>
   <script src="{% static 'vendor/leaflet/leaflet-color-markers.js' %}" type="text/javascript"></script>

src/backoffice/views/facilities.py

@@ -372,7 +372,6 @@ def get_form(self, *args, **kwargs):
         form.fields["location"].widget = LeafletWidget(
             attrs={
                 "display_raw": "true",
-                "map_height": "500px",
                 "class": "form-control",
                 "geom_type": "Point",
             },

src/backoffice/views/maps.py

@@ -297,7 +297,6 @@ def get_form(self, *args, **kwargs):
         form.fields["geom"].widget = LeafletWidget(
             attrs={
                 "display_raw": "true",
-                "map_height": "500px",
                 "geom_type": "GeometryCollection",
                 "class": "form-control",
             },
@@ -342,7 +341,6 @@ def get_form(self, *args, **kwargs):
         form.fields["geom"].widget = LeafletWidget(
             attrs={
                 "display_raw": "true",
-                "map_height": "500px",
                 "geom_type": "GeometryCollection",
                 "class": "form-control",
             },

src/bornhack/settings.py

@@ -177,7 +177,6 @@
         "debug_toolbar.panels.templates.TemplatesPanel",
         "debug_toolbar.panels.cache.CachePanel",
         "debug_toolbar.panels.signals.SignalsPanel",
-        "debug_toolbar.panels.logging.LoggingPanel",
         "debug_toolbar.panels.redirects.RedirectsPanel",
     ]
 

src/economy/factories.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 import random
+from datetime import timezone
 
 import factory
 import faker
 from django.contrib.auth.models import User
-from django.utils import timezone
 from utils.slugs import unique_slugify
 
 from camps.models import Camp

src/maps/templates/user_location_form.html

@@ -10,6 +10,7 @@
 {% block extra_head %}
   {{ form.media }}
   {% leaflet_css plugins="forms" %}
+  <link href="{% static 'css/leaflet.css' %}" rel="stylesheet">
   {% leaflet_js plugins="forms" %}
   {{ mapData|json_script:"mapData" }}
   <script src="{% static 'js/maps/generic/mapVars.js' %}" type="text/javascript"></script>

src/maps/views.py

@@ -466,7 +466,6 @@ def get_form(self, *args, **kwargs) -> BaseForm:
         form.fields["location"].widget = LeafletWidget(
             attrs={
                 "display_raw": "true",
-                "map_height": "500px",
                 "geom_type": "Point",
                 "class": "form-control",
             },
@@ -517,7 +516,6 @@ def get_form(self, *args, **kwargs) -> BaseForm:
         form.fields["location"].widget = LeafletWidget(
             attrs={
                 "display_raw": "true",
-                "map_height": "500px",
                 "geom_type": "Point",
                 "class": "form-control",
             },

src/profiles/factories.py

@@ -40,6 +40,7 @@ class Meta:
         """Meta."""
 
         model = User
+        skip_postgeneration_save = True
 
     profile = factory.RelatedFactory(ProfileFactory, "user")
 

src/static_src/css/leaflet.css

@@ -182,6 +182,7 @@
 /* visual tweaks */
 
 .leaflet-container {
+    height: 500px;
 	background: #ddd;
 	outline: 0;
 	}

src/villages/templates/village_form.html

@@ -10,6 +10,7 @@
 {% block extra_head %}
   {{ form.media }}
   {% leaflet_css plugins="forms" %}
+  <link href="{% static 'css/leaflet.css' %}" rel="stylesheet">
   {% leaflet_js plugins="forms" %}
   {{ mapData|json_script:"mapData" }}
   <script src="{% static 'js/maps/generic/mapVars.js' %}" type="text/javascript"></script>

src/villages/views.py

@@ -168,7 +168,6 @@ def get_form(self, *args, **kwargs) -> ModelForm[Village]:
         form.fields["location"].widget = LeafletWidget(
             attrs={
                 "display_raw": "true",
-                "map_height": "500px",
                 "class": "form-control",
                 "geom_type": "Point",
             },
@@ -229,7 +228,6 @@ def get_form(self, *args, **kwargs) -> ModelForm[Village]:
         form.fields["location"].widget = LeafletWidget(
             attrs={
                 "display_raw": "true",
-                "map_height": "500px",
                 "class": "form-control",
                 "geom_type": "Point",
             },