From bb13e902bc22ef97cccc1e582e28e686ef197730 Mon Sep 17 00:00:00 2001 From: Philippe Le Van Date: Thu, 7 Nov 2024 14:59:22 +0100 Subject: [PATCH] Prepartion to upgrade to debian 13 and library upgrades --- Dockerfile | 2 +- .../unittest/files/content/html.expected.txt | 6 ++-- .../unittest/files/content/table.expected.txt | 32 +++++-------------- requirements.txt | 18 +++++------ 4 files changed, 20 insertions(+), 38 deletions(-) diff --git a/Dockerfile b/Dockerfile index 043115b..6774443 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim as prod +FROM debian:trixie-slim as prod RUN --mount=type=cache,id=apt-cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,id=apt-lib,target=/var/lib/apt,sharing=locked \ --mount=type=cache,id=debconf,target=/var/cache/debconf,sharing=locked \ diff --git a/lotemplate/unittest/files/content/html.expected.txt b/lotemplate/unittest/files/content/html.expected.txt index 4435938..b2aace3 100644 --- a/lotemplate/unittest/files/content/html.expected.txt +++ b/lotemplate/unittest/files/content/html.expected.txt @@ -29,8 +29,6 @@ Address :  123   -perso 1 -string 1 -perso 2 -lastname with < and > +perso 1 string 1 +perso 2 lastname with < and > diff --git a/lotemplate/unittest/files/content/table.expected.txt b/lotemplate/unittest/files/content/table.expected.txt index 0e67f24..55250ab 100644 --- a/lotemplate/unittest/files/content/table.expected.txt +++ b/lotemplate/unittest/files/content/table.expected.txt @@ -1,26 +1,10 @@  -Column1 -Column2 -Column3 -a -static -A -b -static -B -c -static -C -d -static -D -e -static -E -f -static -F -g -static -G +Column1 Column2 Column3 +a static A +b static B +c static C +d static D +e static E +f static F +g static G diff --git a/requirements.txt b/requirements.txt index d38e4bc..6490e1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -configargparse~=1.5.1 -Flask~=2.2.2 -python-dotenv~=0.21.0 -Pillow~=9.4.0 -gunicorn~=20.1.0 -Werkzeug~=2.2.2 -sorcery~=0.2.1 -regex~=2022.10.31 -pypdf~=4.2.0 \ No newline at end of file +configargparse~=1.7 +Flask~=3.0.3 +python-dotenv~=1.0.1 +Pillow~=11.0.0 +gunicorn~=23.0.0 +Werkzeug~=3.1.2 +sorcery~=0.2.2 +regex~=2024.11.6 +pypdf~=5.1.0 \ No newline at end of file