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

update system and python
open-zaak · Nov 28, 2023 · e35a869 · e35a869
2 parents 6d1599e + 223cbb5
commit e35a869
Show file tree

Hide file tree

Showing 15 changed files with 124 additions and 167 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - uses: actions/setup-node@v3
@@ -155,7 +155,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - uses: actions/setup-node@v3
@@ -205,7 +205,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Install dependencies

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Install dependencies
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Install dependencies
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Install dependencies
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Install dependencies
@@ -98,7 +98,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Install system packages

diff --git a/Dockerfile b/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 \
         pkg-config \
@@ -10,12 +10,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
 
@@ -34,9 +34,7 @@ RUN npm run build
 
 
 # Stage 3 - Build docker image suitable for execution and deployment
-# bullseye will likely require django 3.2+ for the geolib support, see
-# https://docs.djangoproject.com/en/2.2/ref/contrib/gis/install/geolibs/
-FROM python:3.9-slim-bullseye AS production
+FROM python:3.10-slim-bookworm AS production
 
 # Stage 3.1 - Set up the needed production dependencies
 # install all the dependencies for GeoDjango
@@ -72,7 +70,7 @@ RUN mkdir /app/log /app/config /app/media /app/private-media
 VOLUME ["/app/log", "/app/media", "/app/private-media"]
 
 # copy backend build deps
-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
 

diff --git a/README.en.md b/README.en.md
@@ -9,7 +9,7 @@
 | **Version:** | 1.10.0 |
 | **Source:** | https://github.com/open-zaak/open-zaak |
 | **Keywords:** | zaken, zaakgericht werken, zaken-api, catalogi-api, besluiten-api, documenten-api |
