From 3014a2d97d66f6f4f8989fdbf2940c39eb8614a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 6 Mar 2024 23:54:16 +0100
Subject: [PATCH] Fix requirement issues

---
 auto_update/auto_update.sh    | 4 ++--
 conf/requirement_bookworm.txt | 2 --
 conf/requirement_bullseye.txt | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/auto_update/auto_update.sh b/auto_update/auto_update.sh
index e022354..4ed5b0d 100644
--- a/auto_update/auto_update.sh
+++ b/auto_update/auto_update.sh
@@ -4,8 +4,8 @@ set -eu
 
 source auto_update_config.sh
 
-readonly debian_version_name_1="bookworm"
-readonly debian_version_name_2="bullseye"
+readonly debian_version_name_1=bullseye
+readonly debian_version_name_2=bookworm
 
 get_from_manifest() {
     result=$(python3 <<EOL
diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt
index 3003688..c241eee 100644
--- a/conf/requirement_bookworm.txt
+++ b/conf/requirement_bookworm.txt
@@ -29,7 +29,6 @@ netaddr==1.2.1
 packaging==23.2
 phonenumbers==8.13.31
 pillow==10.2.0
-pkg_resources==0.0.0
 prometheus_client==0.20.0
 psycopg2==2.9.9
 pyasn1==0.5.1
@@ -50,7 +49,6 @@ setuptools-rust==1.9.0
 signedjson==1.1.4
 six==1.16.0
 sortedcontainers==2.4.0
-tomli==2.0.1
 treq==23.11.0
 Twisted==24.3.0
 typing_extensions==4.10.0
diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt
index c241eee..5e0f242 100644
--- a/conf/requirement_bullseye.txt
+++ b/conf/requirement_bullseye.txt
@@ -49,6 +49,7 @@ setuptools-rust==1.9.0
 signedjson==1.1.4
 six==1.16.0
 sortedcontainers==2.4.0
+tomli==2.0.1
 treq==23.11.0
 Twisted==24.3.0
 typing_extensions==4.10.0