From 8d7da1368ee0252cf31534324c1fed9f7a3e6e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Fri, 15 Mar 2024 10:54:18 -0700 Subject: [PATCH] Revert "Adding break-system-packages pip option for noble in devel_task (#1026)" This reverts commit 050666fe16f0fbe61f26da0780e08cd74d0bd087. --- ros_buildfarm/templates/devel/devel_task.Dockerfile.em | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em index b25ca4722..95d1a79b3 100644 --- a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em +++ b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em @@ -63,11 +63,14 @@ 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