From 3154b97213d4fa8fa5ac0a7b3edf06678cdbae9e Mon Sep 17 00:00:00 2001 From: David Conner Date: Tue, 4 Jun 2024 17:55:08 -0400 Subject: [PATCH] Update preparing for Jazzy release --- .github/workflows/flexbe_ci.yml | 6 +++--- README.md | 14 +++++++------- flexbe_input/package.xml | 1 - flexbe_input/setup.py | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/flexbe_ci.yml b/.github/workflows/flexbe_ci.yml index f45708b..197c9e0 100644 --- a/.github/workflows/flexbe_ci.yml +++ b/.github/workflows/flexbe_ci.yml @@ -8,10 +8,10 @@ jobs: test: strategy: matrix: - ros: [iron] # , rolling] + ros: [jazzy] # , rolling] include: - - os: ubuntu-22.04 - ros: iron + - os: ubuntu-24.04 + ros: jazzy python: python3 ci_branch: ros2-devel # - os: ubuntu-24.04 diff --git a/README.md b/README.md index f1abd06..dc34be8 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,6 @@ You may also want to check out the quick start tutorial demonstrations at [FlexB ![FlexBE CI](https://github.com/FlexBE/flexbe_behavior_engine/workflows/FlexBE%20CI/badge.svg?branch=ros2-devel) -Humble ![ROS Build Farm](https://build.ros2.org/job/Hdev__flexbe_behavior_engine__ubuntu_jammy_amd64/badge/icon) - Iron ![ROS Build Farm](https://build.ros2.org/job/Idev__flexbe_behavior_engine__ubuntu_jammy_amd64/badge/icon) Rolling ![ROS Build Farm](https://build.ros2.org/job/Rdev__flexbe_behavior_engine__ubuntu_jammy_amd64/badge/icon) @@ -38,10 +36,10 @@ Furthermore, create your own repository for behavior development (contains examp ros2 run flexbe_widget create_repo [your_project_name] -Finally, this version of the flexbe_behavior_engine requires version 4.0+ of the FlexBE user interface. +This version of the flexbe_behavior_engine requires version 4.0+ of the FlexBE user interface. It is recommended to install the FlexBE user interface by following one of these steps: - * https://github.com/FlexBE/flexbe_app.git - classic FlexBE App + * https://github.com/FlexBE/flexbe_app.git - classic FlexBE App (iron or ros2-devel branches) * https://github.com/FlexBE/flexbe_webui.git - new Python-based webserver version @@ -51,13 +49,15 @@ Use the following launch file for running the onboard engine: ros2 launch flexbe_onboard behavior_onboard.launch.py -Use the following launch file for running the operator control station (requires the FlexBE App): +Use the following launch file for running the operator control station (requires the FlexBE App or WebUI): + + ros2 launch flexbe_webui flexbe_ocs.launch.py - ros2 launch flexbe_app flexbe_ocs.launch.py + > Note: replace `flexbe_webui` with `flexbe_app` to run the "classic" UI (after `ros2 run flexbe_app nwjs_install`). Use the following launch file to run both of the above, e.g., for testing on a single computer: - ros2 launch flexbe_app flexbe_full.launch.py + ros2 launch flexbe_webui flexbe_full.launch.py For running tests use: `colcon test --ctest-args --packages-select ` diff --git a/flexbe_input/package.xml b/flexbe_input/package.xml index fd56c5f..5f26bcf 100644 --- a/flexbe_input/package.xml +++ b/flexbe_input/package.xml @@ -19,7 +19,6 @@ rclpy flexbe_core flexbe_msgs - python3-qtpy ament_copyright ament_flake8 diff --git a/flexbe_input/setup.py b/flexbe_input/setup.py index 976f05c..05de18a 100644 --- a/flexbe_input/setup.py +++ b/flexbe_input/setup.py @@ -14,7 +14,7 @@ # No tests yet ('share/' + PACKAGE_NAME + '/tests', glob('tests/*.test')), ], install_requires=['setuptools', - 'pyside6'], + 'PySide6'], zip_safe=True, maintainer='phil', maintainer_email='philsplus@gmail.com',