Leverage to Django 4

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8.12-bullseye
+FROM python:3.9-bullseye
 
 ENV PYTHONUNBUFFERED 1
 EXPOSE 80
@@ -35,7 +35,7 @@ RUN playwright install \
 
 # TODO: Refactor the whole Azure storage part. (Upgrade is not enough, was tested.)
 # Until then avoid some SyntaxWarnings ("is" with a literal):
-ENV AZUREROOT=/usr/local/lib/python3.8/site-packages/azure/storage/
+ENV AZUREROOT=/usr/local/lib/python3.9/site-packages/azure/storage/
 RUN perl -pi -e 's/ is 0 / == 0 /'      ${AZUREROOT}blob/_upload_chunking.py
 RUN perl -pi -e 's/ is not -1 / != 1 /' ${AZUREROOT}blob/baseblobservice.py
 RUN perl -pi -e "s/ is '' / == '' /"    ${AZUREROOT}common/_connection.py

api/admin.py

@@ -59,8 +59,8 @@ class GoTokenAdmin(TokenAdmin):
     search_fields = ('user__username', 'user__email',)
 
 
-admin.site.unregister(Token)
-admin.site.register(Token, GoTokenAdmin)
+# admin.site.unregister(Token)
+# admin.site.register(Token, GoTokenAdmin)
 
 
 class HasRelatedEventFilter(admin.SimpleListFilter):

api/models.py

@@ -10,7 +10,7 @@
 from django.dispatch import receiver
 from django.utils import timezone
 from django.db.models import Q
-from tinymce import HTMLField
+from tinymce.models import HTMLField
 from django.core.validators import FileExtensionValidator, validate_slug, RegexValidator
 from django.contrib.postgres.fields import ArrayField
 from datetime import datetime, timedelta

api/serializers.py

@@ -2199,8 +2199,8 @@ class SearchEmergencySerializer(serializers.Serializer):
     funding_coverage = serializers.CharField()
     start_date = serializers.DateTimeField()
     countries = SearchMiniCountrySerializer(many=True)
-    # countries_id = serializers.ListField(serializers.IntegerField())
-    # iso3 = serializers.ListField(serializers.CharField())
+    # countries_id = serializers.ListField(child=serializers.IntegerField())
+    # iso3 = serializers.ListField(child=serializers.CharField())
     severity_level_display = serializers.CharField()
     appeal_type = serializers.CharField()
     score = serializers.FloatField()
@@ -2210,7 +2210,7 @@ class SearchEmergencySerializer(serializers.Serializer):
 class SearchSurgeAlertSerializer(serializers.Serializer):
     id = serializers.IntegerField()
     name = serializers.CharField()
-    keywords = serializers.ListField(serializers.CharField())
+    keywords = serializers.ListField(child=serializers.CharField())
     event_name = serializers.CharField()
     country = serializers.CharField()
     start_date = serializers.DateTimeField()
@@ -2228,11 +2228,11 @@ class SearchProjectsSerializer(serializers.Serializer):
     name = serializers.CharField()
     event_name = serializers.CharField()
     national_society = serializers.CharField()
-    tags = serializers.ListField(serializers.CharField())
+    tags = serializers.ListField(child=serializers.CharField())
     sector = serializers.CharField()
     start_date = serializers.DateTimeField()
     end_date = serializers.DateTimeField()
-    regions = serializers.ListField(serializers.CharField())
+    regions = serializers.ListField(child=serializers.CharField())
     people_targeted = serializers.IntegerField()
     event_id = serializers.IntegerField()
     national_society_id = serializers.IntegerField()

api/snapshots/snap_test_views.py

