From 3d43e7e255268bb6e1f31463ae12031a9ed97a73 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Thu, 4 Jul 2024 22:02:46 +0200 Subject: [PATCH] update docs and cleanup CI --- .github/workflows/ci-ros2.yml | 11 ++++------- docs2/installation.rst | 6 ++++-- docs2/tutorials.rst | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-ros2.yml b/.github/workflows/ci-ros2.yml index 4d60b4391..713b75dd9 100644 --- a/.github/workflows/ci-ros2.yml +++ b/.github/workflows/ci-ros2.yml @@ -46,20 +46,17 @@ jobs: - name: install dependencies run: | sudo apt update - sudo apt install -y libboost-program-options-dev libusb-1.0-0-dev python3-virtualenv + sudo apt install -y libboost-program-options-dev libusb-1.0-0-dev - name: install pip dependencies # TODO: would be better to follow https://answers.ros.org/question/370666/how-to-declare-an-external-python-dependency-in-ros2/ # but this requires some upstream changes + + # colcon still does not seem to properly support venv, so we use a workaround to install + # a python package globally by disabling the externally managed flag that is default on Ubuntu 24.04 run: | sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED pip install rowan - # run: | - # virtualenv -p python3 ./venv - # source ./venv/bin/activate - # touch ./venv/COLCON_IGNORE - # python3 -m pip install rowan - # echo PATH=$PATH >> $GITHUB_ENV - uses: actions/checkout@v2 - name: build and test ROS 2 diff --git a/docs2/installation.rst b/docs2/installation.rst index 8071fb117..aa18e7020 100644 --- a/docs2/installation.rst +++ b/docs2/installation.rst @@ -9,6 +9,8 @@ Crazyswarm2 runs on **Ubuntu Linux** in one of the following configurations: Ubuntu Python ROS 2 ------ -------- ------------ 22.04 3.10 Humble, Iron +------ -------- ------------ +24.04 3.12 Jazzy ====== ======== ============ .. warning:: @@ -21,7 +23,7 @@ Ubuntu Python ROS 2 First Installation ------------------ -1. If needed, install ROS 2 using the instructions at https://docs.ros.org/en/galactic/Installation.html or https://docs.ros.org/en/humble/Installation.html. +1. If needed, install ROS 2 using the instructions at https://docs.ros.org/en/jazzy/Installation.html. 2. Install dependencies @@ -30,7 +32,7 @@ First Installation sudo apt install libboost-program-options-dev libusb-1.0-0-dev pip3 install rowan nicegui - Then install the motion capture ROS 2 package (replace DISTRO with your version of ROS, namely humble or iron): + Then install the motion capture ROS 2 package (replace DISTRO with your version of ROS, namely humble, iron, or jazzy): .. code-block:: bash diff --git a/docs2/tutorials.rst b/docs2/tutorials.rst index 48abc34ec..b09cf7586 100644 --- a/docs2/tutorials.rst +++ b/docs2/tutorials.rst @@ -19,7 +19,7 @@ We have an example of the telop_twist_keyboard package working together with the First, make sure that the crazyflies.yaml has the right URI and if you are using the `Flow deck `_ or `any other position system available `_ to the crazyflie. set the controller to 1 (PID). -And if you have not already, install the teleop package for the keyboard. (replace DISTRO with humble or iron): +And if you have not already, install the teleop package for the keyboard. (replace DISTRO with humble, iron, or jazzy): .. code-block:: bash