Compare commits

...

135 Commits

Author SHA1 Message Date
3d271cdf7b Merge pull request 'Update python Docker tag to v3.9.21' () from renovate/minor-3.9-python into main
Reviewed-on: 
2025-01-08 15:05:46 +01:00
f4c54526d1
Update to Python 3.9 2025-01-08 14:46:46 +01:00
e9236f7e19
Update python Docker tag to v3.9.21 2025-01-08 14:43:49 +01:00
f04120fdc0 Merge pull request 'Update plugins/docker Docker tag to v20.18.6' () from renovate/plugins-docker-20.x into main
Reviewed-on: 
2025-01-08 14:25:15 +01:00
1f87e2d96e Update plugins/docker Docker tag to v20.18.6 2025-01-07 21:36:26 +00:00
c5a38dca81 Merge pull request 'Update dependency sqlalchemy to v2.0.36' () from renovate/sqlalchemy-2.x into main
Reviewed-on: 
2025-01-07 21:43:34 +01:00
6424af8b3f Update dependency sqlalchemy to v2.0.36 2025-01-07 20:37:20 +00:00
184b1c33eb Merge pull request 'Update dependency flask-sqlalchemy to v3' () from renovate/flask-sqlalchemy-3.x into main
Reviewed-on: 
2025-01-07 21:25:08 +01:00
5f27eaa9a1
Set the SQLALCHEMY_DATABASE_URI env differently 2024-09-13 15:49:24 +02:00
862bd9f7a3
Explicitly set SQLALCHEMY_DATABASE_URI for tests 2024-09-13 15:43:09 +02:00
8478e8d76e
Fix test errors 2024-09-13 15:38:56 +02:00
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
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
2ff958c55f
Rewrite sqlachemy code for 1.4 to 2.x migration 2024-09-13 13:43:00 +02:00
146eb995a8
Update SQLAlchemy to v2 2024-09-13 13:42:12 +02:00
33187428cf Update dependency flask-sqlalchemy to v3 2024-09-13 11:36:00 +00:00
06caf796cd Merge pull request 'Update dependency flask-migrate to v4' () from renovate/flask-migrate-4.x into main
Reviewed-on: 
2024-09-13 13:13:42 +02:00
54326129e4 Merge pull request 'Update python:3.8.20-alpine Docker digest to 3d93b1f' () from renovate/python into main
Reviewed-on: 
2024-09-13 12:48:09 +02:00
32bb81b69b Update dependency flask-migrate to v4 2024-09-13 10:36:05 +00:00
fc8a06e562 Update python:3.8.20-alpine Docker digest to 3d93b1f 2024-09-13 10:35:25 +00:00
b8b713c620 Merge pull request 'Update dependency reuse to v4' () from renovate/reuse-4.x into main
Reviewed-on: 
2024-09-13 12:33:44 +02:00
186ab9af43
Migrate REUSE config 2024-09-13 12:30:48 +02:00
0d77c8d637 Update dependency reuse to v4 2024-09-11 11:37:14 +00:00
72fda5df51 Merge pull request 'Update dependency reuse to v2' () from renovate/reuse-2.x into main
Reviewed-on: 
2024-09-11 13:30:28 +02:00
739ce0382b Update dependency reuse to v2 2024-09-11 10:37:32 +00:00
4c345ecc5f Merge pull request 'Update dependency sqlalchemy to v1.4.54' () from renovate/sqlalchemy-1.x into main
Reviewed-on: 
2024-09-11 12:00:35 +02:00
5882eeaf2e Update dependency sqlalchemy to v1.4.54 2024-09-10 18:35:55 +00:00
0512bc0dc3 Merge pull request 'Update dependency flask-migrate to v3.1.0' () from renovate/flask-migrate-3.x into main
Reviewed-on: 
2024-09-10 19:42:03 +02:00
319bf9b2f5 Update dependency flask-migrate to v3.1.0 2024-09-10 17:36:22 +00:00
717454e205 Merge pull request 'Update python Docker tag to v3.8.20' () from renovate/patch-python into main
Reviewed-on: 
2024-09-10 15:49:46 +02:00
496550a959 Update python Docker tag to v3.8.20 2024-09-10 13:35:28 +00:00
7ebf13edf3 Merge pull request 'Update python:3.8.19-alpine Docker digest to 8b53bd2' () from renovate/python into main
Reviewed-on: 
2024-09-10 15:03:37 +02:00
5409bdeaee Merge pull request 'Verify lockfile before installation' () from verify-lockfile into main
Reviewed-on: 
2024-09-10 15:03:14 +02:00
4064a65e63
Verify lockfile before installation 2024-09-10 14:52:44 +02:00
afe22e13c1 Merge pull request 'Update dependency python-dotenv to v1' () from renovate/python-dotenv-1.x into main
Reviewed-on: 
2024-09-10 14:30:41 +02:00
e4d0a89053
Update lock file 2024-09-10 14:27:54 +02:00
78bdd796e0 Update dependency python-dotenv to v1 2024-09-10 11:36:39 +00:00
c9f83e80b3 Update python:3.8.19-alpine Docker digest to 8b53bd2 2024-09-10 11:35:27 +00:00
5369de67d8 Merge pull request 'Update dependency pre-commit to v2.21.0' () from renovate/pre-commit-2.x into main
Reviewed-on: 
2024-09-10 13:07:34 +02:00
54c5246f0a Merge pull request 'Add dry-run Docker build to Pull Request CI run' () from docker-dry-run into main
Reviewed-on: 
2024-09-10 13:02:19 +02:00
9a95baf106
Add dry-run Docker build to Pull Request CI run 2024-09-10 12:56:04 +02:00
338380ed93 Update dependency pre-commit to v2.21.0 2024-09-05 09:36:44 +00:00
3d128d771c Merge pull request 'Update dependency flask-cors to v5' () from renovate/flask-cors-5.x into main
Reviewed-on: 
2024-09-05 11:26:34 +02:00
6b7517fc7a Update dependency flask-cors to v5 2024-09-04 21:36:04 +00:00
5ceb361da3 Merge pull request 'Update python:3.8.19-alpine Docker digest to c2f31d1' () from renovate/python into main
Reviewed-on: 
2024-09-04 23:03:32 +02:00
4379a06f26 Update python:3.8.19-alpine Docker digest to c2f31d1 2024-09-04 19:36:16 +00:00
c43f375e4b Merge pull request 'Update dependency flake8 to v7' () from renovate/flake8-7.x into main
Reviewed-on: 
2024-09-04 20:44:01 +02:00
621a90b8ab Update dependency flake8 to v7 2024-08-28 14:36:12 +00:00
033dee7836 Merge pull request 'Update dependency python-dotenv to v0.21.1' () from renovate/python-dotenv-0.x into main
Reviewed-on: 
2024-08-28 16:27:46 +02:00
ca81e8bf70
Merge branch 'main' into renovate/python-dotenv-0.x 2024-08-28 16:02:01 +02:00
d507a20a93 Merge pull request 'Update dependency flake8 to v6' () from renovate/flake8-6.x into main
Reviewed-on: 
2024-08-28 15:52:02 +02:00
3f2c23c386
Merge branch 'main' into renovate/flake8-6.x 2024-08-28 15:46:31 +02:00
b46ac5e379 Merge pull request 'Update dependency pymysql to v1.1.1' () from renovate/pymysql-1.x into main
Reviewed-on: 
2024-08-28 15:43:17 +02:00
fa4429b6ef Update dependency flake8 to v6 2024-08-28 13:37:17 +00:00
7a0f2434db Update dependency python-dotenv to v0.21.1 2024-08-28 13:36:27 +00:00
8c3fe3fe7d Update dependency pymysql to v1.1.1 2024-08-28 13:36:11 +00:00
56ade6de68 Merge pull request 'Update dependency flask to v2.3.3' () from renovate/flask-2.x into main
Reviewed-on: 
Reviewed-by: Brain <brain@noreply.git.wtf-eg.de>
2024-08-28 15:19:36 +02:00
28cf714217 Update dependency flask to v2.3.3 2024-08-28 12:35:38 +00:00
9ff56f6676 Merge pull request 'Update dependency yapf to v0.40.2' () from renovate/yapf-0.x into main
Reviewed-on: 
2024-08-28 13:46:17 +02:00
2412df4960
Apply yapf and add ignorefile 2024-08-28 13:43:33 +02:00
469ef511d6 Merge pull request 'Add .python-version file' () from pyenv into main
Reviewed-on: 
2024-08-28 13:19:28 +02:00
47d2c94b79
Specify license for .python-version 2024-08-28 12:57:31 +02:00
384dd82454 Update dependency yapf to v0.40.2 2024-08-27 17:38:01 +00:00
b0dcfacd25
Add .python-version file 2024-08-27 19:08:52 +02:00
86edb246bf Merge pull request 'revert f02efab07aeabe02a94efd62fbe498659297b36f' () from revert-python-3.11 into main
Reviewed-on: 
2024-08-23 15:59:55 +02:00
9424e21edc revert f02efab07a
revert Merge pull request 'Update python Docker tag to v3.11.9' () from renovate/minor-3.11-python into main

