From c9d17bf40442998ab2191302c4e05bbef559fb84 Mon Sep 17 00:00:00 2001 From: "Marco A. Gutierrez" Date: Thu, 14 Mar 2024 09:21:46 +0800 Subject: [PATCH] Adding break-system-packages pip option for noble in devel_task (#1026) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove pip-installed setuptools. colcon requires setuptools 30.3.0[1] and we had previously needed to install it from pypi to get that version on older Ubuntu distros, but since Ubuntu Focal had python3-setuptools 45.2.0 and Debian Buster has 40.8.0 so we've not needed this for most of the last few years. [1]: https://github.com/colcon/colcon-core/blob/master/setup.cfg#L41 --------- Signed-off-by: Marco A. Gutierrez Co-authored-by: Steven! Ragnarök --- ros_buildfarm/templates/devel/devel_task.Dockerfile.em | 3 --- 1 file changed, 3 deletions(-) diff --git a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em index a546c335d..0bc47c6f9 100644 --- a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em +++ b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em @@ -66,14 +66,11 @@ RUN echo "@today_str" RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y git python3-yaml @[if build_tool == 'colcon']@ -RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y python3-pip -@# colcon-core.package_identification.python needs at least setuptools 30.3.0 @# pytest-rerunfailures enables usage of --retest-until-pass @(TEMPLATE( 'snippet/install_pytest-rerunfailures.Dockerfile.em', os_name=os_name, ))@ -RUN pip3 install -U setuptools==59.6.0 @[end if]@ RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y ccache