@@ -26,18 +26,18 @@
     'emergency_response_contact_email': None,
     'featured_documents': [
         {
-            'description': 'event-featured-document-description-lIPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHco',
+            'description': 'event-featured-document-description-LEkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCP',
             'file': None,
-            'id': 5,
+            'id': 1,
             'thumbnail': None,
-            'title': 'event-featured-document-title-UEWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIF'
+            'title': 'event-featured-document-title-ZEHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUd'
         },
         {
-            'description': 'event-featured-document-description-BJFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZ',
+            'description': 'event-featured-document-description-PKoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',
             'file': None,
-            'id': 4,
+            'id': 2,
             'thumbnail': None,
-            'title': 'event-featured-document-title-pnegMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlOR'
+            'title': 'event-featured-document-title-qVEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXf'
         },
         {
             'description': 'event-featured-document-description-hRnTLFfGCZdDiGADKdJDRZtUbzqaVnLecBwSeIdeEcsAlXiXPUPAxyCyyfRQIiPwhlIzHiUoaWbtDRUIBIyopDwjrmUWhcZQANXb',
@@ -47,18 +47,18 @@
             'title': 'event-featured-document-title-ShOsxNooiEjDVMxASJEWIZQnWpRWMYfHCHTxeKhdJGmKIjkuHC'
         },
         {
-            'description': 'event-featured-document-description-PKoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',
+            'description': 'event-featured-document-description-BJFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZ',
             'file': None,
-            'id': 2,
+            'id': 4,
             'thumbnail': None,
-            'title': 'event-featured-document-title-qVEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXf'
+            'title': 'event-featured-document-title-pnegMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlOR'
         },
         {
-            'description': 'event-featured-document-description-LEkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCP',
+            'description': 'event-featured-document-description-lIPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHco',
             'file': None,
-            'id': 1,
+            'id': 5,
             'thumbnail': None,
-            'title': 'event-featured-document-title-ZEHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUd'
+            'title': 'event-featured-document-title-UEWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIF'
         }
     ],
     'field_reports': [
@@ -122,16 +122,16 @@
     ],
     'links': [
         {
-            'description': 'event-link-description-lIPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHco',
-            'id': 5,
-            'title': 'event-link-title-UEWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIF',
+            'description': 'event-link-description-LEkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCP',
+            'id': 1,
+            'title': 'event-link-title-ZEHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUd',
             'translation_module_original_language': 'en',
             'url': ''
         },
         {
-            'description': 'event-link-description-BJFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZ',
-            'id': 4,
-            'title': 'event-link-title-pnegMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlOR',
+            'description': 'event-link-description-PKoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',
+            'id': 2,
+            'title': 'event-link-title-qVEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXf',
             'translation_module_original_language': 'en',
             'url': ''
         },
@@ -143,16 +143,16 @@
             'url': ''
         },
         {
-            'description': 'event-link-description-PKoIVUclAlczYFlVscatKMgvsDPIHFiGDrmZhvkUDPqTlaVvYsKRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',
-            'id': 2,
-            'title': 'event-link-title-qVEnmIrJSrigNVLppdQHoOodgAvTEgRXiaJkAPEEPmWsusPdXf',
+            'description': 'event-link-description-BJFdwPQyYHuSAAjtylWIEpotTjZDdJAAJHiypqnvPfCxfIUmdryRMMcemZWLUQJnEnvtanmVhVWEpSMTnzpJuXsyDIPwtqxGFDgZ',
+            'id': 4,
+            'title': 'event-link-title-pnegMcCMRTdpVczCoInWXdiGsoUKuKMXRuptjQHoAtrdJLVlOR',
             'translation_module_original_language': 'en',
             'url': ''
         },
         {
-            'description': 'event-link-description-LEkHOUNXyjRpcKShmbCuAjASnAGXNEVUdTiHnJuQEHyulDIvIwRXURPZSqNEmprJtotXsTnSTFuEwJYUrshKRIyzwXZjscsTfwCP',
-            'id': 1,
-            'title': 'event-link-title-ZEHDjMGiuNukzNVtLvGGIFTKtEbxvRhALtYUSObMEqPYXLKoUd',
+            'description': 'event-link-description-lIPdHceQdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHco',
+            'id': 5,
+            'title': 'event-link-title-UEWunxuAcKoVjbqJLLUAsjmvoyKpFJPRvqWFUPVFDkUYwkiUIF',
             'translation_module_original_language': 'en',
             'url': ''
         }

country_plan/migrations/0006_alter_countryplan_created_by_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 4.2.13 on 2024-05-19 13:47
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('country_plan', '0005_auto_20230207_0840'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='countryplan',
+            name='created_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
+        ),
+        migrations.AlterField(
+            model_name='countryplan',
+            name='updated_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Updated by'),
+        ),
+        migrations.AlterField(
+            model_name='dataimport',
+            name='created_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
+        ),
+        migrations.AlterField(
+            model_name='dataimport',
+            name='updated_by',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Updated by'),
+        ),
+    ]

deployments/migrations/0089_alter_emergencyproject_districts.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.13 on 2024-05-19 13:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0210_profile_accepted_montandon_license_terms'),
+        ('deployments', '0088_alter_project_visibility'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emergencyproject',
+            name='districts',
+            field=models.ManyToManyField(blank=True, related_name='+', to='api.district', verbose_name='Districts'),
+        ),
+    ]

deployments/models.py

@@ -1,6 +1,6 @@
 import reversion
 from datetime import datetime
-from tinymce import HTMLField
+from tinymce.models import HTMLField
 
 from django.db import models
 from django.utils import timezone

docker-compose.yml

@@ -61,13 +61,13 @@ x-server: &base_server_setup
 
 services:
   db:
-    image: postgis/postgis:11-3.1-alpine
+    image: postgis/postgis:12-3.4-alpine
     environment:
       POSTGRES_PASSWORD: test
       POSTGRES_USER: test
       POSTGRES_DB: test
     volumes:
-      - './.db/pg:/var/lib/postgresql/data'
+      - './.db/pg-12:/var/lib/postgresql/data'
     extra_hosts:
       - "host.docker.internal:host-gateway"
 

flash_update/models.py

@@ -1,5 +1,5 @@
 import reversion
-from tinymce import HTMLField
+from tinymce.models import HTMLField
 
 from django.db import models
 from django.conf import settings

main/test_case.py

@@ -229,7 +229,7 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_valuei, exc_traceback):
         run_on_commit = connections[self.using].run_on_commit[self.start_count:]
-        self.callbacks[:] = [func for sids, func in run_on_commit]
+        self.callbacks[:] = [func for sids, func, forgetme in run_on_commit]
         if exc_type is None and self.execute:
             for callback in self.callbacks:
                 callback()

main/urls.py

@@ -1,24 +1,9 @@
-"""main URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/1.11/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.conf.urls import url, include
-    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
-In case of an api endpoint search, grep url_path in other files also, e.g:
-    grep url_path $(ls */*views.py)
+"""
+main URL Configuration
 """
 from django.views.decorators.clickjacking import xframe_options_exempt
-from django.conf.urls import url, include
+from django.urls import include, path, re_path as url  # FIXME later as best practice is "path"
 from django.conf import settings
-from django.urls import path
 from django.contrib import admin
 from django.conf.urls import static
 from django.views.static import serve

per/models.py

@@ -3,7 +3,7 @@
 from django.db import models
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
-from tinymce import HTMLField
+from tinymce.models import HTMLField
 from deployments.models import SectorTag