From cceb62cfc4ff16a9d4f078468f261f2e9838e542 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Thu, 11 Apr 2024 05:45:14 +0300 Subject: [PATCH] Remove butterfly installation workarounds --- builder/image-software.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/image-software.sh b/builder/image-software.sh index d5137ba4b..46270f9e2 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -141,11 +141,11 @@ echo_stamp "Install rosdep" my_travis_retry pip3 install -U rosdep echo_stamp "Install and enable Butterfly (web terminal)" -echo_stamp "Workaround for tornado >= 6.0 breaking butterfly" -export CRYPTOGRAPHY_DONT_BUILD_RUST=1 -my_travis_retry pip3 install cryptography==3.4.6 # https://stackoverflow.com/a/68472128/6850197 -my_travis_retry pip3 install pyOpenSSL==20.0.1 -my_travis_retry pip3 install tornado==5.1.1 +# echo_stamp "Workaround for tornado >= 6.0 breaking butterfly" +# export CRYPTOGRAPHY_DONT_BUILD_RUST=1 +# my_travis_retry pip3 install cryptography==3.4.6 # https://stackoverflow.com/a/68472128/6850197 +# my_travis_retry pip3 install pyOpenSSL==20.0.1 +# my_travis_retry pip3 install tornado==5.1.1 my_travis_retry pip3 install butterfly my_travis_retry pip3 install butterfly[systemd] systemctl enable butterfly.socket