Skip to content

Commit ecb3a9a

Browse files
authored
Update reusable workspace and documentation to use 'uv' for building and add 'empy' dependency (#196)
Signed-off-by: Max Waterhout <[email protected]>
1 parent 6ccc165 commit ecb3a9a

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

.github/workflows/reusable-workspace.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
steps:
2121
- name: checkout
2222
uses: actions/checkout@v4
23+
- name: uv sync
24+
shell: bash -ieo pipefail {0}
25+
run: |
26+
uv sync
2327
- name: build workspace
2428
shell: bash -ieo pipefail {0}
2529
run: |
2630
source /home/rcdt/.bashrc
2731
cd ros2_ws
28-
colcon build --symlink-install
29-
- name: uv sync
30-
shell: bash -ieo pipefail {0}
31-
run: |
32-
uv sync
32+
uv run colcon build --symlink-install
3333
- name: run ty
3434
shell: bash -ieo pipefail {0}
3535
run: |

docs/content/getting_started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cd ros2_ws
6969
To build the ROS packages, we use colcon. We recommend to build with the `--symlink-install` flag. This will make symlinks between the build files and source files. Changes to Python, YAML or Launch files are now automatically applied without the need of rebuilding. Run the command to build the ROS packages:
7070

7171
```bash
72-
colcon build --symlink-install
72+
uv run colcon build --symlink-install
7373
```
7474

7575
After building, you need to source the files you build:
@@ -86,7 +86,7 @@ With the `--symlink-install` flag, only changes to files that did exist while bu
8686
To simplify the process of building, you can add an alias to your personal bashrc file in the root of the repository (`.personal.bashrc`). You could for example add:
8787

8888
```bash
89-
alias cb="cd /home/rcdt/rcdt_robotics/ros2_ws; colcon build --symlink-install; source install/setup.bash"
89+
alias cb="cd /home/rcdt/rcdt_robotics/ros2_ws; uv run colcon build --symlink-install; source install/setup.bash"
9090
```
9191

9292
From now on, when you open a new terminal, this alias is available and you can simply build and source using the `cb` command.

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies = [
1212
"catkin-pkg>=1.0.0",
1313
"click>=8.2.1",
1414
"distinctipy>=1.3.4",
15+
"empy==3.3.4",
1516
"inflection>=0.5.1",
1617
"lark>=1.2.2",
1718
"mashumaro>=3.16",
@@ -63,7 +64,7 @@ extra-paths = [
6364
"/usr/lib/python3/dist-packages/",
6465
"/home/rcdt/moveit_ws/install/moveit_configs_utils/lib/python3.10/site-packages/",
6566
"/home/rcdt/franka_ws/install/franka_msgs/local/lib/python3.10/dist-packages/",
66-
"ros2_ws/install/rcdt_messages/local/lib/python3.10/dist-packages/",
67+
"ros2_ws/install/rcdt_messages/lib/python3.10/site-packages/",
6768
"ros2_ws/src/rcdt_franka/",
6869
"ros2_ws/src/rcdt_panther/",
6970
"ros2_ws/src/rcdt_utilities/",
@@ -82,4 +83,4 @@ select = "DOC"
8283
style = "google"
8384
skip-checking-short-docstrings = false
8485
allow-init-docstring = true
85-
check-style-mismatch = true
86+
check-style-mismatch = true

uv.lock

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)