From be6797efc7af5d696a8e365211f5d28f9414c22b Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 23 Apr 2024 07:43:39 +0200 Subject: [PATCH 1/6] requirements.txt updated --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d084a8c..ed8dd48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -fastapi==0.110.1 +fastapi==0.110.2 uvicorn[standard]==0.29.0 python-jose==3.3.0 pycryptodome==3.20.0 From 11f14565387404597c1e7543d2a2688e4cc3e46f Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 07:56:13 +0200 Subject: [PATCH 2/6] test image matrix --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ef24bf..5ca622b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ build:pacman: - "*.pkg.tar.zst" test: - image: python:3.11-slim-bookworm + image: $IMAGE stage: test interruptible: true rules: @@ -141,6 +141,7 @@ test: DATABASE: sqlite:///../app/db.sqlite parallel: matrix: + - IMAGE: ['python:3.11-slim-bookworm'] - REQUIREMENTS: - requirements.txt - .DEBIAN/requirements-bookworm-12.txt From 4ebb4d790e7a9f29a319d63673b4b26fe4aab0e2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 08:22:47 +0200 Subject: [PATCH 3/6] added ubuntu-24.04 "requirements-ubuntu-24.04.txt" --- .DEBIAN/requirements-ubuntu-24.04.txt | 10 ++++++++++ .gitlab-ci.yml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .DEBIAN/requirements-ubuntu-24.04.txt diff --git a/.DEBIAN/requirements-ubuntu-24.04.txt b/.DEBIAN/requirements-ubuntu-24.04.txt new file mode 100644 index 0000000..7cb653b --- /dev/null +++ b/.DEBIAN/requirements-ubuntu-24.04.txt @@ -0,0 +1,10 @@ +# https://packages.ubuntu.com +fastapi==0.101.0 +uvicorn[standard]==0.27.1 +python-jose[pycryptodome]==3.3.0 +pycryptodome==3.20.0 +python-dateutil==2.8.2 +sqlalchemy==1.4.50 +markdown==3.5.2 +python-dotenv==1.0.1 +jinja2==3.1.2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ca622b..f7ba457 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ build:pacman: - "*.pkg.tar.zst" test: - image: $IMAGE + image: python:3.11-slim-bookworm stage: test interruptible: true rules: @@ -141,11 +141,11 @@ test: DATABASE: sqlite:///../app/db.sqlite parallel: matrix: - - IMAGE: ['python:3.11-slim-bookworm'] - 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 From 78c1978dd50d7737aee0a3f2b8886d05e82fa8a2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 09:15:46 +0200 Subject: [PATCH 4/6] added test matrix for python3.12 --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7ba457..5543e53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ build:pacman: - "*.pkg.tar.zst" test: - image: python:3.11-slim-bookworm + image: $IMAGE stage: test interruptible: true rules: @@ -141,7 +141,8 @@ 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 @@ -206,7 +207,7 @@ test:debian: test:ubuntu: extends: .test:linux - image: ubuntu:23.10 + image: ubuntu:24.04 test:archlinux: image: archlinux:base From e51d6bd391b770d962e3f6dcdd139f5bd02fd075 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 09:16:20 +0200 Subject: [PATCH 5/6] added Ubuntu 24.04 as supported --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bc1a670..95f2ee0 100644 --- a/README.md +++ b/README.md @@ -330,6 +330,7 @@ Successful tested with: - Ubuntu 22.10 (Kinetic Kudu) (EOL: July 20, 2023) - Ubuntu 23.04 (Lunar Lobster) (EOL: January 2024) - Ubuntu 23.10 (Mantic Minotaur) (EOL: July 2024) +- Ubuntu 24.04 (Noble Numbat) (EOL: April 2036) Not working with: From ad3b622c23c885d9f8609b4e72cd299f3cfb4f8a Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 10:09:28 +0200 Subject: [PATCH 6/6] requirements.txt updated --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ed8dd48..097c30b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -fastapi==0.110.2 +fastapi==0.111.0 uvicorn[standard]==0.29.0 python-jose==3.3.0 pycryptodome==3.20.0 python-dateutil==2.8.2 -sqlalchemy==2.0.29 +sqlalchemy==2.0.30 markdown==3.6 python-dotenv==1.0.1