Update to Python 3.9

Update python Docker tag to v3.9.21
Merge pull request 'Update plugins/docker Docker tag to v20.18.6' (!132 ) from renovate/plugins-docker-20.x into main
2025-01-08 14:46:46 +01:00 · 2025-01-08 14:43:49 +01:00 · 2025-01-08 14:25:15 +01:00 · 2025-01-07 21:36:26 +00:00 · 2025-01-07 21:43:34 +01:00 · 2025-01-07 20:37:20 +00:00
12 changed files with 162 additions and 139 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -26,9 +26,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-dry-run
-    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
@ -54,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
@ -114,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
--- a/4
+++ b/4
@ -11,8 +11,8 @@ name = "pypi"
 flask = "==2.3.3"
 python-dotenv = "==1.0.1"
 flask-migrate = "==4.0.7"
-flask-sqlalchemy  = "==2.5.1"
-sqlalchemy = "==1.4.54"
+flask-sqlalchemy  = "==3.1.1"
+sqlalchemy = "==2.0.36"
 waitress = "==2.1.2"
 pyyaml = "==6.0.2"
 flask-cors = "==5.0.0"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "6b6bb2f4b981dd8be0d5bac3779590c92fa60cb8a069b76abc86fab6e0b7fcf9"
+            "sha256": "9dbe1a2f4aaaca2e5ea20641725c8afbdcf48ca6ac73be0314d6dba38232e8a2"
        },
        "pipfile-spec": 6,
        "requires": {
@ -68,12 +68,12 @@
        },
        "flask-sqlalchemy": {
            "hashes": [
-                "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912",
-                "sha256:f12c3d4cc5cc7fdcc148b9527ea05671718c3ea45d50c7e732cceb33f574b390"
+                "sha256:4ba4be7f419dc72f4efd8802d69974803c37259dd42f3913b0dcf75c9447e0a0",
+                "sha256:e4b68bb881802dda1a7d878b2fc84c06d1ee57fb40b874d3dc97dabfa36b8312"
            ],
            "index": "pypi",
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==2.5.1"
+            "markers": "python_version >= '3.8'",
+            "version": "==3.1.1"
        },
        "importlib-metadata": {
            "hashes": [
@ -273,54 +273,67 @@
        },
        "sqlalchemy": {
            "hashes": [
-                "sha256:02d2ecb9508f16ab9c5af466dfe5a88e26adf2e1a8d1c56eb616396ccae2c186",
-                "sha256:0b76bbb1cbae618d10679be8966f6d66c94f301cfc15cb49e2f2382563fb6efb",
-                "sha256:0de620f978ca273ce027769dc8db7e6ee72631796187adc8471b3c76091b809e",
-                "sha256:1183599e25fa38a1a322294b949da02b4f0da13dbc2688ef9dbe746df573f8a6",
-                "sha256:12bc0141b245918b80d9d17eca94663dbd3f5266ac77a0be60750f36102bbb0f",
-                "sha256:1390ca2d301a2708fd4425c6d75528d22f26b8f5cbc9faba1ddca136671432bc",
-                "sha256:13e91d6892b5fcb94a36ba061fb7a1f03d0185ed9d8a77c84ba389e5bb05e936",
-                "sha256:14b3f4783275339170984cadda66e3ec011cce87b405968dc8d51cf0f9997b0d",
-                "sha256:1576fba3616f79496e2f067262200dbf4aab1bb727cd7e4e006076686413c80c",
-                "sha256:1990d5a6a5dc358a0894c8ca02043fb9a5ad9538422001fb2826e91c50f1d539",
-                "sha256:1d83cd1cc03c22d922ec94d0d5f7b7c96b1332f5e122e81b1a61fb22da77879a",
-                "sha256:1e8c1b9ecaf9f2590337d5622189aeb2f0dbc54ba0232fa0856cf390957584a9",
-                "sha256:26e78444bc77d089e62874dc74df05a5c71f01ac598010a327881a48408d0064",
-                "sha256:2b37931eac4b837c45e2522066bda221ac6d80e78922fb77c75eb12e4dbcdee5",
-                "sha256:3112de9e11ff1957148c6de1df2bc5cc1440ee36783412e5eedc6f53638a577d",
-                "sha256:394b0135900b62dbf63e4809cdc8ac923182af2816d06ea61cd6763943c2cc05",
-                "sha256:3f01c2629a7d6b30d8afe0326b8c649b74825a0e1ebdcb01e8ffd1c920deb07d",
-                "sha256:41cffc63c7c83dfc30c4cab5b4308ba74440a9633c4509c51a0c52431fb0f8ab",
-                "sha256:4470fbed088c35dc20b78a39aaf4ae54fe81790c783b3264872a0224f437c31a",
-                "sha256:5ed3576675c187e3baa80b02c4c9d0edfab78eff4e89dd9da736b921333a2432",
-                "sha256:6b24364150738ce488333b3fb48bfa14c189a66de41cd632796fbcacb26b4585",
-                "sha256:6da60fb24577f989535b8fc8b2ddc4212204aaf02e53c4c7ac94ac364150ed08",
-                "sha256:76c2ba7b5a09863d0a8166fbc753af96d561818c572dbaf697c52095938e7be4",
-                "sha256:954816850777ac234a4e32b8c88ac1f7847088a6e90cfb8f0e127a1bf3feddff",
-                "sha256:9c24dd161c06992ed16c5e528a75878edbaeced5660c3db88c820f1f0d3fe1f4",
-                "sha256:a01bc25eb7a5688656c8770f931d5cb4a44c7de1b3cec69b84cc9745d1e4cc10",
-                "sha256:a19f816f4702d7b1951d7576026c7124b9bfb64a9543e571774cf517b7a50b29",
-                "sha256:a41611835010ed4ea4c7aed1da5b58aac78ee7e70932a91ed2705a7b38e40f52",
-                "sha256:a49730afb716f3f675755afec109895cab95bc9875db7ffe2e42c1b1c6279482",
-                "sha256:a86b0e4be775902a5496af4fb1b60d8a2a457d78f531458d294360b8637bb014",
-                "sha256:a8a72259a1652f192c68377be7011eac3c463e9892ef2948828c7d58e4829988",
-                "sha256:af00236fe21c4d4f4c227b6ccc19b44c594160cc3ff28d104cdce85855369277",
-                "sha256:b05e0626ec1c391432eabb47a8abd3bf199fb74bfde7cc44a26d2b1b352c2c6e",
-                "sha256:b5933c45d11cbd9694b1540aa9076816cc7406964c7b16a380fd84d3a5fe3241",
-                "sha256:b5e0d47d619c739bdc636bbe007da4519fc953393304a5943e0b5aec96c9877c",
-                "sha256:b67589f7955924865344e6eacfdcf70675e64f36800a576aa5e961f0008cde2a",
-                "sha256:c5a2530400a6e7e68fd1552a55515de6a4559122e495f73554a51cedafc11669",
-                "sha256:cafe0ba3a96d0845121433cffa2b9232844a2609fce694fcc02f3f31214ece28",
-                "sha256:cdb2886c0be2c6c54d0651d5a61c29ef347e8eec81fd83afebbf7b59b80b7393",
-                "sha256:d0cf7076c8578b3de4e43a046cc7a1af8466e1c3f5e64167189fe8958a4f9c02",
-                "sha256:f1e1b92ee4ee9ffc68624ace218b89ca5ca667607ccee4541a90cc44999b9aea",
-                "sha256:f941aaf15f47f316123e1933f9ea91a6efda73a161a6ab6046d1cde37be62c88",
-                "sha256:fb59a11689ff3c58e7652260127f9e34f7f45478a2f3ef831ab6db7bcd72108f",
-                "sha256:fc9ffd9a38e21fad3e8c5a88926d57f94a32546e937e0be46142b2702003eba7"
+                "sha256:03e08af7a5f9386a43919eda9de33ffda16b44eb11f3b313e6822243770e9763",
+                "sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436",
+                "sha256:07b441f7d03b9a66299ce7ccf3ef2900abc81c0db434f42a5694a37bd73870f2",
+                "sha256:1bc330d9d29c7f06f003ab10e1eaced295e87940405afe1b110f2eb93a233588",
+                "sha256:1e0d612a17581b6616ff03c8e3d5eff7452f34655c901f75d62bd86449d9750e",
+                "sha256:23623166bfefe1487d81b698c423f8678e80df8b54614c2bf4b4cfcd7c711959",
+                "sha256:2519f3a5d0517fc159afab1015e54bb81b4406c278749779be57a569d8d1bb0d",
+                "sha256:28120ef39c92c2dd60f2721af9328479516844c6b550b077ca450c7d7dc68575",
+                "sha256:37350015056a553e442ff672c2d20e6f4b6d0b2495691fa239d8aa18bb3bc908",
+                "sha256:39769a115f730d683b0eb7b694db9789267bcd027326cccc3125e862eb03bfd8",
+                "sha256:3c01117dd36800f2ecaa238c65365b7b16497adc1522bf84906e5710ee9ba0e8",
+                "sha256:3d6718667da04294d7df1670d70eeddd414f313738d20a6f1d1f379e3139a545",
+                "sha256:3dbb986bad3ed5ceaf090200eba750b5245150bd97d3e67343a3cfed06feecf7",
+                "sha256:4557e1f11c5f653ebfdd924f3f9d5ebfc718283b0b9beebaa5dd6b77ec290971",
+                "sha256:46331b00096a6db1fdc052d55b101dbbfc99155a548e20a0e4a8e5e4d1362855",
+                "sha256:4a121d62ebe7d26fec9155f83f8be5189ef1405f5973ea4874a26fab9f1e262c",
+                "sha256:4f5e9cd989b45b73bd359f693b935364f7e1f79486e29015813c338450aa5a71",
+                "sha256:50aae840ebbd6cdd41af1c14590e5741665e5272d2fee999306673a1bb1fdb4d",
+                "sha256:59b1ee96617135f6e1d6f275bbe988f419c5178016f3d41d3c0abb0c819f75bb",
+                "sha256:59b8f3adb3971929a3e660337f5dacc5942c2cdb760afcabb2614ffbda9f9f72",
+                "sha256:66bffbad8d6271bb1cc2f9a4ea4f86f80fe5e2e3e501a5ae2a3dc6a76e604e6f",
+                "sha256:69f93723edbca7342624d09f6704e7126b152eaed3cdbb634cb657a54332a3c5",
+                "sha256:6a440293d802d3011028e14e4226da1434b373cbaf4a4bbb63f845761a708346",
+                "sha256:72c28b84b174ce8af8504ca28ae9347d317f9dba3999e5981a3cd441f3712e24",
+                "sha256:79d2e78abc26d871875b419e1fd3c0bca31a1cb0043277d0d850014599626c2e",
+                "sha256:7f2767680b6d2398aea7082e45a774b2b0767b5c8d8ffb9c8b683088ea9b29c5",
+                "sha256:8318f4776c85abc3f40ab185e388bee7a6ea99e7fa3a30686580b209eaa35c08",
+                "sha256:8958b10490125124463095bbdadda5aa22ec799f91958e410438ad6c97a7b793",
+                "sha256:8c78ac40bde930c60e0f78b3cd184c580f89456dd87fc08f9e3ee3ce8765ce88",
+                "sha256:90812a8933df713fdf748b355527e3af257a11e415b613dd794512461eb8a686",
+                "sha256:9bc633f4ee4b4c46e7adcb3a9b5ec083bf1d9a97c1d3854b92749d935de40b9b",
+                "sha256:9e46ed38affdfc95d2c958de328d037d87801cfcbea6d421000859e9789e61c2",
+                "sha256:9fe53b404f24789b5ea9003fc25b9a3988feddebd7e7b369c8fac27ad6f52f28",
+                "sha256:a4e46a888b54be23d03a89be510f24a7652fe6ff660787b96cd0e57a4ebcb46d",
+                "sha256:a86bfab2ef46d63300c0f06936bd6e6c0105faa11d509083ba8f2f9d237fb5b5",
+                "sha256:ac9dfa18ff2a67b09b372d5db8743c27966abf0e5344c555d86cc7199f7ad83a",
+                "sha256:af148a33ff0349f53512a049c6406923e4e02bf2f26c5fb285f143faf4f0e46a",
+                "sha256:b11d0cfdd2b095e7b0686cf5fabeb9c67fae5b06d265d8180715b8cfa86522e3",
+                "sha256:b2985c0b06e989c043f1dc09d4fe89e1616aadd35392aea2844f0458a989eacf",
+                "sha256:b544ad1935a8541d177cb402948b94e871067656b3a0b9e91dbec136b06a2ff5",
+                "sha256:b5cc79df7f4bc3d11e4b542596c03826063092611e481fcf1c9dfee3c94355ef",
+                "sha256:b817d41d692bf286abc181f8af476c4fbef3fd05e798777492618378448ee689",
+                "sha256:b81ee3d84803fd42d0b154cb6892ae57ea6b7c55d8359a02379965706c7efe6c",
+                "sha256:be9812b766cad94a25bc63bec11f88c4ad3629a0cec1cd5d4ba48dc23860486b",
+                "sha256:c245b1fbade9c35e5bd3b64270ab49ce990369018289ecfde3f9c318411aaa07",
+                "sha256:c3f3631693003d8e585d4200730616b78fafd5a01ef8b698f6967da5c605b3fa",
+                "sha256:c4ae3005ed83f5967f961fd091f2f8c5329161f69ce8480aa8168b2d7fe37f06",
+                "sha256:c54a1e53a0c308a8e8a7dffb59097bff7facda27c70c286f005327f21b2bd6b1",
+                "sha256:d0ddd9db6e59c44875211bc4c7953a9f6638b937b0a88ae6d09eb46cced54eff",
+                "sha256:dc022184d3e5cacc9579e41805a681187650e170eb2fd70e28b86192a479dcaa",
+                "sha256:e32092c47011d113dc01ab3e1d3ce9f006a47223b18422c5c0d150af13a00687",
+                "sha256:f7b64e6ec3f02c35647be6b4851008b26cff592a95ecb13b6788a54ef80bbdd4",
+                "sha256:f942a799516184c855e1a32fbc7b29d7e571b52612647866d4ec1c3242578fcb",
+                "sha256:f9511d8dd4a6e9271d07d150fb2f81874a3c8c95e11ff9af3a2dfc35fe42ee44",
+                "sha256:fd3a55deef00f689ce931d4d1b23fa9f04c880a48ee97af488fd215cf24e2a6c",
+                "sha256:fddbe92b4760c6f5d48162aef14824add991aeda8ddadb3c31d56eb15ca69f8e",
+                "sha256:fdf3386a801ea5aba17c6410dd1dc8d39cf454ca2565541b5ac42a84e1e28f53"
            ],
            "index": "pypi",
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==1.4.54"
+            "markers": "python_version >= '3.7'",
+            "version": "==2.0.36"
        },
        "typing-extensions": {
            "hashes": [
--- a/app.py
+++ b/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")
--- a/ki/actions/seed.py
+++ b/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,71 +88,73 @@ def seed_user(auth_id,


 def seed(dev: bool):
-    seed_contacttypes()
+    with app.app_context():
+        seed_contacttypes()

-    skill_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/skills.csv"
+        skill_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/skills.csv"

-    app.logger.info("importing skills")
+        app.logger.info("importing skills")

-    with open(skill_seed_file_path) as skills_file:
-        skills_csv_reader = csv.DictReader(skills_file)
+        with open(skill_seed_file_path) as skills_file:
+            skills_csv_reader = csv.DictReader(skills_file)

-        for skill in skills_csv_reader:
-            id = int(skill["id"])
-            db_skill = Skill.query.get(id)
+            for skill in skills_csv_reader:
+                id = int(skill["id"])
+                db_skill = db.session.get(Skill, id)

-            if db_skill is None:
-                db.session.add(Skill(id=int(skill["id"]), name=skill["name"]))
+                if db_skill is None:
+                    db.session.add(Skill(id=int(skill["id"]), name=skill["name"]))

-    app.logger.info("importing languages")
+        app.logger.info("importing languages")

-    iso_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/iso_639_1.csv"
+        iso_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/iso_639_1.csv"

-    with open(iso_seed_file_path) as iso_file:
-        iso_csv_reader = csv.DictReader(iso_file)
+        with open(iso_seed_file_path) as iso_file:
+            iso_csv_reader = csv.DictReader(iso_file)

-        for iso in iso_csv_reader:
-            id = iso["639-1"]
-            db_language = Language.query.get(id)
+            for iso in iso_csv_reader:
+                id = iso["639-1"]
+                db_language = db.session.get(Language, id)

-            if db_language is None:
-                db.session.add(Language(id=iso["639-1"], name=iso["Sprache"]))
+                if db_language is None:
+                    db.session.add(Language(id=iso["639-1"], name=iso["Sprache"]))

-    if dev:
-        seed_user("klaus", visible=False)
+        if dev:
+            seed_user("klaus", visible=False)

-        for i in range(1, 20):
-            seed_user(f"babsi{i}")
+            for i in range(1, 20):
+                seed_user(f"babsi{i}")

-        seed_user("peter",
-                  nickname="peternichtlustig",
-                  visible=False,
-                  pronouns="Herr Dr. Dr.",
-                  volunteerwork="Gartenverein",
-                  availability_status=True,
-                  availability_hours_per_week=42,
-                  availability_text="Immer",
-                  freetext="Ich mag Kaffee",
-                  skills=[(3, 3), (1, 5)],
-                  searchtopics=[3, 1],
-                  languages=[("de", 5), ("fr", 3)],
-                  address=("Peter Nichtlustig", "Waldweg", "23i", "Hinterhaus", "13337", "Bielefeld", "Deutschland"),
-                  contacts=[(4, "@peter:wtf-eg.de"), (1, "peter@wtf-eg.de")])
+            seed_user("peter",
+                      nickname="peternichtlustig",
+                      visible=False,
+                      pronouns="Herr Dr. Dr.",
+                      volunteerwork="Gartenverein",
+                      availability_status=True,
+                      availability_hours_per_week=42,
+                      availability_text="Immer",
+                      freetext="Ich mag Kaffee",
+                      skills=[(3, 3), (1, 5)],
+                      searchtopics=[3, 1],
+                      languages=[("de", 5), ("fr", 3)],
+                      address=("Peter Nichtlustig", "Waldweg", "23i", "Hinterhaus", "13337", "Bielefeld",
+                               "Deutschland"),
+                      contacts=[(4, "@peter:wtf-eg.de"), (1, "peter@wtf-eg.de")])

-        seed_user("dirtydieter",
-                  volunteerwork="Müll sammeln",
-                  availability_status=True,
-                  availability_hours_per_week=24,
-                  availability_text="Nur Nachts!",
-                  freetext="1001010010111!!!",
-                  skills=[(1, 5)],
-                  address=("Friedrich Witzig", "", "", "", "", "", ""))
+            seed_user("dirtydieter",
+                      volunteerwork="Müll sammeln",
+                      availability_status=True,
+                      availability_hours_per_week=24,
+                      availability_text="Nur Nachts!",
+                      freetext="1001010010111!!!",
+                      skills=[(1, 5)],
+                      address=("Friedrich Witzig", "", "", "", "", "", ""))

-        all_skills = [(skill.id, 3) for skill in Skill.query.all()]
-        seed_user("jutta", languages=[("fr", 5)], skills=all_skills)
+            all_skills = [(skill.id, 3) for skill in Skill.query.all()]
+            seed_user("jutta", languages=[("fr", 5)], skills=all_skills)

-        seed_user("giesela", skills=[(9, 3), (10, 5)])
-        seed_user("bertha", visible=False, skills=[(11, 3), (10, 5)])
-        seed_user("monique", languages=[("fr", 4)])
+            seed_user("giesela", skills=[(9, 3), (10, 5)])
+            seed_user("bertha", visible=False, skills=[(11, 3), (10, 5)])
+            seed_user("monique", languages=[("fr", 4)])

-    db.session.commit()
+        db.session.commit()
--- a/ki/handlers/update_profile.py
+++ b/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)
--- a/ki/routes.py
+++ b/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)
--- a/ki/test/ApiTest.py
+++ b/ki/test/ApiTest.py
@ -26,13 +26,14 @@ class ApiTest(unittest.TestCase):
            config = migrate.get_config()
            command.upgrade(config, "head")

-        seed(True)
-        max_skill = Skill.query.order_by(Skill.id.desc()).first()
-        self.max_skill_id = max_skill.id
+            seed(True)
+            max_skill = Skill.query.order_by(Skill.id.desc()).first()
+            self.max_skill_id = max_skill.id

    def tearDown(self):
-        db.drop_all()
-        db.engine.dispose()
+        with app.app_context():
+            db.drop_all()
+            db.engine.dispose()

    def login(self, username, password):
        login_data = {"username": username, "password": password}
--- a/ki/test/test_languages_endpoint.py
+++ b/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":
--- a/ki/test/test_profile_endpoint.py
+++ b/ki/test/test_profile_endpoint.py
@ -20,11 +20,12 @@ class TestProfileEndpoint(ApiTest):
        self.assertEqual(login_response.status_code, 200)
        self.assertIn("token", login_response.json)

-        babsi = User.query.filter(User.auth_id == "babsi1").first()
-        response = self.client.post(f"/users/{babsi.id}/profile",
-                                    data=json.dumps({}),
-                                    content_type="application/json",
-                                    headers={"Authorization": "Bearer " + login_response.json["token"]})
+        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({}),
+                                        content_type="application/json",
+                                        headers={"Authorization": "Bearer " + login_response.json["token"]})

        self.assertEqual(response.status_code, 403)

@ -103,11 +104,12 @@ class TestProfileEndpoint(ApiTest):
                "level": 2
            }]
        }