Reviewed-on: 
2024-08-23 15:50:30 +02:00
f02efab07a Merge pull request 'Update python Docker tag to v3.11.9' () from renovate/minor-3.11-python into main
Reviewed-on: 
2024-08-23 15:33:32 +02:00
08f1104942
Merge branch 'main' into renovate/minor-3.11-python 2024-08-23 15:30:29 +02:00
8dde142f38
Try and use Python 3.11 2024-08-23 15:26:39 +02:00
d1b1636aa2 Merge pull request 'Update dependency waitress to v2.1.2' () from renovate/waitress-2.x into main
Reviewed-on: 
2024-08-23 12:01:59 +02:00
3fcd1fa20e Update python Docker tag to v3.11.9 2024-08-22 18:37:13 +00:00
8394400e96 Update dependency waitress to v2.1.2 2024-08-22 18:36:55 +00:00
843050f923 Merge pull request 'Update plugins/docker Docker tag to v20.18.4' () from renovate/plugins-docker-20.x into main
Reviewed-on: 
2024-08-22 19:53:59 +02:00
812913ffe2 Merge pull request 'Update dependency reuse to v0.14.0' () from renovate/reuse-0.x into main
Reviewed-on: 
2024-08-22 19:52:24 +02:00
dee80c7e14 Update plugins/docker Docker tag to v20.18.4 2024-08-22 15:35:49 +00:00
de60ec0d46 Update dependency reuse to v0.14.0 2024-08-22 14:35:41 +00:00
6c6fcea81c Merge pull request 'Update python Docker tag to v3.8.19' () from renovate/patch-python into main
Reviewed-on: 
2024-08-22 13:17:55 +02:00
166e0d40c6 Merge pull request 'Update dependency werkzeug to v2.3.8' () from renovate/werkzeug-2.x into main
Reviewed-on: 
2024-08-22 12:39:36 +02:00
c9b5ab62ed Update python Docker tag to v3.8.19 2024-08-22 10:35:35 +00:00
c0005100b4 Update dependency werkzeug to v2.3.8 2024-08-22 10:35:34 +00:00
d614039cdd Merge pull request 'Pin python Docker tag to 0ef73cd' () from renovate/python into main
Reviewed-on: 
2024-08-22 11:52:25 +02:00
316236a7e5 Merge pull request 'Pin dependencies' () from renovate/pin-dependencies into main
Reviewed-on: 
2024-08-22 11:51:54 +02:00
c15faabd6d
Pinning werkzeug to v2
Thanks for the hint in 
2024-08-22 11:46:27 +02:00
53eab74e60 Pin python Docker tag to 0ef73cd 2024-08-22 09:35:43 +00:00
82d908193c Pin dependencies 2024-08-22 09:35:42 +00:00
6620a6819a Merge pull request 'Configure Renovate' () from renovate/configure into main
Reviewed-on: 
2024-08-22 11:25:28 +02:00
be6fec18ab
Update Renovate config 2024-08-21 22:12:27 +02:00
9ebae03550 Add renovate.json 2024-08-21 19:34:54 +00:00
763a6efc9f Merge pull request 'Improve Docker usage' () from docker-improvements into main
Reviewed-on: 
2024-08-21 21:22:40 +02:00
6f04d23e6c
Add license information to .dockerignore file 2024-08-21 21:17:33 +02:00
155ddc556c
Add .dockerignore file 2024-08-21 21:09:12 +02:00
a5a85e6032
Fix Dockerfile warnings 2024-08-21 21:08:52 +02:00
6a3458a596
Pin Docker images in CI 2024-08-21 20:53:59 +02:00
97be8f4667
Ditch builder and base Docker images
This should make dependency upgrades easier and bring more clarity to the CI pipelines
2024-08-21 20:49:47 +02:00
jaschop
776803fc96 Merge pull request 'Add catalan flag' () from HerHde/ki-backend:add-ca-flag into main
Reviewed-on: 

