Skip to content

Commit

Permalink
fix issue with setuptools
Browse files Browse the repository at this point in the history
  • Loading branch information
PonomarevDA committed Jul 30, 2024
1 parent 38c8fef commit 25c13ef
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/catkin_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
# 1. Install basic requirements
- run: apt-get update && apt-get install -y git
- run: if [[ "$ROS_DISTRO" = "noetic" ]] ; then apt-get install -y python3-pip ros-noetic-catkin python3-catkin-tools ; fi
- run: pip install setuptools==68.0.0 importlib-metadata==8.2.0 # hack because there is an issue on >=71.0.0 https://github.com/pypa/setuptools/issues/4478

# 2. Checkout repo with submodules
- uses: actions/checkout@v2
Expand Down
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ WORKDIR /catkin_ws/src/uav_hitl_simulator
# 1. Install basic requirements
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y git ros-$ROS_DISTRO-catkin python3-pip python3-catkin-tools
apt-get install -y git ros-$ROS_DISTRO-catkin python3-pip

# hack because there is an issue on >=71.0.0 https://github.com/pypa/setuptools/issues/4478
RUN pip install setuptools==68.0.0 importlib-metadata==8.2.0
RUN apt-get install -y python3-catkin-tools

RUN if [[ "$ROS_DISTRO" = "melodic" ]] ; then apt-get install -y python-pip python-catkin-tools ; fi

# 2. Install requirements
Expand Down

0 comments on commit 25c13ef

Please sign in to comment.