From 64b7b575a26797c27fb59c7c1f2962c8589b6c6a Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Mon, 15 Apr 2024 12:50:29 -0700 Subject: [PATCH] Remove python3-flake8 workaround for Noble (#669) Signed-off-by: Christophe Bedard --- dist/index.js | 10 ---------- src/setup-ros-linux.ts | 11 ----------- 2 files changed, 21 deletions(-) diff --git a/dist/index.js b/dist/index.js index bacd258db..c1c5d898a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -7281,16 +7281,6 @@ function runLinux() { } // Install development-related packages and some common dependencies yield apt.installAptDependencies(installConnext); - // Workaround for Noble: we need a newer version of python3-flake8 - if ("noble" == ubuntuCodename) { - yield utils.exec("sudo", [ - "bash", - "-c", - `echo "deb http://archive.ubuntu.com/ubuntu/ ${ubuntuCodename}-proposed restricted main multiverse universe" >> /etc/apt/sources.list.d/ubuntu-${ubuntuCodename}-proposed.list`, - ]); - yield utils.exec("sudo", ["apt-get", "update"]); - yield apt.runAptGetInstall([`python3-flake8/${ubuntuCodename}-proposed`]); - } // We don't use pip here to install dependencies for ROS 2 if (ubuntuCodename === ros1UbuntuVersion) { /* pip3 dependencies need to be installed after the APT ones, as pip3 diff --git a/src/setup-ros-linux.ts b/src/setup-ros-linux.ts index f0730f624..109a5902f 100644 --- a/src/setup-ros-linux.ts +++ b/src/setup-ros-linux.ts @@ -175,17 +175,6 @@ export async function runLinux(): Promise { // Install development-related packages and some common dependencies await apt.installAptDependencies(installConnext); - // Workaround for Noble: we need a newer version of python3-flake8 - if ("noble" == ubuntuCodename) { - await utils.exec("sudo", [ - "bash", - "-c", - `echo "deb http://archive.ubuntu.com/ubuntu/ ${ubuntuCodename}-proposed restricted main multiverse universe" >> /etc/apt/sources.list.d/ubuntu-${ubuntuCodename}-proposed.list`, - ]); - await utils.exec("sudo", ["apt-get", "update"]); - await apt.runAptGetInstall([`python3-flake8/${ubuntuCodename}-proposed`]); - } - // We don't use pip here to install dependencies for ROS 2 if (ubuntuCodename === ros1UbuntuVersion) { /* pip3 dependencies need to be installed after the APT ones, as pip3