Update dependency sqlalchemy to v2.0.36

Merge pull request 'Update dependency flask-sqlalchemy to v3' (!112 ) from renovate/flask-sqlalchemy-3.x into main
Reviewed-on: #112
2025-01-07 20:37:20 +00:00 · 2025-01-07 21:25:08 +01:00 · 2024-09-13 15:49:24 +02:00 · 2024-09-13 15:43:09 +02:00 · 2024-09-13 15:38:56 +02:00 · 2024-09-13 15:25:04 +02:00
12 changed files with 187 additions and 120 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -26,7 +26,7 @@ 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
    settings:
@ -114,7 +114,7 @@ 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
    settings:
--- a/2
+++ b/2
@ -11,7 +11,7 @@ name = "pypi"
 flask = "==2.3.3"
 python-dotenv = "==1.0.1"
 flask-migrate = "==4.0.7"
-flask-sqlalchemy  = "==2.5.1"
+flask-sqlalchemy  = "==3.1.1"
 sqlalchemy = "==2.0.36"
 waitress = "==2.1.2"
 pyyaml = "==6.0.2"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "6dc1e98f46450f4ed2261fd4290241a8002925b62f318791dd2b7d480567ddbc"
+            "sha256": "fec04741172e84d7bbffabec6f0379db185439007ecf09f87f5c1767ffd4e5ee"
        },
        "pipfile-spec": 6,
        "requires": {
@ -18,11 +18,11 @@
    "default": {
        "alembic": {
            "hashes": [
-                "sha256:203503117415561e203aa14541740643a611f641517f0209fcae63e9fa09f1a2",
-                "sha256:908e905976d15235fae59c9ac42c4c5b75cfcefe3d27c0fbf7ae15a37715d80e"
+                "sha256:99bd884ca390466db5e27ffccff1d179ec5c05c965cfefc0607e69f9e411cb25",
+                "sha256:b00892b53b3642d0b8dbedba234dbf1924b69be83a9a769d5a624b01094e304b"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==1.13.3"
+            "version": "==1.14.0"
        },
        "blinker": {
            "hashes": [
@ -34,11 +34,11 @@
        },
        "click": {
            "hashes": [
-                "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28",
-                "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"
+                "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2",
+                "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==8.1.7"
+            "version": "==8.1.8"
        },
        "flask": {
            "hashes": [
@ -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"
        },
        "greenlet": {
            "hashes": [
@ -151,7 +151,7 @@
                "sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79",
                "sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f"
            ],
-            "markers": "python_version < '3.13' and (platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32'))))))",
+            "markers": "python_version >= '3.7'",
            "version": "==3.1.1"
        },
        "importlib-metadata": {
@ -159,7 +159,7 @@
                "sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b",
                "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7"
            ],
-            "markers": "python_version < '3.10'",
+            "markers": "python_version >= '3.8'",
            "version": "==8.5.0"
        },
        "importlib-resources": {
@ -167,7 +167,7 @@
                "sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065",
                "sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717"
            ],
-            "markers": "python_version < '3.9'",
+            "markers": "python_version >= '3.8'",
            "version": "==6.4.5"
        },
        "itsdangerous": {
@ -180,11 +180,11 @@
        },
        "jinja2": {
            "hashes": [
-                "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369",
-                "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"
+                "sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb",
+                "sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==3.1.4"
+            "version": "==3.1.5"
        },
        "ldap3": {
            "hashes": [
@ -199,11 +199,11 @@
        },
        "mako": {
            "hashes": [
-                "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a",
-                "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc"
+                "sha256:42f48953c7eb91332040ff567eb7eea69b22e7a4affbc5ba8e845e8f730f6627",
+                "sha256:577b97e414580d3e088d47c2dbbe9594aa7a5146ed2875d4dfa9075af2dd3cc8"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==1.3.5"
+            "version": "==1.3.8"
        },
        "markupsafe": {
            "hashes": [
@ -359,36 +359,63 @@
        },
        "sqlalchemy": {
            "hashes": [
+                "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:fddbe92b4760c6f5d48162aef14824add991aeda8ddadb3c31d56eb15ca69f8e"
+                "sha256:fd3a55deef00f689ce931d4d1b23fa9f04c880a48ee97af488fd215cf24e2a6c",
+                "sha256:fddbe92b4760c6f5d48162aef14824add991aeda8ddadb3c31d56eb15ca69f8e",
+                "sha256:fdf3386a801ea5aba17c6410dd1dc8d39cf454ca2565541b5ac42a84e1e28f53"
            ],
            "index": "pypi",
            "markers": "python_version >= '3.7'",
@ -432,11 +459,11 @@
    "develop": {
        "attrs": {
            "hashes": [
-                "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
-                "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"
+                "sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff",
+                "sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==24.2.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==24.3.0"
        },
        "binaryornot": {
            "hashes": [
@ -505,16 +532,16 @@
                "sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b",
                "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7"
            ],
-            "markers": "python_version < '3.10'",
+            "markers": "python_version >= '3.8'",
            "version": "==8.5.0"
        },
        "jinja2": {
            "hashes": [
-                "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369",
-                "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"
+                "sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb",
+                "sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==3.1.4"
+            "version": "==3.1.5"
        },
        "license-expression": {
            "hashes": [
@ -718,11 +745,41 @@
        },
        "tomli": {
            "hashes": [
-                "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38",
-                "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"
+                "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6",
+                "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd",
+                "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c",
+                "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b",
+                "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8",
+                "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6",
+                "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77",
+                "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff",
+                "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea",
+                "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192",
+                "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249",
+                "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee",
+                "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4",
+                "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98",
+                "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8",
+                "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4",
+                "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281",
+                "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744",
+                "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69",
+                "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13",
+                "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140",
+                "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e",
+                "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e",
+                "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc",
+                "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff",
+                "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec",
+                "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2",
+                "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222",
+                "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106",
+                "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272",
+                "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a",
+                "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==2.0.2"
+            "version": "==2.2.1"
        },
        "tomlkit": {
            "hashes": [
@ -734,11 +791,11 @@
        },
        "virtualenv": {
            "hashes": [
-                "sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48",
-                "sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2"
+                "sha256:412773c85d4dab0409b83ec36f7a6499e72eaf08c80e81e9576bca61831c71cb",
+                "sha256:5d34ab240fdb5d21549b76f9e8ff3af28252f5499fb6d6f031adac4e5a8c5329"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==20.26.6"
+            "markers": "python_version >= '3.8'",
+            "version": "==20.28.1"
        },
        "yapf": {
            "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
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