Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove python3-flake8 workaround for Noble #669

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Remove python3-flake8 workaround for Noble #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions src/setup-ros-linux.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,17 +175,6 @@ export async function runLinux(): Promise<void> {
// 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
Expand Down
Loading