From 239b036842e69787eee0408668707ad9280def6a Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 8 Dec 2025 11:21:31 +0100 Subject: [PATCH 1/5] fix urllib3 update --- runs/atreboot.sh | 2 ++ runs/install_packages.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/runs/atreboot.sh b/runs/atreboot.sh index e9d355fff9..140eaf1141 100755 --- a/runs/atreboot.sh +++ b/runs/atreboot.sh @@ -184,6 +184,8 @@ chmod 666 "$LOGFILE" echo "path '/etc/apt/apt.conf.d' is missing! unsupported system!" fi if ((hasInet == 1)); then + # remove urllib3 version to avoid conflicts + pip uninstall urllib3 -y "${OPENWBBASEDIR}/runs/install_packages.sh" else echo "no internet connection, skipping package installation" diff --git a/runs/install_packages.sh b/runs/install_packages.sh index 913569bc50..e2c835e722 100755 --- a/runs/install_packages.sh +++ b/runs/install_packages.sh @@ -8,6 +8,7 @@ sudo apt-get -q -y install \ git \ mosquitto mosquitto-clients \ python3-pip \ + python3-urllib3=1.26.5-1~exp1+deb11u1 \ xserver-xorg x11-xserver-utils openbox-lxde-session lightdm lightdm-autologin-greeter accountsservice \ chromium chromium-l10n -echo "done" +echo "done" \ No newline at end of file From 94f93ef4cac74320ada137d3036785f5ce012dd6 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 8 Dec 2025 11:35:03 +0100 Subject: [PATCH 2/5] remove version pinning --- runs/install_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runs/install_packages.sh b/runs/install_packages.sh index e2c835e722..07e95243cc 100755 --- a/runs/install_packages.sh +++ b/runs/install_packages.sh @@ -8,7 +8,7 @@ sudo apt-get -q -y install \ git \ mosquitto mosquitto-clients \ python3-pip \ - python3-urllib3=1.26.5-1~exp1+deb11u1 \ + python3-urllib3 \ xserver-xorg x11-xserver-utils openbox-lxde-session lightdm lightdm-autologin-greeter accountsservice \ chromium chromium-l10n echo "done" \ No newline at end of file From 6092dab4ec15da411a3ceb8a1dd611b3a3268988 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 8 Dec 2025 11:35:39 +0100 Subject: [PATCH 3/5] end of file --- runs/install_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runs/install_packages.sh b/runs/install_packages.sh index 07e95243cc..40121d7b41 100755 --- a/runs/install_packages.sh +++ b/runs/install_packages.sh @@ -11,4 +11,4 @@ sudo apt-get -q -y install \ python3-urllib3 \ xserver-xorg x11-xserver-utils openbox-lxde-session lightdm lightdm-autologin-greeter accountsservice \ chromium chromium-l10n -echo "done" \ No newline at end of file +echo "done" From 095a0e8e67d145fa0968d3d58342081427980003 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 8 Dec 2025 11:36:29 +0100 Subject: [PATCH 4/5] fix indentation --- runs/atreboot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runs/atreboot.sh b/runs/atreboot.sh index 140eaf1141..3485ec0c3d 100755 --- a/runs/atreboot.sh +++ b/runs/atreboot.sh @@ -184,7 +184,7 @@ chmod 666 "$LOGFILE" echo "path '/etc/apt/apt.conf.d' is missing! unsupported system!" fi if ((hasInet == 1)); then - # remove urllib3 version to avoid conflicts + # remove urllib3 version to avoid conflicts pip uninstall urllib3 -y "${OPENWBBASEDIR}/runs/install_packages.sh" else From f1560291752cd6e3818c67bb77885a1a70424383 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 8 Dec 2025 11:47:41 +0100 Subject: [PATCH 5/5] remove urllib3 from pip installation --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index df74aa2955..50a82e8a72 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +# don't update python distribution packages in here typing-extensions==4.4.0 jq==1.1.3 paho_mqtt==1.6.1 @@ -24,4 +25,3 @@ ocpp==1.0.0 websockets==12.0 pycarwings3==0.7.14 asyncio==3.4.3 -urllib3==2.6.0