> Anything else to consider?

I didn't know myself, but it was interesting to find out. No, this should work as soon as deployed. Catalan already exists in the language DB, and the existance of ca.svg is already tested whenever a catalan icon is requested.
2023-12-10 19:08:48 +01:00
jaschop
702f4968f6 Merge pull request 'Use Gitea registry' () from gitea-registry into main
Reviewed-on: 
2023-12-10 18:46:35 +01:00
c1285153ef
Add catalan flag 2023-12-09 21:36:24 +01:00
fdc81844b5
Push image to Gitea registry 2023-12-04 19:51:27 +01:00
b804c22a93
Use Gitea registry for base images 2023-12-04 19:45:08 +01:00
jaschop
9a7a9379e2 Merge pull request 'Add labels to Docker images' () from docker-labels into main
Reviewed-on: 
2023-11-16 11:18:00 +01:00
jaschop
5b707ad294 Merge pull request 'Rewrite Drone config' () from drone-config into main
Reviewed-on: 
2023-11-16 11:17:35 +01:00
c05f040313
Add labels to Docker images 2023-11-07 14:36:41 +01:00
68bf505cd0
Merge install, lint and test steps 2023-11-06 23:30:54 +01:00
2ac03d0c26
Merge install, lint and test steps
Probably necessary because of the virtualenv
2023-11-06 23:20:44 +01:00
6b46ea5516
Rewrite Drone config
- Split PR and push to main actions
- Deploy latest main to dev system
- Build image for Git tags
2023-11-06 23:15:58 +01:00
jaschop
4798263c27 Merge pull request 'qa/seed-refactor' () from qa/seed-refactor into main
Reviewed-on: 
2023-10-27 15:21:24 +02:00
jaschop
274f984994
minor cleanups
removed clutter from models.py
(skill_ids only used for seeding)
changed default value of update_profile handler
(caused a crash during testing)
2023-10-20 16:59:47 +02:00
jaschop
37f57eadea
Refactored seed --dev script
expanded seed_user to handle all user seeding
reordered user seeding, which broke some tests
made tests resistant to seeding order
2023-10-20 12:24:16 +02:00
Nathan Mattes
d7f4acf251 Fix test name () 2023-10-14 21:01:02 +02:00
Nathan Mattes
c65ef4a95c Add a test to test search () 2023-10-14 21:01:02 +02:00
Nathan Mattes
f3840f18b7 Consider real name when searching () 2023-10-14 21:01:02 +02:00
jaschop
da46d01765 Merge pull request 'Update backend base and builder images' () from update-builder into main
Reviewed-on: 
2023-10-11 17:51:46 +02:00
0f9f807256
Update backend base and builder images 2023-10-11 17:40:30 +02:00
jaschop
66294cd52f Merge pull request 'tune threads to avoid queued tasks in normal situations' () from fix/mehr-waitress-threads into main
Reviewed-on: 
2023-09-10 15:53:26 +02:00
jaschop
d4a5c8f5eb
Merge branch 'main' into fix/mehr-waitress-threads 2023-09-10 15:48:45 +02:00
jaschop
5e4d6d464d
bumped pyyaml version to prevent a ci fail 2023-08-24 16:24:34 +02:00
jaschop
6e77647eb9
tune threads to avoid queued tasks in normal situations 2023-08-24 14:25:22 +02:00
f7278bf7ea Merge pull request 'Trigger aufteilen' () from feature/tag-trigger into main
Reviewed-on: 
2022-02-28 19:29:19 +01:00
cf1a5a532c
split trigger 2022-02-28 19:28:35 +01:00
0fd04d4797 Merge pull request 'Tag Trigger' () from feature/tag-trigger into main
Reviewed-on: 
2022-02-28 19:23:06 +01:00
a5bd954bb5
add tag trigger 2022-02-28 19:19:53 +01:00
881c3d3038 Merge pull request 'Code Style reparieren' () from fix/code-style into main
Reviewed-on: 
2022-02-28 18:53:14 +01:00
d60acd169b
fix code style 2022-02-28 18:48:32 +01:00
f1ecbadf05 Merge pull request 'Verbessertes Logging' () from Brain/ki-backend:fix-logging into main
Reviewed-on: 
2022-02-28 18:42:53 +01:00
67cb8c9152 Merge pull request 'Neue Flaggen' () from fix/flags into main
Reviewed-on: 
2022-02-28 18:42:35 +01:00
f7e058d387
Get rid of more duplicate logging 2022-01-26 23:34:38 +01:00
695c88e159
Prevent duplicate log entries 2022-01-26 23:19:26 +01:00
1360b4c738
Give the root logger a nicer format 2022-01-26 23:19:06 +01:00
689a5ba33e
Keep alembic from configuring loggers 2022-01-26 23:17:41 +01:00
19aebcc327
Use app logger instead of root logger 2022-01-26 21:43:31 +01:00
0fcd407006 Merge pull request 'Paginierung' () from feature/pagination into main
Reviewed-on: 
2022-01-24 19:46:26 +01:00
dea781cc29 Merge pull request 'Mehr Prosa über die Aufteilung und wie man mitmachen kann' () from 64bit/ki-backend:mitmachen into main
Reviewed-on: 
2022-01-23 19:59:37 +01:00
2833e5751f
replace flags 2022-01-15 17:51:42 +01:00
4fab7d7cda Merge branch 'main' into mitmachen 2022-01-06 16:36:14 +01:00
Benedikt Brückmann
f131ee335c Mehr Prosa über die Aufteilung und wie man mitmachen kann 2021-09-13 11:26:43 +02:00
312 changed files with 2075 additions and 714 deletions

