From ac4a2223d49508c468aa25c3c53ae701128266b9 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 8 Aug 2024 21:47:58 +0200
Subject: [PATCH] Merp conflicting pip dependencies tox vs. packaging

---
 image_builder | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/image_builder b/image_builder
index 1112c02..013ddd3 100755
--- a/image_builder
+++ b/image_builder
@@ -104,9 +104,13 @@ function rebuild_build_and_lint()
     $IN_CONTAINER /bin/bash -c "DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt-get --assume-yes install $TOOLING_APT_DEPENDENCIES --no-install-recommends"
     $IN_CONTAINER /bin/bash -c "apt-get clean"
 
-    # b) running tox, black, mypy, flake8, i18n string consistency check, bot sending PRs
-    TOOLING_PIP_DEPENDENCIES='pyOpenSSL "tox>=4.17" ansi2html toml "black>=24.4" jinja2 "packaging<22"'
-    [[ $DEBIAN_VERSION == "bullseye" ]] || TOOLING_PIP_DEPENDENCIES+=" --break-system-packages"
+    # b) running tox, black, mypy, flake8, i18n string consistency check, bot sending PRs (actually this one is 'hub' in apt dependency right before)
+    if [[ $DEBIAN_VERSION == "bullseye" ]]
+    then
+        TOOLING_PIP_DEPENDENCIES='pyOpenSSL "tox==4.0.0" ansi2html toml "black>=24.4" jinja2 "packaging<22"'
+    else
+        TOOLING_PIP_DEPENDENCIES='pyOpenSSL "tox>=4.17 ansi2html toml "black>=24.4" jinja --break-system-packages'
+    fi
     $IN_CONTAINER /bin/bash -c "PIP_NO_CACHE_DIR=1 PIP_PROGRESS_BAR='off' python3 -m pip install -U $TOOLING_PIP_DEPENDENCIES"
 
     TOOLING_PIP_DEPENDENCIES='types-ipaddress types-enum34 types-cryptography types-toml types-requests types-PyYAML types-pyOpenSSL types-mock'