From f81e0233c0b25230b8977079b6682d3520d7ffb6 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom Date: Fri, 1 Mar 2024 18:18:08 -0500 Subject: [PATCH] explicit export and py.typed Signed-off-by: Michael Carlstrom --- .../rosidl_generator_py/generate_py_impl.py | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py b/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py index 0cbaaa10..82711cf4 100644 --- a/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py +++ b/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py @@ -130,36 +130,36 @@ def print_warning_if_reserved_keyword(member_name, interface_type, interface_nam sorted((value, key) for (key, value) in module_names.items()): f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem} # noqa: F401\n') + f'{idl_stem} as {idl_stem} # noqa: F401\n') if subfolder == 'srv': f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_Event # noqa: F401\n') + f'{idl_stem}_Event as {idl_stem}_Event # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_Request # noqa: F401\n') + f'{idl_stem}_Request as {idl_stem}_Request # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_Response # noqa: F401\n') + f'{idl_stem}_Response as {idl_stem}_Response # noqa: F401\n') elif subfolder == 'action': f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_GetResult_Event # noqa: F401\n') + f'{idl_stem}_GetResult_Event as {idl_stem}_GetResult_Event # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_GetResult_Request # noqa: F401\n') + f'{idl_stem}_GetResult_Request as {idl_stem}_GetResult_Request # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_GetResult_Response # noqa: F401\n') + f'{idl_stem}_GetResult_Response as {idl_stem}_GetResult_Response # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_SendGoal_Event # noqa: F401\n') + f'{idl_stem}_SendGoal_Event as {idl_stem}_SendGoal_Event # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_SendGoal_Request # noqa: F401\n') + f'{idl_stem}_SendGoal_Request as {idl_stem}_SendGoal_Request # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_SendGoal_Response # noqa: F401\n') + f'{idl_stem}_SendGoal_Response as {idl_stem}_SendGoal_Response # noqa: F401\n') # expand templates per available typesupport implementation template_dir = args['template_dir'] @@ -192,6 +192,11 @@ def print_warning_if_reserved_keyword(member_name, interface_type, interface_nam minimum_timestamp=latest_target_timestamp) generated_files.append(generated_file) + # Generate py.typed to mark the generate files as having type support as according + # to PEP561. + with open(os.path.join(args['output_dir'], "py.typed"), 'w', encoding='utf-8'): + pass + return generated_files