⬆️ upgraded django to 4.2

maykinmedia · Feb 16, 2024 · 8ae67db · 8ae67db
1 parent 5738f2b
commit 8ae67db
Show file tree

Hide file tree

Showing 11 changed files with 172 additions and 102 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -10,13 +10,13 @@ pydantic
 email-validator
 
 # Framework libraries
-django==3.2.0
+django~=4.2
 django-admin-index
-django-better-admin-arrayfield
 django-axes[ipware]
 django-choices
 django-decorator-include
 django-hijack
+django-jsonform
 django-redis
 django-rosetta
 django-sniplates
@@ -36,7 +36,7 @@ drf-spectacular  # api documentation
 # django-extra-fields
 # django-filter
 # drf-yasg  # api documentation
-vng-api-common
+commonground-api-common
 
 # WSGI servers & monitoring - production oriented
 uwsgi
@@ -46,3 +46,4 @@ elastic-apm  # Elastic APM integration
 git+https://github.com/maykinmedia/django-rijkshuisstijl.git
 beautifulsoup4  # missing from django-rijkshuisstijl
 zgw-consumers
+gemma-zds-client < 2.0.0 # custom Service code breaks with later versions
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -62,19 +62,22 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
+commonground-api-common==1.10.1
+    # via -r requirements/base.in
 cron-descriptor==1.4.3
     # via django-celery-beat
-cryptography==42.0.2
+cryptography==42.0.3
     # via
     #   django-simple-certmanager
     #   pyjwt
     #   pyopenssl
     #   webauthn
 defusedxml==0.7.1
     # via python3-openid
-django==3.2
+django==4.2.10
     # via
     #   -r requirements/base.in
+    #   commonground-api-common
     #   django-admin-index
     #   django-allauth
     #   django-appconf
@@ -85,6 +88,7 @@ django==3.2
     #   django-filter
     #   django-formtools
     #   django-hijack
+    #   django-jsonform
     #   django-markdownify
     #   django-markdownx
     #   django-otp
@@ -105,9 +109,9 @@ django==3.2
     #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
+    #   drf-yasg
     #   maykin-2fa
     #   notifications-api-common
-    #   vng-api-common
     #   zgw-consumers
 django-admin-index==3.1.0
     # via -r requirements/base.in
@@ -117,26 +121,26 @@ django-appconf==1.0.6
     # via django-timeline-logger
 django-axes[ipware]==6.3.0
     # via -r requirements/base.in
-django-better-admin-arrayfield==1.4.2
-    # via -r requirements/base.in
 django-celery-beat==2.5.0
     # via -r requirements/base.in
 django-choices==2.0.0
     # via
     #   -r requirements/base.in
-    #   vng-api-common
+    #   commonground-api-common
 django-decorator-include==3.0
     # via -r requirements/base.in
 django-filter==23.5
     # via
     #   -r requirements/base.in
-    #   vng-api-common
+    #   commonground-api-common
 django-formtools==2.5.1
     # via django-two-factor-auth
 django-hijack==3.4.5
     # via -r requirements/base.in
 django-ipware==6.0.4
     # via django-axes
+django-jsonform==2.21.5
+    # via -r requirements/base.in
 django-markdownify==0.9.3
     # via -r requirements/base.in
 django-markdownx==4.0.7
@@ -154,10 +158,10 @@ django-redis==5.4.0
 django-relativedelta==2.0.0
     # via zgw-consumers
 django-rest-framework-condition==0.1.1
-    # via vng-api-common
+    # via commonground-api-common
 django-rijkshuisstijl @ git+https://github.com/maykinmedia/django-rijkshuisstijl.git
     # via -r requirements/base.in
-django-rosetta==0.9.9
+django-rosetta==0.10.0
     # via -r requirements/base.in
 django-sendfile2==0.7.0
     # via django-privates
@@ -169,8 +173,8 @@ django-sniplates==0.7.2
     # via -r requirements/base.in
 django-solo==2.2.0
     # via
+    #   commonground-api-common
     #   notifications-api-common
-    #   vng-api-common
     #   zgw-consumers
 django-timeline-logger==3.0.0
     # via -r requirements/base.in
