Skip to content

Commit 44b4253

Browse files
committed
Merge branch 'humble-devel' into fix-real-robots
2 parents 09d2dda + 50ccd81 commit 44b4253

80 files changed

Lines changed: 397 additions & 1509 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# This workflow will upload a Python Package to PyPI when a release is created
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
3+
4+
# This workflow uses actions that are not certified by GitHub.
5+
# They are provided by a third-party and are governed by
6+
# separate terms of service, privacy policy, and support
7+
# documentation.
8+
9+
name: Upload Python Package
10+
11+
# on:
12+
# release:
13+
# types: [published]
14+
15+
on:
16+
workflow_dispatch:
17+
18+
permissions:
19+
contents: read
20+
21+
jobs:
22+
release-build:
23+
runs-on: ubuntu-latest
24+
25+
steps:
26+
- uses: actions/checkout@v4
27+
28+
- uses: actions/setup-python@v5
29+
with:
30+
python-version: "3.10"
31+
32+
- name: Build release distributions
33+
run: |
34+
# NOTE: put your own distribution build steps here.
35+
python -m pip install build
36+
python -m build
37+
38+
- name: Upload distributions
39+
uses: actions/upload-artifact@v4
40+
with:
41+
name: release-dists
42+
path: dist/
43+
44+
pypi-publish:
45+
runs-on: ubuntu-latest
46+
needs:
47+
- release-build
48+
permissions:
49+
# IMPORTANT: this permission is mandatory for trusted publishing
50+
id-token: write
51+
52+
# Dedicated environments with protections for publishing are strongly recommended.
53+
# For more information, see: https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#deployment-protection-rules
54+
environment:
55+
name: pypi
56+
# OPTIONAL: uncomment and update to include your PyPI project URL in the deployment status:
57+
url: https://pypi.org/p/robotics_application_manager
58+
#
59+
# ALTERNATIVE: if your GitHub Release name is the PyPI project version string
60+
# ALTERNATIVE: exactly, uncomment the following line instead:
61+
# url: https://pypi.org/project/YOURPROJECT/${{ github.event.release.name }}
62+
63+
steps:
64+
- name: Retrieve release distributions
65+
uses: actions/download-artifact@v4
66+
with:
67+
name: release-dists
68+
path: dist/
69+
70+
- name: Publish release distributions to PyPI
71+
uses: pypa/gh-action-pypi-publish@release/v1
72+
with:
73+
packages-dir: dist/

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Byte-compiled file
22
__pycache__/
3-
/.idea
3+
.idea/
44

55
# IDEs
66
.vscode

.idea/.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

client_libraries/comms_manager.js

Lines changed: 0 additions & 170 deletions
This file was deleted.

docs/creating_new_RAM_launcher.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
This guide outlines the steps involved in creating a new RAM launcher.
44

5-
For the `launch_world` transition, which transitions the application from the connected state to the world_ready state, the file executed is `launcher_world.py`, and for the `prepare_visualization` transition, the file executed is `launcher_visualization.py`.
5+
For the `launch_world` transition, which transitions the application from the connected state to the world_ready state, the file executed is `launcher_world.py`, and for the `prepare_tools` transition, the file executed is `launcher_tools.py`.
66

7-
To create a new RAM launcher for the `prepare_visualization` transition, follow these steps:
7+
To create a new RAM launcher for the `prepare_tools` transition, follow these steps:
88

99
1. Define the New Visualization Configuration
1010

11-
First, add a new entry to the `visualization` dictionary in `launcher_visualization.py`. Let's call this new entry `custom_visualization` and assume it uses two modules: `abc_module` and `xyz_module`.
11+
First, add a new entry to the `visualization` dictionary in `launcher_tools.py`. Let's call this new entry `custom_visualization` and assume it uses two modules: `abc_module` and `xyz_module`.
1212

1313
```python
1414
visualization = {

docs/dummy_RAM_client_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Dummy RAM Client Guide
22

3-
The dummy client can be used for developing and debugging new RAM launchers. It executes the transitions `connect`, `launch_world`, and `prepare_visualization`.
3+
The dummy client can be used for developing and debugging new RAM launchers. It executes the transitions `connect`, `launch_world`, and `prepare_tools`.
44

55
Contributors can test their new launchers by replacing the code in the files executed during these transitions with their own code. This allows for testing to ensure everything functions correctly before creating new launchers.
66

7-
During the `launch_world` step of the dummy client, the file executed is `simple_circuit_followingcam.launch.py`, and during the `prepare_visualization` transition, it is `launcher_gazebo_view.py`. The exercise simulation can be viewed via a VNC display at [http://127.0.0.1:6080/vnc.html](http://127.0.0.1:6080/vnc.html).
7+
During the `launch_world` step of the dummy client, the file executed is `simple_circuit_followingcam.launch.py`, and during the `prepare_tools` transition, it is `launcher_gazebo_view.py`. The exercise simulation can be viewed via a VNC display at [http://127.0.0.1:6080/vnc.html](http://127.0.0.1:6080/vnc.html).
88

99
## Using the Dummy Client
1010

manager/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)