Update dependency pre-commit to v4

Reviewed-on: #106

.drone.yml

@@ -15,17 +15,28 @@ trigger:
 
 steps:
   - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
+    image: python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c
     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
+      - SQLALCHEMY_DATABASE_URI=sqlite:// pipenv run python -m unittest discover ki
+  - name: docker-dry-run
+    image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
+    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.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
+    image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
     settings:
       registry: git.wtf-eg.de
       repo: git.wtf-eg.de/kompetenzinventar/backend
@@ -93,7 +104,7 @@ trigger:
 
 steps:
   - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
+    image: python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c
     env:
       PYROOT: '/pyroot'
       PYTHONUSERBASE: '/pyroot'
@@ -103,9 +114,9 @@ steps:
       - pipenv install --dev
       - pipenv run flake8
       - pipenv run reuse lint
-      - pipenv run python -m unittest discover ki
+      - SQLALCHEMY_DATABASE_URI=sqlite:// pipenv run python -m unittest discover ki
   - name: docker-publish
-    image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
+    image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
     settings:
       registry: git.wtf-eg.de
       repo: git.wtf-eg.de/kompetenzinventar/backend

.python-version

@@ -1 +1 @@
-3.8.19
+3.9.21

.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 .python-version
-Copyright: WTF Kooperative eG <https://wtf-eg.de/>
-License: AGPL-3.0-or-later

Dockerfile

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-FROM python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS builder
+FROM python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c 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.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS ki-backend
+FROM python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c AS ki-backend
 
 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT

Pipfile

@@ -9,25 +9,25 @@ name = "pypi"
 
 [packages]
 flask = "==2.3.3"
-python-dotenv = "==0.21.1"
-flask-migrate = "==3.0.1"
-flask-sqlalchemy  = "==2.5.1"
-sqlalchemy = "==1.4.53"
+python-dotenv = "==1.0.1"
+flask-migrate = "==4.0.7"
+flask-sqlalchemy  = "==3.1.1"
+sqlalchemy = "==2.0.36"
 waitress = "==2.1.2"
 pyyaml = "==6.0.2"
-flask-cors = "==3.0.10"
+flask-cors = "==5.0.0"
 ldap3 = "==2.9.1"
 pymysql = "==1.1.1"
 werkzeug = "==2.3.8"
 
 [dev-packages]
-flake8 = "==6.1.0"
+flake8 = "==7.1.1"
 yapf = "==0.40.2"
-pre-commit = "==2.13.0"
-reuse = "==0.14.0"
+pre-commit = "==4.2.0"
+reuse = "==4.0.3"
 
 [requires]
-python_version = "3.8"
+python_version = "3.9"
 
 [scripts]
 clean = "rm data/ki.sqlite"

README.md

@@ -39,7 +39,7 @@ Folgende Kanäle gibt es für die Kommunikation über das Kompetenzinventar:
 
 ### Abhängigkeiten
 
