Merge pull request #1024 from maykinmedia/upgrade/django-4.2

[#939] Upgrade to Django 4.2
maykinmedia · Mar 1, 2024 · 53a9201 · 53a9201
2 parents 18df719 + 4a9a460
commit 53a9201
Show file tree

Hide file tree

Showing 86 changed files with 359 additions and 223 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
 
     services:
       postgres:
-        image: postgis/postgis:10-2.5
+        image: postgis/postgis:15-3.4
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
         ports:
@@ -92,7 +92,7 @@ jobs:
 
     services:
       postgres:
-        image: postgis/postgis:10-2.5
+        image: postgis/postgis:15-3.4
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
         ports:

diff --git a/requirements/base.in b/requirements/base.in
@@ -12,7 +12,7 @@ tinycss2
 css_inline
 
 # Framework libraries
-Django>=3.2.11<4.0
+Django>=4.2<5.0
 django-admin-index
 django-axes
 django-filer
@@ -36,6 +36,7 @@ markdown
 django_better_admin_arrayfield
 humanfriendly
 git+https://github.com/maykinmedia/[email protected]#egg=mail-editor
+fontawesomefree
 django-timeline-logger
 django-csp
 django-csp-reports

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,13 +4,13 @@
 #
 #    ./bin/compile_dependencies.sh
 #
-aldryn-apphooks-config==0.6.0
+aldryn-apphooks-config==0.7.0
     # via -r requirements/base.in
 amqp==5.1.1
     # via kombu
 ape-pie==0.1.0
     # via zgw-consumers
-asgiref==3.4.1
+asgiref==3.7.2
     # via django
 asn1crypto==1.5.1
     # via webauthn
@@ -29,7 +29,9 @@ brotli==1.0.9
 cbor2==5.6.2
     # via webauthn
 celery==5.2.7
-    # via notifications-api-common
+    # via
+    #   django-yubin
+    #   notifications-api-common
 certifi==2023.11.17
     # via
     #   django-simple-certmanager
@@ -79,7 +81,7 @@ defusedxml==0.7.1
     #   odfpy
 diff-match-patch==20200713
     # via django-import-export
-django==3.2.24
+django==4.2.10
     # via
     #   -r requirements/base.in
     #   django-admin-index
@@ -113,6 +115,7 @@ django==3.2.24
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-sniplates
+    #   django-solo
     #   django-timeline-logger
     #   django-treebeard
     #   django-two-factor-auth
@@ -133,7 +136,7 @@ django-appconf==1.0.5
     #   django-image-cropping
     #   django-log-outgoing-requests
     #   django-timeline-logger
-django-appdata==0.3.2
+django-appdata==0.4.0
     # via aldryn-apphooks-config
 django-autoslug==1.9.8
     # via -r requirements/base.in
@@ -170,7 +173,7 @@ django-csp-reports==1.8.1
     # via -r requirements/base.in
 django-digid-eherkenning==0.9.0
     # via -r requirements/base.in
-django-elasticsearch-dsl==7.2.1
+django-elasticsearch-dsl==7.4
     # via -r requirements/base.in
 django-extra-fields==3.0.2
     # via -r requirements/base.in
@@ -234,9 +237,9 @@ django-simple-certmanager==1.4.1
     # via
     #   django-digid-eherkenning
     #   zgw-consumers
-django-sniplates==0.7.0
+django-sniplates==0.7.2
     # via -r requirements/base.in
-django-solo==1.2.0
+django-solo==2.2.0
     # via
     #   -r requirements/base.in
     #   django-digid-eherkenning
@@ -245,7 +248,7 @@ django-solo==1.2.0
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
-django-timeline-logger==2.0.0
+django-timeline-logger==3.0.0
     # via -r requirements/base.in
 django-treebeard==4.4
     # via
@@ -254,9 +257,9 @@ django-treebeard==4.4
     #   djangocms-attributes-field
 django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     # via maykin-2fa
-django-view-breadcrumbs==2.2.4
+django-view-breadcrumbs==2.5.1
     # via -r requirements/base.in
-django-yubin==1.7.1
+django-yubin==2.0.3
     # via -r requirements/base.in
 djangocms-admin-style==3.2.3
     # via django-cms
@@ -265,21 +268,21 @@ djangocms-attributes-field==2.1.0
     #   djangocms-file
     #   djangocms-link
     #   djangocms-picture
-djangocms-file==3.0.0
+djangocms-file==3.0.1
     # via -r requirements/base.in
 djangocms-link==3.1.1
     # via -r requirements/base.in
-djangocms-picture==4.0.0
+djangocms-picture==4.1.1
     # via -r requirements/base.in
 djangocms-text-ckeditor==5.1.2
     # via -r requirements/base.in
-djangorestframework==3.12.4
+djangorestframework==3.14.0
     # via
     #   -r requirements/base.in
     #   django-extra-fields
     #   drf-spectacular
     #   notifications-api-common
-djangorestframework-camel-case==1.2.0
+djangorestframework-camel-case==1.4.2
     # via
     #   -r requirements/base.in
     #   notifications-api-common
@@ -305,6 +308,8 @@ fonttools[woff]==4.43.0
     # via
     #   fonttools
     #   weasyprint
+fontawesomefree==6.4.2
+    # via -r requirements/base.in
 furl==2.1.3
     # via
     #   -r requirements/base.in
@@ -342,8 +347,6 @@ jsonschema==4.1.0
     # via drf-spectacular
 kombu==5.2.4
     # via celery
-lockfile==0.12.2
-    # via django-yubin
 lxml==4.9.1
     # via
     #   django-digid-eherkenning
@@ -437,8 +440,10 @@ pytz==2021.3
     # via
     #   -r requirements/base.in
     #   celery
-    #   django
     #   django-yubin
+    #   djangorestframework
+pywatchman==1.4.1
+    # via -r requirements/base.in
 pyyaml==6.0
     # via
     #   drf-spectacular
@@ -470,7 +475,6 @@ simplejson==3.18.0
 six==1.16.0
     # via
     #   click-repl
-    #   django-appdata
     #   django-elasticsearch-dsl
     #   elasticsearch-dsl
     #   furl

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,7 +4,7 @@
 #
 #    ./bin/compile_dependencies.sh
 #
-aldryn-apphooks-config==0.6.0
+aldryn-apphooks-config==0.7.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -18,7 +18,7 @@ ape-pie==0.1.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   zgw-consumers
-asgiref==3.4.1
+asgiref==3.7.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -67,6 +67,7 @@ celery==5.2.7
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-yubin
     #   notifications-api-common
 certifi==2023.11.17
     # via
@@ -155,7 +156,7 @@ diff-match-patch==20200713
     #   django-import-export
 dill==0.3.7
     # via pylint
-django==3.2.24
+django==4.2.10
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -190,6 +191,7 @@ django==3.2.24
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-sniplates
+    #   django-solo
     #   django-timeline-logger
     #   django-treebeard
     #   django-two-factor-auth
@@ -214,7 +216,7 @@ django-appconf==1.0.5
     #   django-image-cropping
     #   django-log-outgoing-requests
     #   django-timeline-logger
-django-appdata==0.3.2
+django-appdata==0.4.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -278,7 +280,7 @@ django-digid-eherkenning==0.9.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-elasticsearch-dsl==7.2.1
+django-elasticsearch-dsl==7.4
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -396,11 +398,11 @@ django-simple-certmanager==1.4.1
     #   -r requirements/base.txt
     #   django-digid-eherkenning
     #   zgw-consumers
-django-sniplates==0.7.0
+django-sniplates==0.7.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-solo==1.2.0
+django-solo==2.2.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -410,7 +412,7 @@ django-solo==1.2.0
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
-django-timeline-logger==2.0.0
+django-timeline-logger==3.0.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -426,13 +428,13 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     #   -r requirements/base.txt
     #   django-two-factor-auth
     #   maykin-2fa
-django-view-breadcrumbs==2.2.4
+django-view-breadcrumbs==2.5.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-webtest==1.9.7
+django-webtest==1.9.11
     # via -r requirements/test-tools.in
-django-yubin==1.7.1
+django-yubin==2.0.3
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -448,30 +450,30 @@ djangocms-attributes-field==2.1.0
     #   djangocms-file
     #   djangocms-link
     #   djangocms-picture
-djangocms-file==3.0.0
+djangocms-file==3.0.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
 djangocms-link==3.1.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-djangocms-picture==4.0.0
+djangocms-picture==4.1.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
 djangocms-text-ckeditor==5.1.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-djangorestframework==3.12.4
+djangorestframework==3.14.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-extra-fields
     #   drf-spectacular
     #   notifications-api-common
-djangorestframework-camel-case==1.2.0
+djangorestframework-camel-case==1.4.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -607,11 +609,6 @@ kombu==5.2.4
     #   celery
 lazy-object-proxy==1.6.0
     # via astroid
-lockfile==0.12.2
-    # via
-    #   -c requirements/base.txt
-    #   -r requirements/base.txt
-    #   django-yubin
 lxml==4.9.1
     # via
     #   -c requirements/base.txt
@@ -812,8 +809,12 @@ pytz==2021.3
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   celery
-    #   django
     #   django-yubin
+    #   djangorestframework
+pywatchman==1.4.1
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
 pyyaml==6.0
     # via
     #   -c requirements/base.txt
@@ -867,7 +868,6 @@ six==1.16.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   click-repl
-    #   django-appdata
     #   django-elasticsearch-dsl
     #   elasticsearch-dsl
     #   furl

diff --git a/requirements/dev.in b/requirements/dev.in
@@ -8,7 +8,6 @@ bandit
 
 # Debug tooling
 django-debug-toolbar
-ddt-api-calls
 django-extensions
 
 # Documentation