use ament_cmake_mypy instead

Signed-off-by: Michael Carlstrom <[email protected]>
ros2 · Oct 4, 2024 · e0d3f6e · e0d3f6e
1 parent 1a08266
commit e0d3f6e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/rosidl_adapter/CMakeLists.txt b/rosidl_adapter/CMakeLists.txt
@@ -10,6 +10,7 @@ ament_python_install_package(${PROJECT_NAME})
 if(BUILD_TESTING)
   find_package(ament_cmake_pytest REQUIRED)
   find_package(ament_lint_auto REQUIRED)
+  find_package(ament_cmake_mypy REQUIRED)
   ament_lint_auto_find_test_dependencies()
   ament_add_pytest_test(pytest test)
 endif()

diff --git a/rosidl_adapter/package.xml b/rosidl_adapter/package.xml
@@ -26,10 +26,10 @@
   <exec_depend>python3-empy</exec_depend>
   <exec_depend>rosidl_cli</exec_depend>
 
+  <test_depend>ament_cmake_mypy</test_depend>
   <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>ament_lint_auto</test_depend>
-  <test_depend>ament_mypy</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

diff --git a/rosidl_adapter/rosidl_adapter/parser.py b/rosidl_adapter/rosidl_adapter/parser.py
@@ -817,7 +817,7 @@ def validate_field_types(spec: Union[MessageSpecification,
                          known_msg_types: List[BaseType]) -> None:
     if isinstance(spec, MessageSpecification):
         spec_type = 'Message'
-        fields = spec.fields
+        fields: List[Field] = spec.fields
     elif isinstance(spec, ServiceSpecification):
         spec_type = 'Service'
         fields = spec.request.fields + spec.response.fields

diff --git a/rosidl_adapter/test/test_mypy.py b/rosidl_adapter/test/test_mypy.py