From d1b7eae189e513b6120afb4631bb43bd636fe594 Mon Sep 17 00:00:00 2001 From: "Marco A. Gutierrez" Date: Wed, 13 Mar 2024 04:23:22 +0000 Subject: [PATCH 1/2] Adding break-system-packages pip option for noble. Signed-off-by: Marco A. Gutierrez --- ros_buildfarm/templates/devel/devel_task.Dockerfile.em | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em index 95d1a79b3..cef4a34f1 100644 --- a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em +++ b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em @@ -70,7 +70,11 @@ RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y python3-pi 'snippet/install_pytest-rerunfailures.Dockerfile.em', os_name=os_name, ))@ +@[ if os_code_name == 'noble']@ +RUN pip3 install -U setuptools==59.6.0 --break-system-packages +@[ else]@ RUN pip3 install -U setuptools==59.6.0 +@[ end if]@ @[end if]@ RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y ccache From 7af52ad3e003e4044a7183dff358b5daf162cef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnaro=CC=88k?= Date: Wed, 13 Mar 2024 07:38:41 -0700 Subject: [PATCH 2/2] 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 --- ros_buildfarm/templates/devel/devel_task.Dockerfile.em | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em index cef4a34f1..b25ca4722 100644 --- a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em +++ b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em @@ -63,18 +63,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, ))@ -@[ if os_code_name == 'noble']@ -RUN pip3 install -U setuptools==59.6.0 --break-system-packages -@[ else]@ -RUN pip3 install -U setuptools==59.6.0 -@[ end if]@ @[end if]@ RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y ccache