Merge pull request #125 from open-zaak/chore/124-upgrade

Prepare upgrade to Django 4.2

.github/workflows/ci.yml

@@ -37,11 +37,11 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-      - uses: actions/setup-node@v2-beta
+      - uses: actions/setup-node@v4
         with:
           node-version: '16'
 
@@ -62,15 +62,15 @@ jobs:
           coverage run src/manage.py test src
 
       - name: Publish coverage report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
 
   docs:
     runs-on: ubuntu-latest
     name: Documentation build
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install dependencies
@@ -83,7 +83,7 @@ jobs:
     name: Docker image build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Determine tag/commit hash
         id: vars
         run: |
@@ -107,7 +107,7 @@ jobs:
             .
       - run: docker image save -o image.tar $IMAGE_NAME:${{ steps.vars.outputs.tag }}
       - name: Store image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: docker-image
           path: image.tar
@@ -121,7 +121,7 @@ jobs:
 
     steps:
       - name: Download built image
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docker-image
       - name: Scan image with Trivy
@@ -146,9 +146,9 @@ jobs:
     if: github.event_name == 'push'  # exclude PRs/forks
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Download built image
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: docker-image
 

.github/workflows/code_quality.yml

@@ -18,8 +18,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install dependencies
@@ -32,8 +32,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install dependencies
@@ -46,8 +46,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install dependencies

.github/workflows/codeql-analysis.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

requirements/base.in

@@ -12,10 +12,8 @@ furl
 
 # Framework libraries
 Django ~= 3.2.0
-django-axes
-django-choices
+django-axes[ipware]
 django-cors-headers
-django-markup
 django-redis
 django-setup-configuration
 
@@ -32,4 +30,4 @@ django-log-outgoing-requests
 # WSGI servers & monitoring - production oriented
 uwsgi
 sentry-sdk
-elastic-apm
+elastic-apm

requirements/base.txt

@@ -6,7 +6,7 @@
 #
 amqp==5.1.0
     # via kombu
-asgiref==3.5.0
+asgiref==3.8.1
     # via django
 async-timeout==4.0.2
     # via redis
@@ -74,7 +74,6 @@ django==3.2.24
     #   django-filter
     #   django-jsonform
     #   django-log-outgoing-requests
-    #   django-markup
     #   django-privates
     #   django-redis
     #   django-relativedelta
@@ -89,17 +88,15 @@ django==3.2.24
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
-django-admin-index==2.0.0
+django-admin-index==3.1.1
     # via -r requirements/base.in
 django-appconf==1.0.5
     # via django-log-outgoing-requests
-django-axes==5.31.0
+django-axes[ipware]==6.4.0
     # via -r requirements/base.in
 django-choices==1.7.2
-    # via
-    #   -r requirements/base.in
-    #   zgw-consumers
-django-cors-headers==3.11.0
+    # via zgw-consumers
+django-cors-headers==4.3.0
     # via -r requirements/base.in
 django-filter==21.1
     # via commonground-api-common
@@ -109,15 +106,13 @@ django-jsonform==2.21.5
     # via mozilla-django-oidc-db
 django-log-outgoing-requests==0.4.0
     # via -r requirements/base.in
-django-markup==1.5
-    # via -r requirements/base.in
 django-ordered-model==3.5
     # via django-admin-index
 django-privates==1.3.0
     # via zgw-consumers
-django-redis==5.2.0
+django-redis==5.4.0
     # via -r requirements/base.in
-django-relativedelta==1.1.2
+django-relativedelta==2.0.0
     # via zgw-consumers
 django-rest-framework-condition==0.1.1
     # via commonground-api-common
@@ -199,7 +194,7 @@ orderedmultidict==1.0.1
     # via furl
 oyaml==1.0
     # via commonground-api-common
-packaging==21.3
+packaging==23.2
     # via drf-yasg
 prometheus-client==0.11.0
     # via flower
@@ -217,8 +212,6 @@ pyopenssl==23.3.0
     # via
     #   josepy
     #   zgw-consumers
-pyparsing==2.4.1.1
-    # via packaging
 python-dateutil==2.8.2
     # via
     #   django-relativedelta
@@ -272,6 +265,8 @@ sqlparse==0.4.4
     # via django
 tornado==6.3.3
     # via flower
+typing-extensions==4.10.0
+    # via asgiref
 uritemplate==3.0.0
     # via
     #   coreapi

requirements/ci.txt

@@ -8,7 +8,7 @@ amqp==5.1.0
     # via
     #   -r requirements/base.txt
     #   kombu
