Compare commits

...

6 Commits

Author SHA1 Message Date
0011ac9cb9 Merge pull request 'Check pooled database connections before reusing them' (!137) from fix-db-disconnect into main
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #137
2025-09-26 15:15:26 +02:00
bf71ae7da5 Merge pull request 'Update python Docker tag to v3.11.13' (!122) from renovate/minor-3.11-python into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #122
2025-09-19 18:29:57 +02:00
a54fcdf5a4 Update Python version where Renovate didn't do it
All checks were successful
continuous-integration/drone/pr Build is passing
2025-09-19 18:26:29 +02:00
69c2c94079 Update python Docker tag to v3.11.13 2025-09-19 18:20:31 +02:00
4c88ee4c06 Check pooled database connections before reusing them
All checks were successful
continuous-integration/drone/pr Build is passing
Fixes #43
2025-09-19 18:18:19 +02:00
bc595a77ce Merge pull request 'Test against MariaDB in CI runs' (!138) from test-mariadb into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #138
2025-09-19 18:18:01 +02:00
7 changed files with 10 additions and 10 deletions

View File

@@ -25,7 +25,7 @@ services:
steps:
- name: install-lint-test
image: python:3.10.18-alpine@sha256:24cab748bf7bd8e3d2f9bb4e5771f17b628417527a4e1f2c59c370c2a8a27f1c
image: python:3.11.13-alpine@sha256:8d8c6d3808243160605925c2a7ab2dc5c72d0e75651699b0639143613e0855b8
env:
PYROOT: '/pyroot'
PYTHONUSERBASE: '/pyroot'
@@ -124,7 +124,7 @@ services:
steps:
- name: install-lint-test
image: python:3.10.18-alpine@sha256:24cab748bf7bd8e3d2f9bb4e5771f17b628417527a4e1f2c59c370c2a8a27f1c
image: python:3.11.13-alpine@sha256:8d8c6d3808243160605925c2a7ab2dc5c72d0e75651699b0639143613e0855b8
env:
PYROOT: '/pyroot'
PYTHONUSERBASE: '/pyroot'

View File

@@ -1 +1 @@
3.10.18
3.11.13

View File

@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: AGPL-3.0-or-later
FROM python:3.10.18-alpine@sha256:24cab748bf7bd8e3d2f9bb4e5771f17b628417527a4e1f2c59c370c2a8a27f1c AS builder
FROM python:3.11.13-alpine@sha256:8d8c6d3808243160605925c2a7ab2dc5c72d0e75651699b0639143613e0855b8 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.10.18-alpine@sha256:24cab748bf7bd8e3d2f9bb4e5771f17b628417527a4e1f2c59c370c2a8a27f1c AS ki-backend
FROM python:3.11.13-alpine@sha256:8d8c6d3808243160605925c2a7ab2dc5c72d0e75651699b0639143613e0855b8 AS ki-backend
ENV PYROOT=/pyroot
ENV PYTHONUSERBASE=$PYROOT

View File

@@ -27,7 +27,7 @@ pre-commit = "==2.21.0"
reuse = "==4.0.3"
[requires]
python_version = "3.10"
python_version = "3.11"
[scripts]
clean = "rm data/ki.sqlite"

4
Pipfile.lock generated
View File

@@ -1,11 +1,11 @@
{
"_meta": {
"hash": {
"sha256": "d02162eab1995247a9fd1bdd475877457c277b2a8c608a4df0366126b1051ed1"
"sha256": "5f6e83db58b1232fbef791f93bba91d2b1874da7ca2cbeca4a4e556d9f3aefb1"
},
"pipfile-spec": 6,
"requires": {
"python_version": "3.10"
"python_version": "3.11"
},
"sources": [
{

View File

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

2
app.py
View File

@@ -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, session_options={"future": True})
db = SQLAlchemy(app, session_options={"future": True}, engine_options={"pool_pre_ping": True})
migrate = Migrate(app, db, compare_type=True)
app.logger.info("Hello from KI")