13
.dockerignore Normal file
View File

@ -0,0 +1,13 @@
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
#
# SPDX-License-Identifier: AGPL-3.0-or-later
*
!Pipfile
!Pipfile.lock
!data/
!ki/
!LICENSES/
!migrations/
!app.py
!run_prod.py

View File

@ -4,31 +4,125 @@
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
kind: pipeline kind: pipeline
type: docker type: docker
name: default name: qa
trigger:
event:
- push
- pull_request
branch:
- main
steps: steps:
- name: qa - name: install-lint-test
image: registry.wtf-eg.net/ki-backend-builder:1.0.0 image: python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c
env:
PYROOT: '/pyroot'
PYTHONUSERBASE: '/pyroot'
commands: commands:
- apk add --no-cache gcc g++ musl-dev python3-dev
- pip3 install pipenv
- pipenv verify
- pipenv install --dev - pipenv install --dev
- pipenv run flake8 - pipenv run flake8
- pipenv run reuse lint - 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
- name: docker-publish image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
image: plugins/docker
settings: settings:
registry: registry.wtf-eg.net registry: git.wtf-eg.de
repo: registry.wtf-eg.net/ki-backend repo: git.wtf-eg.de/kompetenzinventar/backend
target: ki-backend
dry_run: true
when:
event:
- pull_request
---
kind: pipeline
type: docker
name: build
trigger:
event:
- push
branch:
- main
depends_on:
- qa
steps:
- name: docker-publish
image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
settings:
registry: git.wtf-eg.de
repo: git.wtf-eg.de/kompetenzinventar/backend
target: ki-backend target: ki-backend
auto_tag: true auto_tag: true
username: username:
from_secret: "docker_username" from_secret: "docker_username"
password: password:
from_secret: "docker_password" from_secret: "docker_password"
when:
---
kind: pipeline
type: docker
name: deploy
trigger:
event:
- push
branch: branch:
- main - main
image_pull_secrets: depends_on:
- dockerconfig - build
steps:
- name: deploy-dev
image: appleboy/drone-ssh:1.7.5@sha256:995677e073454912f26d4c0fdd2f9df2e1f5a30d6603d3f2ece667311b6babb3
settings:
host:
- dev01.wtf-eg.net
username: drone_deployment
key:
from_secret: "dev01_deployment_key"
command_timeout: 2m
script:
- echo "Executing forced command..."
---
kind: pipeline
type: docker
name: tag-release
trigger:
event:
- tag
steps:
- name: install-lint-test
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 install --dev
- pipenv run flake8
- pipenv run reuse lint
- SQLALCHEMY_DATABASE_URI=sqlite:// pipenv run python -m unittest discover ki
- name: docker-publish
image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
settings:
registry: git.wtf-eg.de
repo: git.wtf-eg.de/kompetenzinventar/backend
target: ki-backend
auto_tag: true
username:
from_secret: "docker_username"
password:
from_secret: "docker_password"

