From f81e0233c0b25230b8977079b6682d3520d7ffb6 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom Date: Fri, 1 Mar 2024 18:18:08 -0500 Subject: [PATCH 1/3] 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 From 2f993516395ba082c31c94cb9af4e25baae705d4 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom Date: Fri, 1 Mar 2024 18:26:01 -0500 Subject: [PATCH 2/3] Fix line lengths Signed-off-by: Michael Carlstrom --- .../rosidl_generator_py/generate_py_impl.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 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 82711cf4..0445581f 100644 --- a/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py +++ b/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py @@ -144,22 +144,28 @@ def print_warning_if_reserved_keyword(member_name, interface_type, interface_nam elif subfolder == 'action': f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_GetResult_Event as {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 as {idl_stem}_GetResult_Request # noqa: F401\n') + f'{idl_stem}_GetResult_Request as {idl_stem}_GetResult_Request' + 'W # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' - f'{idl_stem}_GetResult_Response as {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 as {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 as {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 as {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'] From 05761d84245ad2aa8b3f1fd574158846239d4001 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom Date: Fri, 1 Mar 2024 18:31:46 -0500 Subject: [PATCH 3/3] Fix hanging indent Signed-off-by: Michael Carlstrom --- .../rosidl_generator_py/generate_py_impl.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 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 0445581f..980917b6 100644 --- a/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py +++ b/rosidl_generator_py/rosidl_generator_py/generate_py_impl.py @@ -145,15 +145,15 @@ def print_warning_if_reserved_keyword(member_name, interface_type, interface_nam f.write( f'from {package_name}.{subfolder}.{module_name} import ' f'{idl_stem}_GetResult_Event as {idl_stem}_GetResult_Event' - ' # noqa: F401\n') + ' # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' f'{idl_stem}_GetResult_Request as {idl_stem}_GetResult_Request' - 'W # noqa: F401\n') + ' # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' f'{idl_stem}_GetResult_Response as {idl_stem}_GetResult_Response' - ' # noqa: F401\n') + ' # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' f'{idl_stem}_SendGoal_Event as {idl_stem}_SendGoal_Event' @@ -161,11 +161,11 @@ def print_warning_if_reserved_keyword(member_name, interface_type, interface_nam f.write( f'from {package_name}.{subfolder}.{module_name} import ' f'{idl_stem}_SendGoal_Request as {idl_stem}_SendGoal_Request' - ' # noqa: F401\n') + ' # noqa: F401\n') f.write( f'from {package_name}.{subfolder}.{module_name} import ' f'{idl_stem}_SendGoal_Response as {idl_stem}_SendGoal_Response' - ' # noqa: F401\n') + ' # noqa: F401\n') # expand templates per available typesupport implementation template_dir = args['template_dir'] @@ -198,9 +198,8 @@ 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'): + # 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