From 412a908c65d3471a24039bbe595f7a21d7b17b0e Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Wed, 31 Jan 2024 15:33:27 +0100 Subject: [PATCH 1/4] applied package.xml template Signed-off-by: Jakub Delicat --- .github/workflows/tests.yaml | 4 ++-- .pre-commit-config.yaml | 5 +++++ rosbot/package.xml | 7 ++++--- rosbot_bringup/config/microros_localhost_only.xml | 2 +- rosbot_bringup/package.xml | 6 ++++-- rosbot_controller/package.xml | 7 ++++--- rosbot_description/package.xml | 9 +++++---- rosbot_gazebo/package.xml | 9 +++++---- rosbot_utils/package.xml | 6 ++++-- 9 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 2790fc9d..e3dfa0bc 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -1,8 +1,8 @@ --- name: Tests on: - workflow_call: - workflow_dispatch: + workflow_call: + workflow_dispatch: jobs: black: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8b997ed4..325294f8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -71,3 +71,8 @@ repos: - id: doc8 args: [--max-line-length=100, --ignore=D001] exclude: ^.*\/CHANGELOG\.rst/.*$ + + - repo: https://github.com/comkieffer/pre-commit-xmllint.git + rev: 1.0.0 + hooks: + - id: xmllint diff --git a/rosbot/package.xml b/rosbot/package.xml index ad282059..f161d7b7 100644 --- a/rosbot/package.xml +++ b/rosbot/package.xml @@ -3,17 +3,18 @@ rosbot 0.13.0 - Meta package that contains all packages of Rosbot 2 2R PRO - Apache License 2.0 - Jakub Delicat Husarion + Apache License 2.0 + https://husarion.com/ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues + Jakub Delicat + ament_cmake rosbot_bringup diff --git a/rosbot_bringup/config/microros_localhost_only.xml b/rosbot_bringup/config/microros_localhost_only.xml index b6969925..a0c49480 100644 --- a/rosbot_bringup/config/microros_localhost_only.xml +++ b/rosbot_bringup/config/microros_localhost_only.xml @@ -2,7 +2,7 @@ - + CustomUdpTransport diff --git a/rosbot_bringup/package.xml b/rosbot_bringup/package.xml index b6a269ba..df57c405 100644 --- a/rosbot_bringup/package.xml +++ b/rosbot_bringup/package.xml @@ -4,15 +4,17 @@ rosbot_bringup 0.13.0 ROSbot 2, 2R, PRO bringup package - Apache License 2.0 - Jakub Delicat Husarion + Apache License 2.0 + https://husarion.com/ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues + Jakub Delicat + launch launch_ros rosbot_controller diff --git a/rosbot_controller/package.xml b/rosbot_controller/package.xml index 9d30ccdb..3df41c0a 100644 --- a/rosbot_controller/package.xml +++ b/rosbot_controller/package.xml @@ -3,17 +3,18 @@ rosbot_controller 0.13.0 - Hardware configuration for ROSbot 2, 2R, PRO - Apache License 2.0 - Jakub Delicat Husarion + Apache License 2.0 + https://husarion.com/ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues + Jakub Delicat + ament_cmake launch diff --git a/rosbot_description/package.xml b/rosbot_description/package.xml index 3e9b0a43..5a182a92 100644 --- a/rosbot_description/package.xml +++ b/rosbot_description/package.xml @@ -3,18 +3,19 @@ rosbot_description 0.13.0 - ROSbot 2, 2R, PRO description package - Apache License 2.0 - Jakub Delicat - Maciej Stepien Husarion + Apache License 2.0 + https://husarion.com/ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues + Jakub Delicat + Maciej Stepien + ament_cmake diff --git a/rosbot_gazebo/package.xml b/rosbot_gazebo/package.xml index 00b3993c..24ab0bca 100644 --- a/rosbot_gazebo/package.xml +++ b/rosbot_gazebo/package.xml @@ -3,18 +3,19 @@ rosbot_gazebo 0.13.0 - Gazebo Ignition simulation for ROSbot 2, 2R, PRO - Apache License 2.0 - Jakub Delicat - Krzysztof Wojciechowski Husarion + Apache License 2.0 + https://husarion.com/ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues + Jakub Delicat + Krzysztof Wojciechowski + rosbot_bringup launch diff --git a/rosbot_utils/package.xml b/rosbot_utils/package.xml index a78e35ea..6f16a0e4 100644 --- a/rosbot_utils/package.xml +++ b/rosbot_utils/package.xml @@ -4,15 +4,17 @@ rosbot_utils 0.13.0 Utilities for ROSbot 2R and 2 PRO - Apache License 2.0 - Dominik Nowak Husarion + Apache License 2.0 + https://husarion.com/ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues + Dominik Nowak + python3-sh python-periphery-pip python3-pyftdi-pip From a7f4c77a9fa4b6d8553897dec4be5e6d8efb885a Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Thu, 1 Feb 2024 13:50:14 +0100 Subject: [PATCH 2/4] chronology Signed-off-by: Jakub Delicat --- rosbot_description/package.xml | 2 +- rosbot_gazebo/package.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rosbot_description/package.xml b/rosbot_description/package.xml index fc0c2dc4..4a5d520f 100644 --- a/rosbot_description/package.xml +++ b/rosbot_description/package.xml @@ -13,8 +13,8 @@ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues - Jakub Delicat Maciej Stepien + Jakub Delicat ament_cmake diff --git a/rosbot_gazebo/package.xml b/rosbot_gazebo/package.xml index 99e4eeda..00fb7363 100644 --- a/rosbot_gazebo/package.xml +++ b/rosbot_gazebo/package.xml @@ -13,9 +13,9 @@ https://github.com/husarion/rosbot_ros https://github.com/husarion/rosbot_ros/issues - Rafal Gorecki - Jakub Delicat Krzysztof Wojciechowski + Jakub Delicat + Rafal Gorecki rosbot_bringup From e5391756310c008c580ec10f43470ba833d2a0b9 Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Thu, 1 Feb 2024 13:51:00 +0100 Subject: [PATCH 3/4] Support Signed-off-by: Jakub Delicat --- rosbot_controller/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosbot_controller/package.xml b/rosbot_controller/package.xml index cf6a4546..65080aea 100644 --- a/rosbot_controller/package.xml +++ b/rosbot_controller/package.xml @@ -5,7 +5,7 @@ 0.13.1 Hardware configuration for ROSbot 2, 2R, PRO - Husarion + Husarion Apache License 2.0 From d0c7ecdacb5d48efb03a7b1fbcecd70db3bebb68 Mon Sep 17 00:00:00 2001 From: Jakub Delicat Date: Thu, 1 Feb 2024 13:52:00 +0100 Subject: [PATCH 4/4] Removed unnecessary dep Signed-off-by: Jakub Delicat --- rosbot_utils/package.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/rosbot_utils/package.xml b/rosbot_utils/package.xml index 149ace25..fe998750 100644 --- a/rosbot_utils/package.xml +++ b/rosbot_utils/package.xml @@ -17,7 +17,6 @@ Jakub Delicat Rafal Gorecki - python-periphery-pip python3-libgpiod python3-pyftdi-pip python3-requests