From 2b2c0626726902e382667961b118f379890ed1d7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 8 Aug 2024 20:49:18 +0200 Subject: [PATCH] Splitup pip dependencies install because otherwise the solver is confused sometimes --- image_builder | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/image_builder b/image_builder index d0f1695..99aa7aa 100755 --- a/image_builder +++ b/image_builder @@ -105,7 +105,11 @@ function rebuild_build_and_lint() $IN_CONTAINER /bin/bash -c "apt-get clean" # b) running tox, black, mypy, flake8, i18n string consistency check, bot sending PRs - TOOLING_PIP_DEPENDENCIES=' hub pip pyOpenSSL tox ansi2html toml black jinja2 types-ipaddress types-enum34 types-cryptography types-toml types-requests types-PyYAML types-pyOpenSSL types-mock "packaging<22"' + TOOLING_PIP_DEPENDENCIES='hub pyOpenSSL tox ansi2html toml black jinja2 "packaging<22"' + [[ $DEBIAN_VERSION == "bullseye" ]] || TOOLING_PIP_DEPENDENCIES+=" --break-system-packages" + $IN_CONTAINER /bin/bash -c "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' [[ $DEBIAN_VERSION == "bullseye" ]] || TOOLING_PIP_DEPENDENCIES+=" --break-system-packages" $IN_CONTAINER /bin/bash -c "PIP_PROGRESS_BAR='off' python3 -m pip install -U $TOOLING_PIP_DEPENDENCIES"