Feature/cleanup 2d places (#55)

* fix field usage in 2d place attributes

* fix package files and use pr branches for ci

* fix package name

* update and run pre-commit

* add required ros deps to ci branches

* ignore docker files

Author: nathanhhughes

.cmake-format.yaml

@@ -1,3 +1,4 @@
+---
 parse:
   additional_commands:
     catkin_package:

.github/workflows/ci.yaml

@@ -1,7 +1,6 @@
 ---
-# based on https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
 name: Hydra-ROS Build and Test
-on: {push: {branches: [main]}, pull_request: {branches: [main]}}
+on: {push: {branches: [main, develop]}, pull_request: {branches: [main, develop]}}
 jobs:
   ros2:
     runs-on: ubuntu-latest
@@ -19,7 +18,7 @@ jobs:
       - name: Dependencies
         run: |
           apt update && apt install -y python3-vcstool git ccache
-          vcs import src < src/hydra_ros/install/packages.yaml
+          vcs import src < src/hydra_ros/install/ci/${{ github.base_ref || github.ref_name }}.yaml
           rosdep update --rosdistro jazzy && rosdep install --rosdistro jazzy --from-paths src --ignore-src -r -y
       - name: Build
         shell: bash

.github/workflows/linting.yaml

@@ -1,6 +1,6 @@
 ---
 # based on https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
-name: Hydra-ROS Linting
+name: Linting
 on: {push: {branches: [main, develop]}, pull_request: {}}
 jobs:
   lint:

.pre-commit-config.yaml

@@ -1,16 +1,26 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-exclude: .*\.tsv|\.clang-format
+exclude: .*\.tsv|\.clang-format|.*docker-compose.yml
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v14.0.6
+    rev: v21.1.8
     hooks:
       - id: clang-format
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.14
+    hooks:
+      - {id: ruff, args: [--select, I, --fix]}
+      - id: ruff
+      - id: ruff-format
+  - repo: https://github.com/lyz-code/yamlfix
+    rev: 1.19.1
+    hooks:
+      - id: yamlfix
+        entry: env YAMLFIX_LINE_LENGTH=200 yamlfix

README.md

@@ -74,7 +74,7 @@ echo "build: {cmake-args: [-DCMAKE_BUILD_TYPE=Release]}" > colcon_defaults.yaml
 
 cd src
 git clone git@github.com:MIT-SPARK/Hydra-ROS.git hydra_ros
-vcs import . < hydra_ros/install/ros2.yaml
+vcs import . < hydra_ros/install/packages.yaml
 rosdep install --from-paths . --ignore-src -r -y
 
 cd ..