-- Python 3.8
+- Python 3.9
 - [Pipenv](https://github.com/pypa/pipenv)
 
 

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"

app.py

@@ -38,7 +38,7 @@ app.config["KI_LDAP_AUTH_PASSWORD"] = os.getenv("KI_LDAP_AUTH_PASSWORD")
 app.config["KI_LDAP_BASE_DN"] = os.getenv("KI_LDAP_BASE_DN")
 
 CORS(app)
-db = SQLAlchemy(app)
+db = SQLAlchemy(app, session_options={"future": True})
 migrate = Migrate(app, db, compare_type=True)
 
 app.logger.info("Hello from KI")

ki/actions/seed.py

@@ -19,7 +19,7 @@ def seed_contacttypes():
 
         for contacttype in csv_reader:
             id = int(contacttype["id"])
-            db_contacttype = ContactType.query.get(id)
+            db_contacttype = db.session.get(ContactType, id)
 
             if db_contacttype is None:
                 db.session.add(ContactType(id=int(contacttype["id"]), name=contacttype["name"]))
@@ -88,6 +88,7 @@ def seed_user(auth_id,
 
 
 def seed(dev: bool):
+    with app.app_context():
         seed_contacttypes()
 
         skill_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/skills.csv"
@@ -99,7 +100,7 @@ def seed(dev: bool):
 
             for skill in skills_csv_reader:
                 id = int(skill["id"])
-            db_skill = Skill.query.get(id)
+                db_skill = db.session.get(Skill, id)
 
                 if db_skill is None:
                     db.session.add(Skill(id=int(skill["id"]), name=skill["name"]))
@@ -113,7 +114,7 @@ def seed(dev: bool):
 
             for iso in iso_csv_reader:
                 id = iso["639-1"]
-            db_language = Language.query.get(id)
+                db_language = db.session.get(Language, id)
 
                 if db_language is None:
                     db.session.add(Language(id=iso["639-1"], name=iso["Sprache"]))
@@ -136,7 +137,8 @@ def seed(dev: bool):
                       skills=[(3, 3), (1, 5)],
                       searchtopics=[3, 1],
                       languages=[("de", 5), ("fr", 3)],
-                  address=("Peter Nichtlustig", "Waldweg", "23i", "Hinterhaus", "13337", "Bielefeld", "Deutschland"),
+                      address=("Peter Nichtlustig", "Waldweg", "23i", "Hinterhaus", "13337", "Bielefeld",
+                               "Deutschland"),
                       contacts=[(4, "@peter:wtf-eg.de"), (1, "peter@wtf-eg.de")])
 
             seed_user("dirtydieter",

ki/handlers/update_profile.py

@@ -33,7 +33,7 @@ def update_languages(profile, languages_data):
         if "id" not in language_data["language"]:
             continue
 
-        language = Language.query.get(language_data["language"]["id"])
+        language = db.session.get(Language, language_data["language"]["id"])
         profile_language = ProfileLanguage.query.filter(ProfileLanguage.profile == profile,
                                                         ProfileLanguage.language == language).first()
 
@@ -110,7 +110,7 @@ def update_contacts(profile, contacts_data):
         if "id" in contact_data:
             contact_id = int(contact_data["id"])
             contact_ids_to_be_deleted.remove(contact_id)
-            contact = Contact.query.get(contact_id)
+            contact = db.session.get(Contact, contact_id)
         else:
             contact = Contact(profile=profile, contacttype=contacttype)
             db.session.add(contact)
@@ -122,7 +122,7 @@ def update_contacts(profile, contacts_data):
 
 
 def update_profile(user_id: int):
-    user = User.query.get(user_id)
+    user = db.session.get(User, user_id)
 
     if user is None:
         return make_response({}, 404)

ki/routes.py

@@ -10,7 +10,7 @@ from ki.auth import auth
 from ki.handlers import find_profiles as find_profiles_handler
 from ki.handlers import update_profile as update_profile_handler
 from ki.models import ContactType, Language, Skill, Token, User
-from app import app
+from app import app, db
 
 content_type_svg = "image/svg+xml"
 content_type_png = "image/png"
@@ -66,7 +66,7 @@ def handle_completion_request(model, key):
 
 
 def handle_icon_request(model, id, path):
-    object = model.query.get(id)
+    object = db.session.get(model, id)
 
     if object is None:
         return make_response({}, 404)

ki/test/ApiTest.py

@@ -31,6 +31,7 @@ class ApiTest(unittest.TestCase):
             self.max_skill_id = max_skill.id
 
     def tearDown(self):
+        with app.app_context():
             db.drop_all()
             db.engine.dispose()
 

ki/test/test_languages_endpoint.py

@@ -33,6 +33,7 @@ class TestLanguagesEndpoint(ApiTest):
         self.assertEqual(response.status_code, 200)
         self.assertIn("Content-Type", response.headers)
         self.assertEqual(response.headers["Content-Type"], "image/svg+xml; charset=utf-8")
+        response.close()
 
 
 if __name__ == "main":

ki/test/test_profile_endpoint.py

@@ -20,6 +20,7 @@ class TestProfileEndpoint(ApiTest):
         self.assertEqual(login_response.status_code, 200)
         self.assertIn("token", login_response.json)
 
+        with app.app_context():
             babsi = User.query.filter(User.auth_id == "babsi1").first()
             response = self.client.post(f"/users/{babsi.id}/profile",
                                         data=json.dumps({}),
@@ -103,6 +104,7 @@ class TestProfileEndpoint(ApiTest):
                 "level": 2
             }]
         }
+        with app.app_context():
             peter = User.query.filter(User.auth_id == "peter").first()
             response = self.client.post(f"/users/{peter.id}/profile",
                                         data=json.dumps(data),
@@ -185,6 +187,7 @@ class TestProfileEndpoint(ApiTest):
     def test_get_visible_proifle(self):
         token = self.login("peter", "geheim")["token"]
 
+        with app.app_context():
             babsi = User.query.filter(User.auth_id == "babsi1").first()
             response = self.client.get(f"/users/{babsi.id}/profile", headers={"Authorization": f"Bearer {token}"})
 
@@ -197,6 +200,7 @@ class TestProfileEndpoint(ApiTest):
         self.assertEqual(login_response.status_code, 200)
         self.assertIn("token", login_response.json)
 
+        with app.app_context():
             peter = User.query.filter(User.auth_id == "peter").first()
             response = self.client.get(f"/users/{peter.id}/profile",
                                        headers={"Authorization": "Bearer " + login_response.json["token"]})

ki/test/test_skills_endpoint.py

@@ -41,12 +41,14 @@ class TestSkillsEndpoint(ApiTest):
         self.assertEqual(response.status_code, 200)
         self.assertIn("Content-Type", response.headers)
         self.assertEqual(response.headers["Content-Type"], "image/svg+xml; charset=utf-8")
+        response.close()
 
     def test_get_fallback_skill_icon(self):
         response = self.client.get("/skills/2/icon")
         self.assertEqual(response.status_code, 200)
         self.assertIn("Content-Type", response.headers)
         self.assertEqual(response.headers["Content-Type"], "image/svg+xml; charset=utf-8")
+        response.close()
 
 
 if __name__ == "main":

migrations/env.py

@@ -19,7 +19,7 @@ logger = logging.getLogger('alembic.env')
 # target_metadata = mymodel.Base.metadata
 config.set_main_option(
     'sqlalchemy.url',
-    str(current_app.extensions['migrate'].db.get_engine().url).replace(
+    str(current_app.extensions['migrate'].db.engine.url).replace(
         '%', '%%'))
 target_metadata = current_app.extensions['migrate'].db.metadata
 
@@ -68,7 +68,7 @@ def run_migrations_online():
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
-    connectable = current_app.extensions['migrate'].db.get_engine()
+    connectable = current_app.extensions['migrate'].db.engine
 
     with connectable.connect() as connection:
         context.configure(