-asgiref==3.5.0
+asgiref==3.8.1
     # via
     #   -r requirements/base.txt
     #   django
@@ -26,7 +26,7 @@ billiard==3.6.4.0
     # via
     #   -r requirements/base.txt
     #   celery
-black==21.9b0
+black==24.3.0
     # via -r requirements/test-tools.in
 bleach==5.0.1
     # via -r requirements/base.txt
@@ -107,7 +107,6 @@ django==3.2.24
     #   django-filter
     #   django-jsonform
     #   django-log-outgoing-requests
-    #   django-markup
     #   django-privates
     #   django-redis
     #   django-relativedelta
@@ -122,19 +121,19 @@ django==3.2.24
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
-django-admin-index==2.0.0
+django-admin-index==3.1.1
     # via -r requirements/base.txt
 django-appconf==1.0.5
     # via
     #   -r requirements/base.txt
     #   django-log-outgoing-requests
-django-axes==5.31.0
+django-axes[ipware]==6.4.0
     # via -r requirements/base.txt
 django-choices==1.7.2
     # via
     #   -r requirements/base.txt
     #   zgw-consumers
-django-cors-headers==3.11.0
+django-cors-headers==4.3.0
     # via -r requirements/base.txt
 django-filter==21.1
     # via
@@ -150,8 +149,6 @@ django-jsonform==2.21.5
     #   mozilla-django-oidc-db
 django-log-outgoing-requests==0.4.0
     # via -r requirements/base.txt
-django-markup==1.5
-    # via -r requirements/base.txt
 django-ordered-model==3.5
     # via
     #   -r requirements/base.txt
@@ -160,9 +157,9 @@ django-privates==1.3.0
     # via
     #   -r requirements/base.txt
     #   zgw-consumers
-django-redis==5.2.0
+django-redis==5.4.0
     # via -r requirements/base.txt
-django-relativedelta==1.1.2
+django-relativedelta==2.0.0
     # via
     #   -r requirements/base.txt
     #   zgw-consumers
@@ -223,11 +220,11 @@ faker==13.15.1
     #   -r requirements/base.txt
     #   factory-boy
     #   zgw-consumers
-flake8==3.8.4
+flake8==7.0.0
     # via -r requirements/test-tools.in
 flower==2.0.1
     # via -r requirements/base.txt
-freezegun==1.2.1
+freezegun==1.4.0
     # via -r requirements/test-tools.in
 furl==2.1.3
     # via -r requirements/base.txt
@@ -261,7 +258,7 @@ isodate==0.6.1
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-isort==5.9.3
+isort==5.13.2
     # via -r requirements/test-tools.in
 itypes==1.2.0
     # via
@@ -285,7 +282,7 @@ markupsafe==2.1.1
     # via
     #   -r requirements/base.txt
     #   jinja2
-mccabe==0.6.1
+mccabe==0.7.0
     # via flake8
 mozilla-django-oidc==4.0.0
     # via
@@ -307,9 +304,10 @@ oyaml==1.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-packaging==21.3
+packaging==23.2
     # via
     #   -r requirements/base.txt
+    #   black
     #   drf-yasg
 pathspec==0.9.0
     # via black
@@ -325,13 +323,13 @@ prompt-toolkit==3.0.20
     #   click-repl
 psycopg2==2.9.3
     # via -r requirements/base.txt
-pycodestyle==2.6.0
+pycodestyle==2.11.1
     # via flake8
 pycparser==2.21
     # via
     #   -r requirements/base.txt
     #   cffi
-pyflakes==2.2.0
+pyflakes==3.2.0
     # via flake8
 pyjwt==2.4.0
     # via
@@ -343,10 +341,6 @@ pyopenssl==23.3.0
     #   -r requirements/base.txt
     #   josepy
     #   zgw-consumers
-pyparsing==2.4.1.1
-    # via
-    #   -r requirements/base.txt
-    #   packaging
 python-dateutil==2.8.2
     # via
     #   -r requirements/base.txt
@@ -372,8 +366,6 @@ redis==5.0.1
     # via
     #   -r requirements/base.txt
     #   django-redis
-regex==2020.10.28
-    # via black
 requests==2.31.0
     # via
     #   -r requirements/base.txt
@@ -426,8 +418,11 @@ tornado==6.3.3
     # via
     #   -r requirements/base.txt
     #   flower
-typing-extensions==4.1.1
-    # via black
+typing-extensions==4.10.0
+    # via
+    #   -r requirements/base.txt
+    #   asgiref
+    #   black
 uritemplate==3.0.0
     # via
     #   -r requirements/base.txt