Merge pull request #114 from open-zaak/feature/1512-full-update

Feature/1512 full update

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '16'
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: pip install -r requirements/dev.txt pytest
       - name: Build and test docs

.github/workflows/code_quality.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: pip install -r requirements/ci.txt
       - name: Run isort
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: pip install -r requirements/ci.txt
       - name: Run black
@@ -49,22 +49,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: pip install -r requirements/ci.txt
       - name: Run flake8
         run: flake8 src
-
-  # spdx:
-  #   name: SPDX header check
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/setup-python@v2
-  #       with:
-  #         python-version: '3.9'
-  #     - name: Install dependencies
-  #       run: pip install -r requirements/ci.txt
-  #     - name: Run check
-  #       run: ./bin/check_spdx.py src

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1 - Compile needed python dependencies
-FROM python:3.9-slim-bullseye AS build
+FROM python:3.10-slim-bookworm AS build
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
         build-essential \
@@ -9,12 +9,12 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
 WORKDIR /app
 
 COPY ./requirements /app/requirements
-RUN pip install pip setuptools -U
+RUN pip install pip -U
 RUN pip install -r requirements/production.txt
 
 
 # Stage 2 - build frontend
-FROM node:16-bullseye-slim AS frontend-build
+FROM node:16-bookworm-slim AS frontend-build
 
 WORKDIR /app
 
@@ -29,18 +29,19 @@ RUN npm run build
 
 
 # Stage 3 - Build docker image suitable for execution and deployment
-FROM python:3.9-slim-bullseye AS production
+FROM python:3.10-slim-bookworm AS production
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
         media-types \
         procps \
         nano \
         postgresql-client \