-        peter = User.query.filter(User.auth_id == "peter").first()
-        response = self.client.post(f"/users/{peter.id}/profile",
-                                    data=json.dumps(data),
-                                    content_type="application/json",
-                                    headers={"Authorization": "Bearer " + token})
+        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),
+                                        content_type="application/json",
+                                        headers={"Authorization": "Bearer " + token})

        self.assertEqual(response.status_code, 200)
        with app.app_context():
@ -185,8 +187,9 @@ class TestProfileEndpoint(ApiTest):
    def test_get_visible_proifle(self):
        token = self.login("peter", "geheim")["token"]

-        babsi = User.query.filter(User.auth_id == "babsi1").first()
-        response = self.client.get(f"/users/{babsi.id}/profile", headers={"Authorization": f"Bearer {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}"})

        self.assertEqual(response.status_code, 200)

@ -197,10 +200,11 @@ class TestProfileEndpoint(ApiTest):
        self.assertEqual(login_response.status_code, 200)
        self.assertIn("token", login_response.json)

-        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"]})
-        profile_id = peter.profile.id
+        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"]})
+            profile_id = peter.profile.id
        self.assertEqual(response.status_code, 200)
        self.assertDictEqual(
            response.json, {
--- a/ki/test/test_skills_endpoint.py
+++ b/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":
--- a/migrations/env.py
+++ b/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(
Author	SHA1	Message	Date
Brain	f4c54526d1	Update to Python 3.9 All checks were successful continuous-integration/drone/pr Build is passing Details	2025-01-08 14:46:46 +01:00
Renovate Bot	e9236f7e19	Update python Docker tag to v3.9.21	2025-01-08 14:43:49 +01:00
Brain	f04120fdc0	Merge pull request 'Update plugins/docker Docker tag to v20.18.6' (!132 ) from renovate/plugins-docker-20.x into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #132	2025-01-08 14:25:15 +01:00
Renovate Bot	1f87e2d96e	Update plugins/docker Docker tag to v20.18.6 All checks were successful continuous-integration/drone/pr Build is passing Details	2025-01-07 21:36:26 +00:00
Brain	c5a38dca81	Merge pull request 'Update dependency sqlalchemy to v2.0.36' (!128 ) from renovate/sqlalchemy-2.x into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #128	2025-01-07 21:43:34 +01:00
Renovate Bot	6424af8b3f	Update dependency sqlalchemy to v2.0.36 All checks were successful continuous-integration/drone/pr Build is passing Details	2025-01-07 20:37:20 +00:00
Brain	184b1c33eb	Merge pull request 'Update dependency flask-sqlalchemy to v3' (!112 ) from renovate/flask-sqlalchemy-3.x into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #112	2025-01-07 21:25:08 +01:00
Brain	5f27eaa9a1	Set the SQLALCHEMY_DATABASE_URI env differently All checks were successful continuous-integration/drone/pr Build is passing Details	2024-09-13 15:49:24 +02:00
Brain	862bd9f7a3	Explicitly set SQLALCHEMY_DATABASE_URI for tests Some checks failed continuous-integration/drone/pr Build is failing Details	2024-09-13 15:43:09 +02:00
Brain	8478e8d76e	Fix test errors Some checks failed continuous-integration/drone/pr Build is failing Details	2024-09-13 15:38:56 +02:00
Brain	b0652add43	Replaced deprecated method see https://flask-sqlalchemy.palletsprojects.com/en/3.1.x/api/#flask_sqlalchemy.SQLAlchemy.get_engine	2024-09-13 15:25:04 +02:00
Brain	60c906cb5c	Fix 'unclosed file' warnings in tests see https://github.com/pallets/flask/issues/2468#issuecomment-517797518	2024-09-13 14:11:19 +02:00
Bene	2ff958c55f	Rewrite sqlachemy code for 1.4 to 2.x migration	2024-09-13 13:43:00 +02:00
Brain	146eb995a8	Update SQLAlchemy to v2	2024-09-13 13:42:12 +02:00
Renovate Bot	33187428cf	Update dependency flask-sqlalchemy to v3 Some checks failed renovate/artifacts Artifact file update failure continuous-integration/drone/pr Build is failing Details	2024-09-13 11:36:00 +00:00