1
.python-version Normal file
View File

@ -0,0 +1 @@
3.9.21

View File

@ -1,12 +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: 2017 Go Squared Ltd. http://www.gosquared.com/
License: MIT
Files: Pipfile.lock migrations/*
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
License: AGPL-3.0-or-later

5
.yapfignore Normal file
View File

@ -0,0 +1,5 @@
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
#
# SPDX-License-Identifier: AGPL-3.0-or-later
migrations/*.py

View File

@ -2,7 +2,17 @@
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
FROM registry.wtf-eg.net/ki-backend-builder:1.0.0 as builder FROM python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c AS builder
ENV PYROOT=/pyroot
ENV PYTHONUSERBASE=$PYROOT
RUN apk add --no-cache \
gcc \
g++ \
musl-dev \
python3-dev && \
pip3 install pipenv
COPY Pipfile* ./ COPY Pipfile* ./
@ -10,7 +20,10 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
RUN pip3 uninstall --yes pipenv RUN pip3 uninstall --yes pipenv
FROM registry.wtf-eg.net/ki-backend-base:1.0.0 as ki-backend FROM python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c AS ki-backend
ENV PYROOT=/pyroot
ENV PYTHONUSERBASE=$PYROOT
# Install six explicitly. Otherwise Python complains about it missing. # Install six explicitly. Otherwise Python complains about it missing.
RUN pip3 install six RUN pip3 install six
@ -22,4 +35,9 @@ WORKDIR /app
COPY . . COPY . .
LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-backend.git
LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-backend
LABEL org.opencontainers.image.documentation=https://git.wtf-eg.de/kompetenzinventar/ki-backend#docker
LABEL org.opencontainers.image.vendor="WTF Kooperative eG"
CMD ["python3", "run_prod.py"] CMD ["python3", "run_prod.py"]

31
Pipfile
View File

@ -8,25 +8,26 @@ verify_ssl = true
name = "pypi" name = "pypi"
[packages] [packages]
flask = "~=2.0.1" flask = "==2.3.3"
python-dotenv = "~=0.17.1" python-dotenv = "==1.0.1"
flask-migrate = "~=3.0.1" flask-migrate = "==4.0.7"
flask-sqlalchemy = "~=2.5.1" flask-sqlalchemy = "==3.1.1"
sqlalchemy = "~=1.4.18" sqlalchemy = "==2.0.36"
waitress = "~=2.0.0" waitress = "==2.1.2"
pyyaml = "~=5.4.1" pyyaml = "==6.0.2"
flask-cors = "~=3.0.10" flask-cors = "==5.0.0"
ldap3 = "~=2.9" ldap3 = "==2.9.1"
pymysql = "~=1.0.2" pymysql = "==1.1.1"
werkzeug = "==2.3.8"
[dev-packages] [dev-packages]
flake8 = "~=3.9.2" flake8 = "==7.1.1"
yapf = "~=0.31.0" yapf = "==0.40.2"
pre-commit = "~=2.13.0" pre-commit = "==2.21.0"
reuse = "~=0.13.0" reuse = "==4.0.3"
[requires] [requires]
python_version = "3.8" python_version = "3.9"
[scripts] [scripts]
clean = "rm data/ki.sqlite" clean = "rm data/ki.sqlite"

933
Pipfile.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -9,11 +9,37 @@ SPDX-License-Identifier: AGPL-3.0-or-later
[![Build Status](https://drone.wtf-eg.de/api/badges/kompetenzinventar/ki-backend/status.svg?ref=refs/heads/main)](https://drone.wtf-eg.de/kompetenzinventar/ki-backend) [![Build Status](https://drone.wtf-eg.de/api/badges/kompetenzinventar/ki-backend/status.svg?ref=refs/heads/main)](https://drone.wtf-eg.de/kompetenzinventar/ki-backend)
[![REUSE status](https://api.reuse.software/badge/git.wtf-eg.de/kompetenzinventar/ki-backend)](https://api.reuse.software/info/git.wtf-eg.de/kompetenzinventar/ki-backend) [![REUSE status](https://api.reuse.software/badge/git.wtf-eg.de/kompetenzinventar/ki-backend)](https://api.reuse.software/info/git.wtf-eg.de/kompetenzinventar/ki-backend)
## Über
Dieses Repo enthält das Backend des Projekts Kompentenzinventar - einer Webapplikation zur Erfassung von Userprofilen für die WTF eG.
Implementiert ist das Backend mit Flask.
### Mitmachen
Du kannst gerne bei der Entwicklung des Kompetenzinventars mitmachen.
- Fehler oder fehlende Funktionen erfassen. Bitte direkt über die [Issues](https://git.wtf-eg.de/kompetenzinventar/ki-backend/issues) in Gitea.
- Dokumentation oder Implementierung verbessern. Bitte forke hierzu das Projekt, branche von `main` ab und erstelle dann einen [Pull Request](https://git.wtf-eg.de/kompetenzinventar/ki-backend/pulls).
### Kommunikation
Folgende Kanäle gibt es für die Kommunikation über das Kompetenzinventar:
- Die [Issues](https://git.wtf-eg.de/kompetenzinventar/ki-backend/issues) im WTF Gitea.
- Den Bereich [AG Entwicklung](https://forum.wtf-eg.de/c/interna/ag-entwicklung/21) im WTF Forum.
- Einen Raum in Matrix. Zutritt per Einladung, frlan lädt ein, eine einfache PN im Forum reicht.
### Repos
* **[ki-backend](https://git.wtf-eg.de/kompetenzinventar/ki-backend)** (dieses Repo) enthält das Backend
* [ki-frontend](https://git.wtf-eg.de/kompetenzinventar/ki-frontend) enthält das Frontend
* Weitere Repositories befinden sich in der Gitea Organisation [Kompetenzinventar](https://git.wtf-eg.de/kompetenzinventar).
## Entwicklung ## Entwicklung
### Abhängigkeiten ### Abhängigkeiten
- Python 3.8 - Python 3.9
- [Pipenv](https://github.com/pypa/pipenv) - [Pipenv](https://github.com/pypa/pipenv)
@ -196,25 +222,6 @@ docker-compose up
Dann http://localhost:13337 aufrufen. Dann http://localhost:13337 aufrufen.
### Workaround, falls der Zugriff auf registry.wtf-eg.net nicht möglich ist
Voraussetzung:
[ki-backend-docker](https://git.wtf-eg.de/kompetenzinventar/ki-backend-docker) muss parallel zum `ki-backend` ausgecheckt sein.
```
cd ki-backend-docker
docker build . --target base -t ki-backend-base
docker build . --target builder -t ki-backend-builder
```
Ändern der 2 Einträge im `Dockerfile` des `ki-backend`:
- registry.wtf-eg.net/ki-backend-builder:1.0.0 -> ki-backend-builder
- registry.wtf-eg.net/ki-backend-base:1.0.0 -> ki-backend-base
Danach sollte `docker-compose up` funktionieren.
## Lizenzen ## Lizenzen
Dieses Projekt erfüllt die [REUSE](https://reuse.software/) Spezifikation. Dieses Projekt erfüllt die [REUSE](https://reuse.software/) Spezifikation.

24
REUSE.toml Normal file
View File

@ -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"

17
app.py
View File

@ -8,22 +8,23 @@ import os
from dotenv import load_dotenv, find_dotenv from dotenv import load_dotenv, find_dotenv
from flask import Flask from flask import Flask
from flask_cors import CORS from flask_cors import CORS
from flask.logging import default_handler
from flask_migrate import Migrate from flask_migrate import Migrate
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from ldap3.utils.log import logger as ldap3_logger
from ldap3.utils.log import set_library_log_detail_level, BASIC from ldap3.utils.log import set_library_log_detail_level, BASIC
load_dotenv(find_dotenv()) load_dotenv(find_dotenv())
app = Flask(__name__) app = Flask(__name__)
# Configure logging
loglevel = os.getenv("KI_LOGLEVEL", logging.WARNING) loglevel = os.getenv("KI_LOGLEVEL", logging.WARNING)
loglevel = int(loglevel) loglevel = int(loglevel)
app.logger.setLevel(loglevel) app.logger.setLevel(loglevel)
logging.basicConfig(level=loglevel) app.logger.propagate = False # do not forward messages to the root logger
logging.basicConfig(level=loglevel,
set_library_log_detail_level(BASIC) format='[%(asctime)s] %(levelname)s [%(name)s] %(message)s') # configure root logger as fallback
ldap3_logger.addHandler(default_handler) logging.getLogger('werkzeug').propagate = False # werkzeug has its own ColorStreamHandler
set_library_log_detail_level(BASIC) # ldap3 has different verbosity levels internally
app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("SQLALCHEMY_DATABASE_URI") app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("SQLALCHEMY_DATABASE_URI")
app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
@ -37,9 +38,9 @@ app.config["KI_LDAP_AUTH_PASSWORD"] = os.getenv("KI_LDAP_AUTH_PASSWORD")
app.config["KI_LDAP_BASE_DN"] = os.getenv("KI_LDAP_BASE_DN") app.config["KI_LDAP_BASE_DN"] = os.getenv("KI_LDAP_BASE_DN")
CORS(app) CORS(app)
db = SQLAlchemy(app) db = SQLAlchemy(app, session_options={"future": True})
migrate = Migrate(app, db, compare_type=True) migrate = Migrate(app, db, compare_type=True)
logging.debug("Hello from KI") app.logger.info("Hello from KI")
from ki import module # noqa from ki import module # noqa

View File

@ -1,11 +0,0 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"
[packages]
[dev-packages]
[requires]
python_version = "3.8"

Binary file not shown.

Before

(image error) Size: 977 B

Binary file not shown.

Before

(image error) Size: 560 B

Binary file not shown.

Before

(image error) Size: 2.3 KiB

Binary file not shown.

Before

(image error) Size: 2.2 KiB

Binary file not shown.

Before

(image error) Size: 171 B

Binary file not shown.

Before

(image error) Size: 614 B

Binary file not shown.

Before

(image error) Size: 1.5 KiB

Binary file not shown.

Before

(image error) Size: 181 B

Binary file not shown.

Before

(image error) Size: 212 B

Binary file not shown.

Before

(image error) Size: 1.5 KiB

Binary file not shown.

Before

(image error) Size: 583 B

Binary file not shown.

Before

(image error) Size: 1.9 KiB

Binary file not shown.

Before

(image error) Size: 178 B

Binary file not shown.

Before

(image error) Size: 541 B

Binary file not shown.

Before

(image error) Size: 1.5 KiB

Binary file not shown.

Before

(image error) Size: 168 B

Binary file not shown.

Before

(image error) Size: 1.5 KiB

Binary file not shown.

Before

(image error) Size: 3.9 KiB

Binary file not shown.

Before

(image error) Size: 1.3 KiB

Binary file not shown.

Before

(image error) Size: 180 B

Binary file not shown.

Before

(image error) Size: 1.2 KiB

Binary file not shown.

Before

(image error) Size: 862 B

Binary file not shown.

Before

(image error) Size: 1.4 KiB

Binary file not shown.

Before

(image error) Size: 1.5 KiB

Binary file not shown.

Before

(image error) Size: 169 B

Binary file not shown.

Before

(image error) Size: 295 B

Binary file not shown.

Before

(image error) Size: 1.1 KiB

Binary file not shown.

Before

(image error) Size: 1.2 KiB

Binary file not shown.

Before

(image error) Size: 617 B

Binary file not shown.

Before

(image error) Size: 1.8 KiB

Binary file not shown.

Before

(image error) Size: 172 B

Binary file not shown.

Before

(image error) Size: 983 B

Binary file not shown.

Before

(image error) Size: 639 B

Binary file not shown.

Before

(image error) Size: 206 B

Binary file not shown.

Before

(image error) Size: 755 B

Binary file not shown.

Before

(image error) Size: 734 B

Binary file not shown.

Before

(image error) Size: 444 B

Binary file not shown.

Before

(image error) Size: 434 B

Binary file not shown.

Before

(image error) Size: 178 B

Binary file not shown.

Before

(image error) Size: 430 B

Binary file not shown.

Before

(image error) Size: 172 B

7
data/imgs/flags/bg.svg Normal file
View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-bg" viewBox="0 0 640 480">
<g fill-rule="evenodd" stroke-width="1pt">
<path fill="#d62612" d="M0 320h640v160H0z"/>
<path fill="#fff" d="M0 0h640v160H0z"/>
<path fill="#00966e" d="M0 160h640v160H0z"/>
</g>
</svg>

After

(image error) Size: 283 B

Binary file not shown.

Before

(image error) Size: 340 B

Binary file not shown.

Before

(image error) Size: 1.0 KiB

Binary file not shown.

Before

(image error) Size: 184 B

Binary file not shown.

Before

(image error) Size: 4.0 KiB

Binary file not shown.

Before

(image error) Size: 1.7 KiB

Binary file not shown.

Before

(image error) Size: 2.5 KiB

Binary file not shown.

Before

(image error) Size: 686 B

Binary file not shown.

Before

(image error) Size: 2.1 KiB

Binary file not shown.

Before

(image error) Size: 467 B

Binary file not shown.

Before

(image error) Size: 2.6 KiB

Binary file not shown.

Before

(image error) Size: 178 B

Binary file not shown.

Before

(image error) Size: 595 B

Binary file not shown.

Before

(image error) Size: 2.7 KiB

Binary file not shown.

Before

(image error) Size: 486 B

5
data/imgs/flags/ca.svg Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="810" height="540">
<rect width="810" height="540" fill="#FCDD09"/>
<path stroke="#DA121A" stroke-width="60" d="M0,90H810m0,120H0m0,120H810m0,120H0"/>
</svg>

After

(image error) Size: 242 B

Binary file not shown.

Before

(image error) Size: 1004 B

Binary file not shown.

Before

(image error) Size: 1.3 KiB

Binary file not shown.

Before

(image error) Size: 377 B

Binary file not shown.

Before

(image error) Size: 323 B

Binary file not shown.

Before

(image error) Size: 175 B

Binary file not shown.

Before

(image error) Size: 172 B

Binary file not shown.

Before

(image error) Size: 1.8 KiB

Binary file not shown.

Before

(image error) Size: 309 B

Binary file not shown.

Before

(image error) Size: 367 B

Binary file not shown.

Before

(image error) Size: 745 B

Binary file not shown.

Before

(image error) Size: 174 B

Binary file not shown.

Before

(image error) Size: 184 B

Binary file not shown.

Before

(image error) Size: 369 B

5
data/imgs/flags/cs.svg Normal file
View File

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-cz" viewBox="0 0 640 480">
<path fill="#fff" d="M0 0h640v240H0z"/>
<path fill="#d7141a" d="M0 240h640v240H0z"/>
<path fill="#11457e" d="M360 240 0 0v480z"/>
</svg>

After

(image error) Size: 225 B

Binary file not shown.

Before

(image error) Size: 1.7 KiB

Binary file not shown.

Before

(image error) Size: 605 B

Binary file not shown.

Before

(image error) Size: 360 B

Binary file not shown.

Before

(image error) Size: 441 B

Binary file not shown.

Before

(image error) Size: 1.5 KiB

Binary file not shown.

Before

(image error) Size: 1.1 KiB

Binary file not shown.

Before

(image error) Size: 369 B

5
data/imgs/flags/da.svg Normal file
View File

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-dk" viewBox="0 0 640 480">
<path fill="#c8102e" d="M0 0h640.1v480H0z"/>
<path fill="#fff" d="M205.7 0h68.6v480h-68.6z"/>
<path fill="#fff" d="M0 205.7h640.1v68.6H0z"/>
</svg>

After

(image error) Size: 236 B

Binary file not shown.

Before

(image error) Size: 168 B

5
data/imgs/flags/de.svg Normal file
View File

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-de" viewBox="0 0 640 480">
<path fill="#ffce00" d="M0 320h640v160H0z"/>
<path d="M0 0h640v160H0z"/>
<path fill="#d00" d="M0 160h640v160H0z"/>
</svg>

After

(image error) Size: 210 B

Binary file not shown.

Before

(image error) Size: 452 B

Binary file not shown.

Before

(image error) Size: 180 B

Binary file not shown.

Before

(image error) Size: 1.3 KiB

Binary file not shown.

Before

(image error) Size: 588 B

Binary file not shown.

Before

(image error) Size: 592 B

Binary file not shown.

Before

(image error) Size: 1.3 KiB

Binary file not shown.

Before

(image error) Size: 170 B

Some files were not shown because too many files have changed in this diff Show More