Skip to content

Commit

Permalink
add '--ignore-installed' to other distribution and docs.
Browse files Browse the repository at this point in the history
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
  • Loading branch information
fujitatomoya committed Dec 18, 2024
1 parent e0e7e40 commit 1d87571
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ https://github.com/fujitatomoya/ros2ai/assets/43395114/2af4fd44-2ccf-472c-9153-c
- `rolling` / `jazzy`

```bash
pip install openai ollama validators --break-system-packages
pip install openai ollama validators --break-system-packages --ignore-installed
```

> [!NOTE]
Expand All @@ -60,7 +60,7 @@ https://github.com/fujitatomoya/ros2ai/assets/43395114/2af4fd44-2ccf-472c-9153-c
- `iron` / `humble`

```bash
pip install openai ollama validators
pip install openai ollama validators --ignore-installed
```

### Build
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ RUN apt-get update \

# Adapt pip install option based on distro (technically ubuntu version)
RUN if [ "$ROS_DISTRO" = "humble" ]; then \
pip install openai ollama validators; \
pip install openai ollama validators --ignore-installed; \
elif [ "$ROS_DISTRO" = "iron" ]; then \
pip install openai ollama validators; \
pip install openai ollama validators --ignore-installed; \
else \
pip install openai ollama validators --break-system-packages; \
pip install openai ollama validators --break-system-packages --ignore-installed; \
fi

# Build and source colcon workspace
Expand Down
2 changes: 1 addition & 1 deletion scripts/github_workflows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function install_prerequisites () {
if [ $UBUNTU_VERSION == "24.04" ]; then
pip install openai ollama validators --break-system-packages --ignore-installed
else
pip install openai ollama validators
pip install openai ollama validators --ignore-installed
fi
#apt install -y ros-${ROS_DISTRO}-desktop --no-install-recommends
cd $there
Expand Down

0 comments on commit 1d87571

Please sign in to comment.