@@ -181,23 +185,24 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
 djangorestframework==3.12.4
     # via
     #   -r requirements/base.in
+    #   commonground-api-common
     #   drf-nested-routers
     #   drf-spectacular
+    #   drf-yasg
     #   notifications-api-common
-    #   vng-api-common
 djangorestframework-camel-case==1.4.2
     # via
     #   -r requirements/base.in
+    #   commonground-api-common
     #   notifications-api-common
-    #   vng-api-common
 dnspython==2.5.0
     # via email-validator
 drf-nested-routers==0.93.4
-    # via vng-api-common
+    # via commonground-api-common
 drf-spectacular==0.27.1
-    # via
-    #   -r requirements/base.in
-    #   vng-api-common
+    # via -r requirements/base.in
+drf-yasg==1.21.7
+    # via commonground-api-common
 ecs-logging==2.1.0
     # via elastic-apm
 elastic-apm==6.20.0
@@ -210,8 +215,9 @@ faker==23.2.0
     # via zgw-consumers
 gemma-zds-client==1.0.1
     # via
+    #   -r requirements/base.in
+    #   commonground-api-common
     #   notifications-api-common
-    #   vng-api-common
     #   zgw-consumers
 glom==23.5.0
     # via -r requirements/base.in
@@ -220,11 +226,13 @@ idna==3.6
     #   email-validator
     #   requests
 inflection==0.5.1
-    # via drf-spectacular
+    # via
+    #   drf-spectacular
+    #   drf-yasg
 iso-639==0.4.5
-    # via vng-api-common
+    # via commonground-api-common
 isodate==0.6.1
-    # via vng-api-common
+    # via commonground-api-common
 jsonschema==4.21.1
     # via drf-spectacular
 jsonschema-specifications==2023.12.1
@@ -240,11 +248,13 @@ markdown==3.5.2
 maykin-2fa==1.0.0
     # via -r requirements/base.in
 notifications-api-common==0.2.2
-    # via vng-api-common
+    # via commonground-api-common
 oauthlib==3.2.2
     # via requests-oauthlib
 oyaml==1.0
-    # via vng-api-common
+    # via commonground-api-common
+packaging==23.2
+    # via drf-yasg
 phonenumberslite==8.13.30
     # via django-two-factor-auth
 pillow==10.2.0
@@ -265,10 +275,10 @@ pydantic-core==2.16.2
     # via pydantic
 pyjwt[crypto]==2.8.0
     # via
+    #   commonground-api-common
     #   django-allauth
     #   gemma-zds-client
     #   pyjwt
-    #   vng-api-common
 pyopenssl==24.0.0
     # via
     #   django-simple-certmanager
@@ -295,13 +305,14 @@ python3-openid==3.2.0
 pytz==2024.1
     # via
     #   -r requirements/base.in
-    #   django
+    #   drf-yasg
 pyyaml==6.0.1
     # via
+    #   commonground-api-common
     #   drf-spectacular
+    #   drf-yasg
     #   gemma-zds-client
     #   oyaml
-    #   vng-api-common
 qrcode==7.4.2
     # via django-two-factor-auth
 redis==5.0.1
@@ -312,12 +323,12 @@ referencing==0.33.0
     #   jsonschema-specifications
 requests==2.31.0
     # via
+    #   commonground-api-common
     #   django-allauth
     #   django-rosetta
     #   gemma-zds-client
     #   requests-mock
     #   requests-oauthlib
-    #   vng-api-common
     #   zgw-consumers
 requests-mock==1.11.0
     # via zgw-consumers
@@ -352,7 +363,9 @@ tzdata==2024.1
     #   celery
     #   django-celery-beat
 uritemplate==4.1.1
-    # via drf-spectacular
+    # via
+    #   drf-spectacular
+    #   drf-yasg
 urllib3==2.2.0
     # via
     #   elastic-apm
@@ -365,8 +378,6 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-vng-api-common==2.0.5
-    # via -r requirements/base.in
 wcwidth==0.2.13
     # via prompt-toolkit
 webauthn==2.0.0