-        netcat \
     && rm -rf /var/lib/apt/lists/*
 
+RUN pip install pip -U
+
 # Stage 3.1 - Set up the needed production dependencies
-COPY --from=build /usr/local/lib/python3.9 /usr/local/lib/python3.9
+COPY --from=build /usr/local/lib/python3.10 /usr/local/lib/python3.10
 COPY --from=build /usr/local/bin/uwsgi /usr/local/bin/uwsgi
 COPY --from=build /usr/local/bin/celery /usr/local/bin/celery
 

README.rst

@@ -5,7 +5,7 @@ Open Notificaties
 :Version: 1.4.3
 :Source: https://github.com/open-zaak/open-notificaties
 :Keywords: zaken, zaakgericht werken, GEMMA, notificaties
-:PythonVersion: 3.9
+:PythonVersion: 3.10
 
 |build-status| |docs| |coverage| |black| |docker|
 

requirements/base.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    ./bin/compile_dependencies.sh
@@ -24,6 +24,7 @@ celery==5.2.6
     # via
     #   -r requirements/base.in
     #   flower
+    #   notifications-api-common
 certifi==2023.7.22
     # via
     #   elastic-apm
@@ -46,10 +47,12 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
     # via celery
-commonground-api-common==1.10.1
+commonground-api-common==1.12.0
     # via -r requirements/base.in
 coreapi==2.3.3
-    # via drf-yasg
+    # via
+    #   commonground-api-common
+    #   drf-yasg
 coreschema==0.0.4
     # via
     #   coreapi
@@ -102,7 +105,6 @@ django-better-admin-arrayfield==1.4.2
 django-choices==1.7.2
     # via
     #   -r requirements/base.in
-    #   commonground-api-common
     #   zgw-consumers
 django-cors-headers==3.11.0
     # via -r requirements/base.in
@@ -171,8 +173,6 @@ humanize==4.0.0
     # via flower
 idna==3.3
     # via requests
-importlib-metadata==6.8.0
-    # via markdown
 inflection==0.5.1
     # via drf-yasg
 iso-639==0.4.5
@@ -195,7 +195,7 @@ mozilla-django-oidc==2.0.0
     # via mozilla-django-oidc-db
 mozilla-django-oidc-db==0.12.0
     # via -r requirements/base.in
-notifications-api-common==0.1.0
+notifications-api-common==0.2.2
     # via commonground-api-common
 oyaml==1.0
     # via commonground-api-common
@@ -298,8 +298,6 @@ wrapt==1.14.1
     # via elastic-apm
 zgw-consumers==0.20.0
     # via notifications-api-common
-zipp==3.17.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/ci.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    ./bin/compile_dependencies.sh
@@ -20,7 +20,7 @@ attrs==21.4.0
     # via
     #   -r requirements/base.txt
     #   glom
-beautifulsoup4==4.8.1
+beautifulsoup4==4.12.2
     # via webtest
 billiard==3.6.4.0
     # via
@@ -39,6 +39,7 @@ celery==5.2.6
     # via
     #   -r requirements/base.txt
     #   flower
+    #   notifications-api-common
 certifi==2023.7.22
     # via
     #   -r requirements/base.txt
@@ -74,11 +75,12 @@ click-repl==0.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-commonground-api-common==1.10.1
+commonground-api-common==1.12.0
     # via -r requirements/base.txt
 coreapi==2.3.3
     # via
     #   -r requirements/base.txt
+    #   commonground-api-common
     #   drf-yasg
 coreschema==0.0.4
     # via
@@ -142,7 +144,6 @@ django-better-admin-arrayfield==1.4.2
 django-choices==1.7.2
     # via
     #   -r requirements/base.txt
-    #   commonground-api-common
     #   zgw-consumers
 django-cors-headers==3.11.0
     # via -r requirements/base.txt
@@ -252,10 +253,6 @@ idna==3.3
     # via
     #   -r requirements/base.txt
     #   requests
-importlib-metadata==6.8.0
-    # via
-    #   -r requirements/base.txt
-    #   markdown
 inflection==0.5.1
     # via
     #   -r requirements/base.txt
@@ -302,7 +299,7 @@ mozilla-django-oidc-db==0.12.0
     # via -r requirements/base.txt
 mypy-extensions==0.4.3
     # via black
-notifications-api-common==0.1.0
+notifications-api-common==0.2.2
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
@@ -474,10 +471,6 @@ zgw-consumers==0.20.0
     # via
     #   -r requirements/base.txt
     #   notifications-api-common
-zipp==3.17.0
-    # via
-    #   -r requirements/base.txt
-    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    ./bin/compile_dependencies.sh
@@ -24,7 +24,7 @@ attrs==21.4.0
     #   glom
 babel==2.13.1
     # via sphinx
-beautifulsoup4==4.8.1
+beautifulsoup4==4.12.2
     # via
     #   -r requirements/ci.txt
     #   webtest
@@ -41,12 +41,15 @@ boltons==21.0.0
     #   -r requirements/ci.txt
     #   face
     #   glom
+build==1.0.3
+    # via pip-tools
 bump2version==1.0.1
     # via -r requirements/dev.in
 celery==5.2.6
     # via
     #   -r requirements/ci.txt
     #   flower
+    #   notifications-api-common
 certifi==2023.7.22
     # via
     #   -r requirements/ci.txt
@@ -83,13 +86,14 @@ click-repl==0.2.0
     # via
     #   -r requirements/ci.txt
     #   celery
-commonground-api-common==1.10.1
+commonground-api-common==1.12.0
     # via -r requirements/ci.txt
 commonmark==0.9.1
     # via recommonmark
 coreapi==2.3.3
     # via
     #   -r requirements/ci.txt
+    #   commonground-api-common
     #   drf-yasg
 coreschema==0.0.4
     # via
@@ -155,7 +159,6 @@ django-better-admin-arrayfield==1.4.2
 django-choices==1.7.2
     # via
     #   -r requirements/ci.txt
-    #   commonground-api-common
     #   zgw-consumers
 django-cors-headers==3.11.0
     # via -r requirements/ci.txt
@@ -281,11 +284,6 @@ idna==3.3
     #   requests
 imagesize==1.1.0
     # via sphinx
-importlib-metadata==6.8.0
-    # via
-    #   -r requirements/ci.txt
-    #   markdown
-    #   sphinx
 inflection==0.5.1
     # via
     #   -r requirements/ci.txt
@@ -337,7 +335,7 @@ mypy-extensions==0.4.3
     # via
     #   -r requirements/ci.txt
     #   black
-notifications-api-common==0.1.0
+notifications-api-common==0.2.2
     # via
     #   -r requirements/ci.txt
     #   commonground-api-common
@@ -348,15 +346,14 @@ oyaml==1.0
 packaging==21.3
     # via
     #   -r requirements/ci.txt
+    #   build
     #   drf-yasg
     #   sphinx
 pathspec==0.9.0
     # via
     #   -r requirements/ci.txt
     #   black
-pep517==0.10.0
-    # via pip-tools
-pip-tools==6.5.1
+pip-tools==7.3.0
     # via -r requirements/dev.in
 platformdirs==2.3.0
     # via
@@ -403,6 +400,8 @@ pyparsing==2.4.1.1
     # via
     #   -r requirements/ci.txt
     #   packaging
+pyproject-hooks==1.0.0
+    # via build
 python-dateutil==2.8.2
     # via
     #   -r requirements/ci.txt
@@ -509,12 +508,13 @@ sqlparse==0.4.4
     #   django-debug-toolbar
 tblib==1.7.0
     # via -r requirements/ci.txt
-toml==0.10.2
-    # via pep517
 tomli==1.2.1
     # via
     #   -r requirements/ci.txt
     #   black
+    #   build
+    #   pip-tools
+    #   pyproject-hooks
 tornado==6.3.3
     # via
     #   -r requirements/ci.txt
@@ -573,10 +573,6 @@ zgw-consumers==0.20.0
     # via
     #   -r requirements/ci.txt
     #   notifications-api-common
-zipp==3.17.0
-    # via
-    #   -r requirements/ci.txt
-    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip