Merge pull request #138 from open-zaak/upgrade-42

Upgrade to Django 4.2

Author: joeribekker

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        postgres: ['10', '11', '12', '13', '14']
+        postgres: ['12', '13', '14', '15', '16']
 
     name: Tests (PG ${{ matrix.postgres }})
 

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.4'
 
 services:
   db:
-    image: postgres:11-alpine
+    image: postgres:12-alpine
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:

requirements/base.in

@@ -1,5 +1,5 @@
 # Core python libraries
-psycopg2
+psycopg
 python-dotenv
 python-decouple # processing of envvar configs
 pytz
@@ -11,7 +11,7 @@ self-certifi
 furl
 
 # Framework libraries
-Django ~= 3.2.0
+Django ~= 4.2.0
 django-axes[ipware]
 django-cors-headers
 django-redis
@@ -23,7 +23,7 @@ mozilla-django-oidc-db
 
 # API libraries
 djangorestframework
-gemma-zds-client<1.0
+gemma-zds-client
 commonground-api-common
 django-log-outgoing-requests
 

requirements/base.txt

@@ -27,6 +27,7 @@ celery==5.2.6
     #   notifications-api-common
 certifi==2023.7.22
     # via
+    #   django-simple-certmanager
     #   elastic-apm
     #   requests
     #   self-certifi
@@ -50,19 +51,16 @@ click-repl==0.2.0
 commonground-api-common==1.13.0
     # via -r requirements/base.in
 coreapi==2.3.3
-    # via
-    #   commonground-api-common
-    #   drf-yasg
+    # via commonground-api-common
 coreschema==0.0.4
-    # via
-    #   coreapi
-    #   drf-yasg
+    # via coreapi
 cryptography==41.0.7
     # via
+    #   django-simple-certmanager
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
-django==3.2.24
+django==4.2.11
     # via
     #   -r requirements/base.in
     #   commonground-api-common
@@ -80,6 +78,7 @@ django==3.2.24
     #   django-rest-framework-condition
     #   django-sendfile2
     #   django-setup-configuration
+    #   django-simple-certmanager
     #   django-solo
     #   djangorestframework
     #   drf-nested-routers
@@ -95,7 +94,7 @@ django-appconf==1.0.5
 django-axes[ipware]==6.4.0
     # via -r requirements/base.in
 django-choices==1.7.2
-    # via zgw-consumers
+    # via django-simple-certmanager
 django-cors-headers==4.3.0
     # via -r requirements/base.in
 django-filter==21.1
@@ -104,12 +103,12 @@ django-ipware==4.0.2
     # via django-axes
 django-jsonform==2.21.5
     # via mozilla-django-oidc-db
-django-log-outgoing-requests==0.4.0
+django-log-outgoing-requests==0.6.1
     # via -r requirements/base.in
 django-ordered-model==3.5
     # via django-admin-index
 django-privates==1.3.0
-    # via zgw-consumers
+    # via django-simple-certmanager
 django-redis==5.4.0
     # via -r requirements/base.in
 django-relativedelta==2.0.0
@@ -120,27 +119,29 @@ django-sendfile2==0.7.0
     # via django-privates
 django-setup-configuration==0.1.0
     # via -r requirements/base.in
+django-simple-certmanager==1.1.2
+    # via zgw-consumers
 django-solo==2.0.0
     # via
     #   commonground-api-common
     #   django-log-outgoing-requests
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
-djangorestframework==3.12.4
+djangorestframework==3.14.0
     # via
     #   -r requirements/base.in
     #   commonground-api-common
     #   drf-nested-routers
     #   drf-yasg
     #   notifications-api-common
-djangorestframework-camel-case==1.2.0
+djangorestframework-camel-case==1.4.2
     # via
     #   commonground-api-common
     #   notifications-api-common
 drf-nested-routers==0.93.4
     # via commonground-api-common
-drf-yasg==1.20.0
+drf-yasg==1.21.7
     # via commonground-api-common
 ecs-logging==2.0.2
     # via elastic-apm
@@ -154,7 +155,7 @@ flower==2.0.1
     # via -r requirements/base.in
 furl==2.1.3
     # via -r requirements/base.in
-gemma-zds-client==0.15.0
+gemma-zds-client==1.0.1
     # via
     #   -r requirements/base.in
     #   commonground-api-common
@@ -184,9 +185,9 @@ markdown==3.3.6
     # via -r requirements/base.in
 markupsafe==2.1.1
     # via jinja2
-mozilla-django-oidc==4.0.0
+mozilla-django-oidc==4.0.1
     # via mozilla-django-oidc-db
-mozilla-django-oidc-db==0.14.1
+mozilla-django-oidc-db==0.15.0
     # via -r requirements/base.in
 notifications-api-common==0.2.2
     # via commonground-api-common
@@ -200,7 +201,7 @@ prometheus-client==0.11.0
     # via flower
 prompt-toolkit==3.0.20
     # via click-repl
-psycopg2==2.9.3
+psycopg==3.1.18
     # via -r requirements/base.in
 pycparser==2.21
     # via cffi
@@ -210,6 +211,7 @@ pyjwt==2.4.0
     #   gemma-zds-client
 pyopenssl==23.3.0
     # via
+    #   django-simple-certmanager
     #   josepy
     #   zgw-consumers
 python-dateutil==2.8.2
@@ -224,10 +226,12 @@ pytz==2022.6
     # via
     #   -r requirements/base.in
     #   celery
-    #   django
+    #   djangorestframework
+    #   drf-yasg
     #   flower
 pyyaml==6.0.1
     # via
+    #   drf-yasg
     #   gemma-zds-client
     #   oyaml
 redis==5.0.1
@@ -241,12 +245,8 @@ requests==2.31.0
     #   mozilla-django-oidc
     #   requests-mock
     #   zgw-consumers
-requests-mock==1.9.3
+requests-mock==1.12.1
     # via zgw-consumers
-ruamel-yaml==0.17.21
-    # via drf-yasg
-ruamel-yaml-clib==0.2.6
-    # via ruamel-yaml
 self-certifi==1.0.0
     # via -r requirements/base.in
 sentry-sdk==1.34.0
@@ -260,13 +260,14 @@ six==1.16.0
     #   isodate
     #   orderedmultidict
     #   python-dateutil
-    #   requests-mock
 sqlparse==0.4.4
     # via django
 tornado==6.3.3
     # via flower
 typing-extensions==4.10.0
-    # via asgiref
+    # via
+    #   asgiref
+    #   psycopg
 uritemplate==3.0.0
     # via
     #   coreapi
@@ -289,7 +290,7 @@ webencodings==0.5.1
     # via bleach
 wrapt==1.14.1
     # via elastic-apm
-zgw-consumers==0.20.0
+zgw-consumers==0.27.0
     # via notifications-api-common
 
 # The following packages are considered to be unsafe in a requirements file: