Merge branch 'refs/heads/dev' into ui

# Conflicts:
#	app/main.py
#	app/orm.py
This commit is contained in:
Oscar Krause
2024-06-21 19:08:14 +02:00
9 changed files with 320 additions and 67 deletions

View File

@@ -127,7 +127,7 @@ build:pacman:
- "*.pkg.tar.zst"
test:
image: python:3.11-slim-bookworm
image: $IMAGE
stage: test
interruptible: true
rules:
@@ -142,10 +142,12 @@ test:
DATABASE: sqlite:///../app/db.sqlite
parallel:
matrix:
- REQUIREMENTS:
- IMAGE: [ 'python:3.11-slim-bookworm', 'python:3.12-slim-bullseye' ]
REQUIREMENTS:
- requirements.txt
- .DEBIAN/requirements-bookworm-12.txt
- .DEBIAN/requirements-ubuntu-23.10.txt
- .DEBIAN/requirements-ubuntu-24.04.txt
before_script:
- apt-get update && apt-get install -y python3-dev gcc
- pip install -r $REQUIREMENTS
@@ -206,7 +208,7 @@ test:debian:
test:ubuntu:
extends: .test:linux
image: ubuntu:23.10
image: ubuntu:24.04
test:archlinux:
image: archlinux:base