Skip to content

Commit

Permalink
Adding break-system-packages pip option for noble in devel_task (#1026)
Browse files Browse the repository at this point in the history
* 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 <marcogg@marcogg.com>
Co-authored-by: Steven! Ragnarök <steven@nuclearsandwich.com>
  • Loading branch information
marcoag authored and nuclearsandwich committed Mar 16, 2024
1 parent a199835 commit c9d17bf
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions ros_buildfarm/templates/devel/devel_task.Dockerfile.em
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit c9d17bf

Please sign in to comment.