-| **PythonVersion:** | 3.9 |
+| **PythonVersion:** | 3.10 |
 
 [![API test platform](https://shields.api-test.nl/endpoint.svg?url=https%3A//api-test.nl/api/v1/provider-latest-badge/14bc91f7-7d8b-4bba-a020-a6c316655e65/)](https://api-test.nl/server/1/6b5fe675-694d-4948-8896-5eae88d30ef0/14bc91f7-7d8b-4bba-a020-a6c316655e65/latest/)
 [![Build status](https://github.com/open-zaak/open-zaak/workflows/Run%20CI/badge.svg)](https://github.com/open-zaak/open-zaak/actions?query=workflow%3A%22Run+CI%22)

diff --git a/README.rst b/README.rst
@@ -10,7 +10,7 @@ Open Zaak
 :Version: 1.10.0
 :Source: https://github.com/open-zaak/open-zaak
 :Keywords: zaken, zaakgericht werken, zaken-api, catalogi-api, besluiten-api, documenten-api
-:PythonVersion: 3.9
+:PythonVersion: 3.10
 
 |atp| |build-status| |docs| |coverage| |code-quality| |black| |docker|
 

diff --git a/docs/development/getting_started.rst b/docs/development/getting_started.rst
@@ -18,7 +18,7 @@ Prerequisites
 
 You need the following libraries and/or programs:
 
-* `Python`_ 3.9
+* `Python`_ 3.10
 * Python `Virtualenv`_ and `Pip`_ 20.0 or above
 * `PostgreSQL`_ 10.0 or above, with the `PostGIS-extension`_
 * `Node.js`_ 16.0 or above

diff --git a/docs/installation/single_server.rst b/docs/installation/single_server.rst
@@ -63,7 +63,7 @@ for deployment.
 
 Currently the following OS flavours are supported:
 
-- Debian: bullseye (11), buster (10, actively supported), stretch (9)
+- Debian: bookworm (12), bullseye (11), buster (10, actively supported), stretch (9)
 - Ubuntu: bionic (18.04 LTS) - focal (20.04 LTS) and jammy (22.04 LTS) are not tested
   yet
 - SUSE Enterprise Linux: 15 (actively supported)

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -57,7 +57,7 @@ click-repl==0.2.0
     # via celery
 cmislib-maykin==0.7.4
     # via drc-cmis
-commonground-api-common==1.11.0
+commonground-api-common==1.12.0
     # via
     #   -r requirements/base.in
     #   drc-cmis
@@ -203,7 +203,7 @@ face==20.1.1
     # via glom
 faker==19.11.0
     # via zgw-consumers
-flower==1.2.0
+flower==2.0.1
     # via -r requirements/base.in
 furl==2.1.3
     # via drc-cmis

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -90,7 +90,7 @@ cmislib-maykin==0.7.4
     # via
     #   -r requirements/base.txt
     #   drc-cmis
-commonground-api-common==1.11.0
+commonground-api-common==1.12.0
     # via
     #   -r requirements/base.txt
     #   drc-cmis
@@ -269,7 +269,7 @@ faker==19.11.0
     #   zgw-consumers
 flake8==3.8.3
     # via -r requirements/test-tools.in
-flower==1.2.0
+flower==2.0.1
     # via -r requirements/base.txt
 freezegun==1.2.1
     # via -r requirements/test-tools.in

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -107,7 +107,7 @@ cmislib-maykin==0.7.4
     # via
     #   -r requirements/ci.txt
     #   drc-cmis
-commonground-api-common==1.11.0
+commonground-api-common==1.12.0
     # via
     #   -r requirements/ci.txt
     #   drc-cmis
@@ -304,7 +304,7 @@ faker==19.11.0
     #   zgw-consumers
 flake8==3.8.3
     # via -r requirements/ci.txt
-flower==1.2.0
+flower==2.0.1
     # via -r requirements/ci.txt
 freezegun==1.2.1
     # via -r requirements/ci.txt

diff --git a/src/openzaak/sass/components/_all.scss b/src/openzaak/sass/components/_all.scss
@@ -1,3 +1,3 @@
 /* SPDX-License-Identifier: EUPL-1.2 */
 /* Copyright (C) 2019 - 2020 Dimpact */
-// no components defined yet...
+// no components defined yet...
diff --git a/src/openzaak/templates/index.html b/src/openzaak/templates/index.html
@@ -4,90 +4,71 @@
 
 {% block content %}
 
-  <div class="px-3 py-3 pt-md-5 pb-md-4 mx-auto text-center">
-    <h1 class="display-4">{{ settings.PROJECT_NAME }} startpunt</h1>
-    <p class="lead">{{ settings.SITE_TITLE }}</p>
+  <div class="header">
+    <h1 class="header__title">{{ settings.PROJECT_NAME }} startpunt</h1>
+    <p class="header__description">{{ settings.SITE_TITLE }}</p>
   </div>
 
-  <div class="container text-center">
+  <div class="container container--center">
 
     {% block docs %}
+      <h2>{{ component|capfirst }}</h2>
 
-  <h2>{{ component|capfirst }}</h2>
-
-      <div class="row justify-content-md-center">
+      <div class="cardlist">
 
         {% block docs_oas %}
-          <div class="col-sm-4">
-
+          <div class="cardlist__item">
             <div class="card">
-              <div class="card-body">
-                <h5 class="card-title"><i class="fas fa-wifi"></i> API specificatie</h5>
-                <p class="card-text">Technische API documentatie in de vorm van een Open API Specificatie (OAS).</p>
-                <a href="{% url "schema-redoc-"|add:component version=1 %}" class="btn btn-primary">API specificaties</a>
-              </div>
+              <h5 class="card__title"><i class="fas fa-wifi"></i> API specificatie</h5>
+              <p>Technische API documentatie in de vorm van een Open API Specificatie (OAS).</p>
+              <a href="{% url "schema-redoc-"|add:component version=1 %}" class="button button--primary">API specificaties</a>
             </div>
-
           </div>
         {% endblock %}
 
         {% block docs_scopes %}
-          <div class="col-sm-4">
-
+          <div class="cardlist__item">
             <div class="card">
-              <div class="card-body">
-                <h5 class="card-title"><i class="fas fa-shield-alt"></i> API scopes</h5>
-                <p class="card-text">Alle scopes binnen deze API voor gebruik in JWT's t.b.v. autorisaties.</p>
-                <a href="{% url 'vng_api_common:scopes' %}" class="btn btn-primary">API scopes</a>
-              </div>
+              <h5 class="card__title"><i class="fas fa-shield-alt"></i> API scopes</h5>
+              <p>Alle scopes binnen deze API voor gebruik in JWT's t.b.v. autorisaties.</p>
+              <a href="{% url 'vng_api_common:scopes' %}" class="button button--primary">API scopes</a>
             </div>
-
           </div>
         {% endblock %}
 
         {% block extra_docs %}
-            <div class="col-sm-4">
-
-                <div class="card">
-                    <div class="card-body">
-                        <h5 class="card-title"><i class="fas fa-bullhorn"></i> Notificaties</h5>
-                        <p class="card-text">Gebeurtenissen waarover dit component notificaties verstuurt.</p>
-                        <a href="https://github.com/VNG-Realisatie/{{ component }}-api/blob/{{ github_ref }}/src/notificaties.md" class="btn btn-primary">Notificaties</a>
-                    </div>
-                </div>
-
+          <div class="cardlist__item">
+            <div class="card">
+              <h5 class="card__title"><i class="fas fa-bullhorn"></i> Notificaties</h5>
+              <p>Gebeurtenissen waarover dit component notificaties verstuurt.</p>
+              <a href="https://github.com/VNG-Realisatie/{{ component }}-api/blob/{{ github_ref }}/src/notificaties.md" class="button button--primary">Notificaties</a>
             </div>
+          </div>
         {% endblock %}
 
      </div>
-     <p></p>
 
     {% endblock %}
 
     {% block extra_content %}
-      <div class="row justify-content-md-center">
-        <div class="col-sm-4 .col-sm-offset-4">
-
+      <div class="cardlist">
+        <div class="cardlist__item">
           <div class="card">
-            <div class="card-body">
-              <h5 class="card-title"><i class="fas fa-cogs"></i> Runtime gedrag</h5>
-              <p class="card-text">Beschrijving van de business logica (VNG Standaard).</p>
-              <a href="https://vng-realisatie.github.io/gemma-zaken/standaard/{{ component }}/" class="btn btn-primary">
+              <h5 class="card__title"><i class="fas fa-cogs"></i> Runtime gedrag</h5>
+              <p>Beschrijving van de business logica (VNG Standaard).</p>
+              <a href="https://vng-realisatie.github.io/gemma-zaken/standaard/{{ component }}/" class="button button--primary">
                 {{ component|capfirst }} API
                 &nbsp;&nbsp;
                 <i class="fas fa-external-link-alt"></i>
             </a>
-            </div>
           </div>
-
         </div>
       </div>
     {% endblock %}
 
     {% block admin_link %}
-      <p></p>
       <p>
-        <a href="{% url 'admin:index' %}" class="btn btn-sm btn-danger"><i class="fas fa-lock"></i> Beheer</a>
+        <a href="{% url 'admin:index' %}" class="button button--alert"><i class="fas fa-lock"></i> Beheer</a>
       </p>
     {% endblock %}