Update dependency flask to v2.3.3

2024-08-23 13:35:30 +00:00
13 changed files with 88 additions and 130 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -15,28 +15,17 @@ trigger:

 steps:
  - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee
+    image: python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca
    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
@ -104,7 +93,7 @@ trigger:

 steps:
  - name: install-lint-test
-    image: python:3.8.19-alpine@sha256:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee
+    image: python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca
    env:
      PYROOT: '/pyroot'
      PYTHONUSERBASE: '/pyroot'
--- a/.python-version
+++ b/.python-version
@ -1 +0,0 @@
-3.8.19
--- a/.reuse/dep5
+++ b/.reuse/dep5
@ -11,6 +11,6 @@ Files: Pipfile.lock migrations/*
 Copyright: WTF Kooperative eG <https://wtf-eg.de/>
 License: AGPL-3.0-or-later

-Files: renovate.json .python-version
+Files: renovate.json
 Copyright: WTF Kooperative eG <https://wtf-eg.de/>
 License: AGPL-3.0-or-later
--- a/.yapfignore
+++ b/.yapfignore
@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-migrations/*.py
--- a/4
+++ b/4
@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

-FROM python:3.8.19-alpine@sha256:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee AS builder
+FROM python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca 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:c2f31d16113f2c1152934d321855c9f0169143dff96d716dada19e0047d6ddee AS ki-backend
+FROM python:3.11.9-alpine@sha256:700b4aa84090748aafb348fc042b5970abb0a73c8f1b4fcfe0f4e3c2a4a9fcca AS ki-backend

 ENV PYROOT=/pyroot
 ENV PYTHONUSERBASE=$PYROOT
--- a/14
+++ b/14
@ -9,25 +9,25 @@ name = "pypi"

 [packages]
 flask = "==2.3.3"
-python-dotenv = "==1.0.1"
+python-dotenv = "==0.17.1"
 flask-migrate = "==3.0.1"
 flask-sqlalchemy  = "==2.5.1"
 sqlalchemy = "==1.4.53"
 waitress = "==2.1.2"
 pyyaml = "==6.0.2"
-flask-cors = "==5.0.0"
+flask-cors = "==3.0.10"
 ldap3 = "==2.9.1"
-pymysql = "==1.1.1"
+pymysql = "==1.0.3"
 werkzeug = "==2.3.8"

 [dev-packages]
-flake8 = "==7.1.1"
-yapf = "==0.40.2"
-pre-commit = "==2.21.0"
+flake8 = "==3.9.2"
+yapf = "==0.31.0"
+pre-commit = "==2.13.0"
 reuse = "==0.14.0"

 [requires]
-python_version = "3.8"
+python_version = "3.11"

 [scripts]
 clean = "rm data/ki.sqlite"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -1,11 +1,11 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "85cdc18e964ebc18c00497b89fe743b28f2c5d2d66d64e0ef49be8bd56cac134"
+            "sha256": "449eddc1f51af4eaf66443277e81ba5402260db3fa906c99015c08c8fabbd0b9"
        },
        "pipfile-spec": 6,
        "requires": {
-            "python_version": "3.8"
+            "python_version": "3.11"
        },
        "sources": [
            {
@ -24,14 +24,6 @@
            "markers": "python_version >= '3.8'",
            "version": "==1.13.2"
        },
-        "blinker": {
-            "hashes": [
-                "sha256:1779309f71bf239144b9399d06ae925637cf6634cf6bd131104184531bf67c01",
-                "sha256:8f77b09d3bf7c795e969e9486f39c2c5e9c39d4ee07424be2bc594ece9642d83"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.8.2"
-        },
        "click": {
            "hashes": [
                "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28",
@ -42,20 +34,20 @@
        },
        "flask": {
            "hashes": [
-                "sha256:09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc",
-                "sha256:f69fcd559dc907ed196ab9df0e48471709175e696d6e698dd4dbe940f96ce66b"
+                "sha256:59da8a3170004800a2837844bfa84d49b022550616070f7cb1a659682b2e7c9f",
+                "sha256:e1120c228ca2f553b470df4a5fa927ab66258467526069981b3eb0a91902687d"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==2.3.3"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.0.3"
        },
        "flask-cors": {
            "hashes": [
-                "sha256:5aadb4b950c4e93745034594d9f3ea6591f734bb3662e16e255ffbf5e89c88ef",
-                "sha256:b9e307d082a9261c100d8fb0ba909eec6a228ed1b60a8315fd85f783d61910bc"
+                "sha256:74efc975af1194fc7891ff5cd85b0f7478be4f7f59fe158102e91abb72bb4438",
+                "sha256:b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"
            ],
            "index": "pypi",
-            "version": "==5.0.0"
+            "version": "==3.0.10"
        },
        "flask-migrate": {
            "hashes": [
@ -79,16 +71,16 @@
                "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
                "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"
            ],
-            "markers": "python_version < '3.10'",
+            "markers": "python_version < '3.9'",
            "version": "==8.4.0"
        },
        "importlib-resources": {
            "hashes": [
-                "sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065",
-                "sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717"
+                "sha256:20600c8b7361938dc0bb2d5ec0297802e575df486f5a544fa414da65e13721f7",
+                "sha256:dda242603d1c9cd836c3368b1174ed74cb4049ecd209e7a1a0104620c18c5c11"
            ],
            "markers": "python_version < '3.9'",
-            "version": "==6.4.5"
+            "version": "==6.4.4"
        },
        "itsdangerous": {
            "hashes": [
@ -201,21 +193,20 @@
        },
        "pymysql": {
            "hashes": [
-                "sha256:4de15da4c61dc132f4fb9ab763063e693d521a80fd0e87943b9a453dd4c19d6c",
-                "sha256:e127611aaf2b417403c60bf4dc570124aeb4a57f5f37b8e95ae399a42f904cd0"
+                "sha256:3dda943ef3694068a75d69d071755dbecacee1adf9a1fc5b206830d2b67d25e8",
+                "sha256:89fc6ae41c0aeb6e1f7710cdd623702ea2c54d040565767a78b00a5ebb12f4e5"
            ],
            "index": "pypi",
            "markers": "python_version >= '3.7'",
-            "version": "==1.1.1"
+            "version": "==1.0.3"
        },
        "python-dotenv": {
            "hashes": [
-                "sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca",
-                "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a"
+                "sha256:00aa34e92d992e9f8383730816359647f358f4a3be1ba45e5a5cefd27ee91544",
+                "sha256:b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==1.0.1"
+            "version": "==0.17.1"
        },
        "pyyaml": {
            "hashes": [
@ -277,6 +268,14 @@
            "markers": "python_version >= '3.8'",
            "version": "==6.0.2"
        },
+        "six": {
+            "hashes": [
+                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==1.16.0"
+        },
        "sqlalchemy": {
            "hashes": [
                "sha256:0465b8a68f8f4de754c1966c45b187ac784ad97bc9747736f913130f0e1adea0",
@ -356,11 +355,11 @@
        },
        "zipp": {
            "hashes": [
-                "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064",
-                "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"
+                "sha256:0145e43d89664cfe1a2e533adc75adafed82fe2da404b4bbb6b026c0157bdb31",
+                "sha256:58da6168be89f0be59beb194da1250516fdaa062ccebd30127ac65d30045e10d"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==3.20.1"
+            "version": "==3.20.0"
        }
    },
    "develop": {
@ -380,11 +379,11 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
-                "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
+                "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
+                "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
            ],
            "markers": "python_version >= '3.6'",
-            "version": "==2024.8.30"
+            "version": "==2024.7.4"
        },
        "cfgv": {
            "hashes": [
@ -507,20 +506,20 @@
        },
        "filelock": {
            "hashes": [
-                "sha256:81de9eb8453c769b63369f87f11131a7ab04e367f8d97ad39dc230daa07e3bec",
-                "sha256:f6ed4c963184f4c84dd5557ce8fece759a3724b37b80c6c4f20a2f63a4dc6609"
+                "sha256:2207938cbc1844345cb01a5a95524dae30f0ce089eba5b00378295a17e3e90cb",
+                "sha256:6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==3.16.0"
+            "version": "==3.15.4"
        },
        "flake8": {
            "hashes": [
-                "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38",
-                "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213"
+                "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b",
+                "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"
            ],
            "index": "pypi",
-            "markers": "python_full_version >= '3.8.1'",
-            "version": "==7.1.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==3.9.2"
        },
        "identify": {
            "hashes": [
@ -532,19 +531,11 @@
        },
        "idna": {
            "hashes": [
-                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
-                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+                "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc",
+                "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.8"
-        },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1",
-                "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"
-            ],
-            "markers": "python_version < '3.10'",
-            "version": "==8.4.0"
+            "markers": "python_version >= '3.5'",
+            "version": "==3.7"
        },
        "jinja2": {
            "hashes": [
@ -630,11 +621,10 @@
        },
        "mccabe": {
            "hashes": [
-                "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
-                "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
+                "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
+                "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.7.0"
+            "version": "==0.6.1"
        },
        "nodeenv": {
            "hashes": [
@ -646,36 +636,36 @@
        },
        "platformdirs": {
            "hashes": [
-                "sha256:9e5e27a08aa095dd127b9f2e764d74254f482fef22b0970773bfba79d091ab8c",
-                "sha256:eb1c8582560b34ed4ba105009a4badf7f6f85768b30126f351328507b2beb617"
+                "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee",
+                "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==4.3.2"
+            "version": "==4.2.2"
        },
        "pre-commit": {
            "hashes": [
-                "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658",
-                "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"
+                "sha256:764972c60693dc668ba8e86eb29654ec3144501310f7198742a767bec385a378",
+                "sha256:b679d0fddd5b9d6d98783ae5f10fd0c4c59954f375b70a58cbe1ce9bcf9809a4"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==2.21.0"
+            "markers": "python_full_version >= '3.6.1'",
+            "version": "==2.13.0"
        },
        "pycodestyle": {
            "hashes": [
-                "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3",
-                "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"
+                "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068",
+                "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"
            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.12.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.7.0"
        },
        "pyflakes": {
            "hashes": [
-                "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f",
-                "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"
+                "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3",
+                "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"
            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.2.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.3.1"
        },
        "python-debian": {
            "hashes": [
@ -765,19 +755,19 @@
        },
        "setuptools": {
            "hashes": [
-                "sha256:5f4c08aa4d3ebcb57a50c33b1b07e94315d7fc7230f7115e47fc99776c8ce308",
-                "sha256:95b40ed940a1c67eb70fc099094bd6e99c6ee7c23aa2306f4d2697ba7916f9c6"
+                "sha256:b208925fcb9f7af924ed2dc04708ea89791e24bde0d3020b27df0e116088b34e",
+                "sha256:d59a3e788ab7e012ab2c4baed1b376da6366883ee20d7a5fc426816e3d7b1193"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==74.1.2"
+            "version": "==73.0.1"
        },
-        "tomli": {
+        "toml": {
            "hashes": [
-                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
+                "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
+                "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.0.1"
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==0.10.2"
        },
        "urllib3": {
            "hashes": [
@ -789,28 +779,19 @@
        },
        "virtualenv": {
            "hashes": [
-                "sha256:48f2695d9809277003f30776d155615ffc11328e6a0a8c1f0ec80188d7874a55",
-                "sha256:c17f4e0f3e6036e9f26700446f85c76ab11df65ff6d8a9cbfad9f71aabfcf23c"
+                "sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a",
+                "sha256:8cc4a31139e796e9a7de2cd5cf2489de1217193116a8fd42328f1bd65f434589"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==20.26.4"
+            "version": "==20.26.3"
        },
        "yapf": {
            "hashes": [
-                "sha256:4dab8a5ed7134e26d57c1647c7483afb3f136878b579062b786c9ba16b94637b",
-                "sha256:adc8b5dd02c0143108878c499284205adb258aad6db6634e5b869e7ee2bd548b"
+                "sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d",
+                "sha256:e3a234ba8455fe201eaa649cdac872d590089a18b661e39bbac7020978dd9c2e"
            ],
            "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==0.40.2"
-        },
-        "zipp": {
-            "hashes": [
-                "sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064",
-                "sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.20.1"
+            "version": "==0.31.0"
        }
    }
 }
--- a/ki/routes.py
+++ b/ki/routes.py
@ -17,7 +17,6 @@ content_type_png = "image/png"


 def token_auth(func):
-
    @wraps(func)
    def _token_auth(*args, **kwargs):
        auth_header = request.headers.get("Authorization")
--- a/ki/test/test_contacttypes_endpoint.py
+++ b/ki/test/test_contacttypes_endpoint.py
@ -8,7 +8,6 @@ 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)
--- a/ki/test/test_find_profiles_endpoint.py
+++ b/ki/test/test_find_profiles_endpoint.py
@ -8,7 +8,6 @@ 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)
--- a/ki/test/test_languages_endpoint.py
+++ b/ki/test/test_languages_endpoint.py
@ -8,7 +8,6 @@ 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)
--- a/ki/test/test_login_endpoint.py
+++ b/ki/test/test_login_endpoint.py
@ -10,7 +10,6 @@ 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")
--- a/ki/test/test_skills_endpoint.py
+++ b/ki/test/test_skills_endpoint.py
@ -8,7 +8,6 @@ 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)