Merge pull request autowarefoundation#489 from tier4/sync-main-for-de…

…velop

sync main for develop

.pre-commit-config.yaml

@@ -27,7 +27,6 @@ repos:
       - id: check-xml
       - id: check-yaml
       - id: detect-private-key
-      - id: double-quote-string-fixer
       - id: end-of-file-fixer
       - id: mixed-line-ending
       - id: trailing-whitespace
@@ -55,4 +54,31 @@ repos:
     hooks:
       - id: shellcheck
 
-exclude: "(.svg)"
+  - repo: https://github.com/pycqa/isort
+    rev: 5.9.3
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/psf/black
+    rev: 21.9b0
+    hooks:
+      - id: black
+        args: ["--line-length=100"]
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          [
+            "flake8-blind-except",
+            "flake8-builtins",
+            "flake8-class-newline",
+            "flake8-comprehensions",
+            "flake8-deprecated",
+            "flake8-docstrings",
+            "flake8-import-order",
+            "flake8-quotes",
+          ]
+
+exclude: ".svg"

autoware_api_launch/launch/include/external_api_adaptor.launch.py

@@ -19,38 +19,38 @@
 
 def _create_api_node(node_name, class_name, **kwargs):
     return ComposableNode(
-        namespace='external',
+        namespace="external",
         name=node_name,
-        package='autoware_iv_external_api_adaptor',
-        plugin='external_api::' + class_name,
+        package="autoware_iv_external_api_adaptor",
+        plugin="external_api::" + class_name,
         **kwargs
     )
 
 
 def generate_launch_description():
     components = [
-        _create_api_node('diagnostics', 'Diagnostics'),
-        _create_api_node('door', 'Door'),
-        _create_api_node('emergency', 'Emergency'),
-        _create_api_node('engage', 'Engage'),
-        _create_api_node('fail_safe_state', 'FailSafeState'),
-        _create_api_node('initial_pose', 'InitialPose'),
-        _create_api_node('map', 'Map'),
-        _create_api_node('operator', 'Operator'),
-        _create_api_node('metadata_packages', 'MetadataPackages'),
-        _create_api_node('route', 'Route'),
-        _create_api_node('service', 'Service'),
-        _create_api_node('start', 'Start'),
-        _create_api_node('vehicle_status', 'VehicleStatus'),
-        _create_api_node('velocity', 'Velocity'),
-        _create_api_node('version', 'Version'),
+        _create_api_node("diagnostics", "Diagnostics"),
+        _create_api_node("door", "Door"),
+        _create_api_node("emergency", "Emergency"),
+        _create_api_node("engage", "Engage"),
+        _create_api_node("fail_safe_state", "FailSafeState"),
+        _create_api_node("initial_pose", "InitialPose"),
+        _create_api_node("map", "Map"),
+        _create_api_node("operator", "Operator"),
+        _create_api_node("metadata_packages", "MetadataPackages"),
+        _create_api_node("route", "Route"),
+        _create_api_node("service", "Service"),
+        _create_api_node("start", "Start"),
+        _create_api_node("vehicle_status", "VehicleStatus"),
+        _create_api_node("velocity", "Velocity"),
+        _create_api_node("version", "Version"),
     ]
     container = ComposableNodeContainer(
-        namespace='external',
-        name='autoware_iv_adaptor',
-        package='rclcpp_components',
-        executable='component_container_mt',
+        namespace="external",
+        name="autoware_iv_adaptor",
+        package="rclcpp_components",
+        executable="component_container_mt",
         composable_node_descriptions=components,
-        output='screen',
+        output="screen",
     )
     return launch.LaunchDescription([container])

autoware_api_launch/launch/include/internal_api_adaptor.launch.py

@@ -20,31 +20,31 @@
 
 def _create_api_node(node_name, class_name, **kwargs):
     return ComposableNode(
-        namespace='internal',
+        namespace="internal",
         name=node_name,
-        package='autoware_iv_internal_api_adaptor',
-        plugin='internal_api::' + class_name,
+        package="autoware_iv_internal_api_adaptor",
+        plugin="internal_api::" + class_name,
         **kwargs
     )
 
 
 def generate_launch_description():
     param_initial_pose = {
-        'init_simulator_pose': LaunchConfiguration('init_simulator_pose'),
-        'init_localization_pose': LaunchConfiguration('init_localization_pose'),
+        "init_simulator_pose": LaunchConfiguration("init_simulator_pose"),
+        "init_localization_pose": LaunchConfiguration("init_localization_pose"),
     }
     components = [
-        _create_api_node('initial_pose', 'InitialPose', parameters=[param_initial_pose]),
-        _create_api_node('operator', 'Operator'),
-        _create_api_node('route', 'Route'),
-        _create_api_node('velocity', 'Velocity'),
+        _create_api_node("initial_pose", "InitialPose", parameters=[param_initial_pose]),
+        _create_api_node("operator", "Operator"),
+        _create_api_node("route", "Route"),
+        _create_api_node("velocity", "Velocity"),
     ]
     container = ComposableNodeContainer(
-        namespace='internal',
-        name='autoware_iv_adaptor',
-        package='rclcpp_components',
-        executable='component_container_mt',
+        namespace="internal",
+        name="autoware_iv_adaptor",
+        package="rclcpp_components",
+        executable="component_container_mt",
         composable_node_descriptions=components,
-        output='screen',
+        output="screen",
     )
     return launch.LaunchDescription([container])

autoware_api_launch/package.xml

@@ -17,7 +17,7 @@
   <exec_depend>topic_tools</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
-  <test_depend>ament_lint_common</test_depend>
+  <test_depend>autoware_lint_common</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

autoware_launch/package.xml

@@ -26,7 +26,7 @@
   <exec_depend>vehicle_launch</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
-  <test_depend>ament_lint_common</test_depend>
+  <test_depend>autoware_lint_common</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

build_depends.repos

@@ -1 +1,5 @@
 repositories:
+  tier4_ament_lint:
+    type: git
+    url: https://github.com/tier4/tier4_ament_lint.git
+    version: main