Fix import ordering

.github/workflows/ci.yml

@@ -8,15 +8,33 @@ on:
 
 jobs:
   build_and_test:
-    name: humble
+    name: jazzy
     strategy:
       matrix:
         env:
-          - {ROS_DISTRO: humble, ROS_REPO: testing}
-          - {ROS_DISTRO: humble, ROS_REPO: main}
+          - {ROS_DISTRO: jazzy, ROS_REPO: testing}
+          - {ROS_DISTRO: jazzy, ROS_REPO: main}
       fail-fast: false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: 'ros-industrial/industrial_ci@master'
         env: ${{matrix.env}}
+
+  clearpath_simulator_src_ci:
+    name: Jazzy Clearpath Source
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ros-tooling/[email protected]
+        with:
+          required-ros-distributions: jazzy
+      - uses: ros-tooling/[email protected]
+        id: action_ros_ci_step
+        with:
+          target-ros2-distro: jazzy
+          package-name: |
+            clearpath_generator_gz
+            clearpath_gz
+            ckearpath_simulator
+          vcs-repo-file-url: dependencies.repos

clearpath_generator_gz/clearpath_generator_gz/launch/generator.py

@@ -31,17 +31,14 @@
 # Redistribution and use in source and binary forms, with or without
 # modification, is not permitted without the express permission
 # of Clearpath Robotics.
+import os
 
 from clearpath_config.common.types.platform import Platform
-
 from clearpath_generator_common.common import LaunchFile
-from clearpath_generator_common.launch.writer import LaunchWriter
 from clearpath_generator_common.launch.generator import LaunchGenerator
-
+from clearpath_generator_common.launch.writer import LaunchWriter
 from clearpath_generator_gz.launch.sensors import SensorLaunch
 
-import os
-
 
 class GzLaunchGenerator(LaunchGenerator):
     GZ_TO_ROS_TWIST = '@geometry_msgs/msg/Twist[ignition.msgs.Twist'

clearpath_generator_gz/clearpath_generator_gz/param/generator.py

@@ -33,12 +33,12 @@
 # of Clearpath Robotics.
 
 from clearpath_config.common.types.platform import Platform
-from clearpath_config.sensors.types.imu import BaseIMU
 from clearpath_config.sensors.types.gps import Garmin18x
-from clearpath_generator_gz.param.sensors import SensorParam
+from clearpath_config.sensors.types.imu import BaseIMU
 from clearpath_generator_common.param.generator import ParamGenerator
 from clearpath_generator_common.param.manipulators import ManipulatorParam
 from clearpath_generator_common.param.platform import PlatformParam
+from clearpath_generator_gz.param.sensors import SensorParam
 
 PLATFORMS = {
     Platform.A200: {'imu': False, 'gps': False},

clearpath_generator_gz/clearpath_generator_gz/param/sensors.py

@@ -32,15 +32,24 @@
 
 import os
 
-from clearpath_config.sensors.types.cameras import (BaseCamera, FlirBlackfly, IntelRealsense,
-                                                    StereolabsZed)
-from clearpath_config.sensors.types.gps import (BaseGPS, SwiftNavDuro, Garmin18x, NovatelSmart6,
-                                                NovatelSmart7)
-from clearpath_config.sensors.types.imu import BaseIMU, Microstrain, CHRoboticsUM6, RedshiftUM7
+from clearpath_config.common.utils.yaml import write_yaml
+from clearpath_config.sensors.types.cameras import (
+    BaseCamera,
+    FlirBlackfly,
+    IntelRealsense,
+    StereolabsZed,
+)
+from clearpath_config.sensors.types.gps import (
+    BaseGPS,
+    Garmin18x,
+    NovatelSmart6,
+    NovatelSmart7,
+    SwiftNavDuro,
+)
+from clearpath_config.sensors.types.imu import BaseIMU, CHRoboticsUM6, Microstrain, RedshiftUM7
 from clearpath_config.sensors.types.lidars_2d import BaseLidar2D, HokuyoUST, SickLMS1XX
 from clearpath_config.sensors.types.lidars_3d import BaseLidar3D, VelodyneLidar
 from clearpath_config.sensors.types.sensor import BaseSensor
-from clearpath_config.common.utils.yaml import write_yaml
 
 
 class MessageType():

clearpath_gz/launch/robot_spawn.launch.py

@@ -14,15 +14,17 @@
 #
 # @author Roni Kreinin ([email protected])
 
+import os
+
 from clearpath_config.clearpath_config import ClearpathConfig
 
 from launch import LaunchDescription
 from launch.actions import (
     DeclareLaunchArgument,
     GroupAction,
     IncludeLaunchDescription,
+    OpaqueFunction,
     RegisterEventHandler,
-    OpaqueFunction
 )
 from launch.conditions import IfCondition
 from launch.event_handlers import OnProcessExit
@@ -36,8 +38,6 @@
 from launch_ros.actions import Node
 from launch_ros.substitutions import FindPackageShare
 
-import os
-
 
 ARGUMENTS = [
     DeclareLaunchArgument('rviz', default_value='false',