Merge pull request 'Update dependency flask-migrate to v4' (!111) from renovate/flask-migrate-4.x into main

Reviewed-on: #111

.drone.yml

@@ -15,17 +15,28 @@ trigger:
 
 steps:
   - name: install-lint-test
-    image: python:3.8.18-alpine
+    image: python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba
     env:
       PYROOT: '/pyroot'
       PYTHONUSERBASE: '/pyroot'
     commands:
       - apk add --no-cache gcc g++ musl-dev python3-dev
       - pip3 install pipenv
+      - pipenv verify
       - pipenv install --dev
       - pipenv run flake8
       - pipenv run reuse lint
       - pipenv run python -m unittest discover ki
+  - name: docker-dry-run
+    image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
+    settings:
+      registry: git.wtf-eg.de
+      repo: git.wtf-eg.de/kompetenzinventar/backend
+      target: ki-backend
+      dry_run: true
+    when:
+      event:
+        - pull_request
 
 ---
 kind: pipeline
@@ -43,7 +54,7 @@ depends_on:
 
 steps:
   - name: docker-publish
-    image: plugins/docker:20.17.3
+    image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
     settings:
       registry: git.wtf-eg.de
       repo: git.wtf-eg.de/kompetenzinventar/backend
@@ -70,7 +81,7 @@ depends_on:
 
 steps:
   - name: deploy-dev
-    image: appleboy/drone-ssh:1.7.5
+    image: appleboy/drone-ssh:1.7.5@sha256:995677e073454912f26d4c0fdd2f9df2e1f5a30d6603d3f2ece667311b6babb3
     settings:
       host:
         - dev01.wtf-eg.net
@@ -93,7 +104,7 @@ trigger:
 
 steps:
   - name: install-lint-test
-    image: python:3.8.18-alpine
+    image: python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba
     env:
       PYROOT: '/pyroot'
       PYTHONUSERBASE: '/pyroot'
@@ -105,7 +116,7 @@ steps:
       - pipenv run reuse lint
       - pipenv run python -m unittest discover ki
   - name: docker-publish
-    image: plugins/docker:20.17.3
+    image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
     settings:
       registry: git.wtf-eg.de
       repo: git.wtf-eg.de/kompetenzinventar/backend

.python-version

@@ -0,0 +1 @@
+3.8.20

.reuse/dep5

@@ -1,16 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Kompetenzinventar
-Upstream-Contact: Michael Weimann <mail@michael-weimann.eu>
-Source: https://git.wtf-eg.de/kompetenzinventar/ki-backend
-
-Files: data/imgs/flags/*
-Copyright: 2013 Panayiotis Lipiridis <https://flagicons.lipis.dev/>
-License: MIT
-
-Files: Pipfile.lock migrations/*
-Copyright: WTF Kooperative eG <https://wtf-eg.de/>
-License: AGPL-3.0-or-later
-
-Files: renovate.json
-Copyright: WTF Kooperative eG <https://wtf-eg.de/>
-License: AGPL-3.0-or-later

.yapfignore

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+migrations/*.py

Dockerfile

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-FROM python:3.8.18-alpine AS builder
+FROM python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba AS builder
 
 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT
@@ -20,7 +20,7 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
 RUN pip3 uninstall --yes pipenv
 
 
-FROM python:3.8.18-alpine AS ki-backend
+FROM python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba AS ki-backend
 
 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT

Pipfile

@@ -8,22 +8,23 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-flask = "~=2.0.1"
+flask = "==2.3.3"
-python-dotenv = "~=0.17.1"
+python-dotenv = "==1.0.1"
-flask-migrate = "~=3.0.1"
+flask-migrate = "==4.0.7"
-flask-sqlalchemy  = "~=2.5.1"
+flask-sqlalchemy  = "==2.5.1"
-sqlalchemy = "~=1.4.18"
+sqlalchemy = "==1.4.54"
-waitress = "~=2.0.0"
+waitress = "==2.1.2"
-pyyaml = "~=6.0.1"
+pyyaml = "==6.0.2"
-flask-cors = "~=3.0.10"
+flask-cors = "==5.0.0"
-ldap3 = "~=2.9"
+ldap3 = "==2.9.1"
-pymysql = "~=1.0.2"
+pymysql = "==1.1.1"
+werkzeug = "==2.3.8"
 
 [dev-packages]
-flake8 = "~=3.9.2"
+flake8 = "==7.1.1"
-yapf = "~=0.31.0"
+yapf = "==0.40.2"
-pre-commit = "~=2.13.0"
+pre-commit = "==2.21.0"
-reuse = "~=0.13.0"
+reuse = "==4.0.3"
 
 [requires]
 python_version = "3.8"

REUSE.toml

@@ -0,0 +1,24 @@
+# SPDX-FileCopyrightText: NONE
+# SPDX-License-Identifier: CC0-1.0
+
+version = 1
+SPDX-PackageName = "Kompetenzinventar Backend"
+SPDX-PackageDownloadLocation = "https://git.wtf-eg.de/kompetenzinventar/ki-backend"
+
+[[annotations]]
+path = "data/imgs/flags/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2013 Panayiotis Lipiridis <https://flagicons.lipis.dev/>"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ["Pipfile.lock", "migrations/**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = ["renovate.json", ".python-version"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
+SPDX-License-Identifier = "AGPL-3.0-or-later"

ki/routes.py

@@ -17,6 +17,7 @@ content_type_png = "image/png"
 
 
 def token_auth(func):
+
     @wraps(func)
     def _token_auth(*args, **kwargs):
         auth_header = request.headers.get("Authorization")

ki/test/test_contacttypes_endpoint.py

@@ -8,6 +8,7 @@ from ki.test.ApiTest import ApiTest
 
 
 class TestContactTypesEndpoint(ApiTest):
+
     def test_skills_options(self):
         response = self.client.options("/contacttypes")
         self.assertEqual(response.status_code, 200)

ki/test/test_find_profiles_endpoint.py

@@ -8,6 +8,7 @@ from ki.test.ApiTest import ApiTest
 
 
 class TestFindProfilesEndpoint(ApiTest):
+
     def test_find_profiles_options(self):
         response = self.client.options("/users/profiles")
         self.assertEqual(response.status_code, 200)

ki/test/test_languages_endpoint.py

@@ -8,6 +8,7 @@ from ki.test.ApiTest import ApiTest
 
 
 class TestLanguagesEndpoint(ApiTest):
+
     def test_skills_options(self):
         response = self.client.options("/languages")
         self.assertEqual(response.status_code, 200)

ki/test/test_login_endpoint.py

@@ -10,6 +10,7 @@ from ki.test.ApiTest import ApiTest
 
 
 class TestLoginEndpoint(ApiTest):
+
     def test_login(self):
         response1_data = self.login("peter", "geheim")
         response2_data = self.login("peter", "geheim")

ki/test/test_skills_endpoint.py

@@ -8,6 +8,7 @@ from ki.test.ApiTest import ApiTest
 
 
 class TestSkillsEndpoint(ApiTest):
+
     def test_skills_options(self):
         response = self.client.options("/skills")
         self.assertEqual(response.status_code, 200)