Resolve various ament_lint linter violations (#360)

We can't add ament_lint linters in ament_cmake in the traditional way
without creating a circular dependency between the repositories. Even
though we can't automatically enforce linting, it's still a good idea to
try to keep conformance where possible.

Signed-off-by: Scott K Logan <[email protected]>

Author: cottsay

ament_cmake_core/ament_cmake_uninstall_target-extras.cmake

@@ -31,11 +31,11 @@ if(AMENT_CMAKE_UNINSTALL_TARGET)
     @ONLY
   )
 
-  if (NOT TARGET uninstall)
+  if(NOT TARGET uninstall)
     add_custom_target(uninstall)
   endif()
 
-  if (NOT TARGET ${PROJECT_NAME}_uninstall)
+  if(NOT TARGET ${PROJECT_NAME}_uninstall)
     # register uninstall target to run generated CMake script
     add_custom_target(${PROJECT_NAME}_uninstall
       COMMAND ${CMAKE_COMMAND} -P "${AMENT_CMAKE_UNINSTALL_TARGET_UNINSTALL_SCRIPT}")

ament_cmake_core/cmake/core/get_executable_path.cmake

@@ -53,7 +53,7 @@ function(get_executable_path var target_or_path)
     # There is a target with this name
     get_target_property(type "${target_or_path}" TYPE)
     get_target_property(imported "${target_or_path}" IMPORTED)
-    if ("${type}" STREQUAL "EXECUTABLE")
+    if("${type}" STREQUAL "EXECUTABLE")
       # The target is an executable, grab its LOCATION property
       if(ARG_BUILD)
         if(imported)

ament_cmake_core/cmake/core/package_xml_2_cmake.py

@@ -19,7 +19,6 @@
 import os
 import sys
 
-from catkin_pkg.package import evaluate_condition
 from catkin_pkg.package import parse_package_string
 
 

ament_cmake_core/cmake/core/python.cmake

@@ -17,6 +17,6 @@
 # Example:
 #   find_package(Python3 3.8 REQUIRED)
 #   find_package(ament_cmake REQUIRED)
-if (NOT TARGET Python3::Interpreter)
+if(NOT TARGET Python3::Interpreter)
   find_package(Python3 REQUIRED COMPONENTS Interpreter)
 endif()

ament_cmake_core/cmake/index/ament_index_register_resource.cmake

@@ -101,7 +101,7 @@ function(ament_index_register_resource resource_type)
     file(GENERATE OUTPUT "${marker_file}" INPUT "${marker_file}.genexp")
   endif()
 
-  if (NOT ARG_SKIP_INSTALL)
+  if(NOT ARG_SKIP_INSTALL)
     install(
       FILES "${marker_file}"
       DESTINATION "${destination}"

ament_cmake_core/cmake/package_templates/templates_2_cmake.py

@@ -105,7 +105,7 @@ def generate_cmake_code():
             lines.append('set(ament_cmake_package_templates_%s %s)' % (k, v))
     # Ensure backslashes are replaced with forward slashes because CMake cannot
     # parse files with backslashes in it.
-    return [l.replace('\\', '/') for l in lines]
+    return [line.replace('\\', '/') for line in lines]
 
 
 if __name__ == '__main__':

ament_cmake_export_dependencies/cmake/ament_cmake_export_dependencies-extras.cmake.in

@@ -56,7 +56,7 @@ if(NOT _exported_dependencies STREQUAL "")
                   list(APPEND _libraries "${_imported_location}")
                 endif()
               endif()
-            endforeach() 
+            endforeach()
           endif()
 
           get_target_property(_link_libraries ${_target} INTERFACE_LINK_LIBRARIES)

ament_cmake_export_libraries/cmake/ament_cmake_export_libraries-extras.cmake.in

@@ -125,7 +125,8 @@ if(NOT _exported_library_names STREQUAL "")
       )
       if(NOT _lib)
         # warn about not existing library and later ignore it
-        message(WARNING "Package '@PROJECT_NAME@' exports library '${_library_name}' with LIBRARY_DIRS '${_library_dirs}' which couldn't be found")
+        message(WARNING
+          "Package '@PROJECT_NAME@' exports library '${_library_name}' with LIBRARY_DIRS '${_library_dirs}' which couldn't be found")
       endif()
     endif()
     if(_lib)

ament_cmake_google_benchmark/cmake/ament_add_google_benchmark_test.cmake

@@ -62,7 +62,8 @@ function(ament_add_google_benchmark_test target)
   endif()
 
   if(AMENT_CMAKE_GOOGLE_BENCHMARK_OVERLAY AND NOT IS_ABSOLUTE ${AMENT_CMAKE_GOOGLE_BENCHMARK_OVERLAY})
-    get_filename_component(AMENT_CMAKE_GOOGLE_BENCHMARK_OVERLAY ${CMAKE_CURRENT_SOURCE_DIR}/${AMENT_CMAKE_GOOGLE_BENCHMARK_OVERLAY} ABSOLUTE)
+    get_filename_component(AMENT_CMAKE_GOOGLE_BENCHMARK_OVERLAY
+      ${CMAKE_CURRENT_SOURCE_DIR}/${AMENT_CMAKE_GOOGLE_BENCHMARK_OVERLAY} ABSOLUTE)
     set(OVERLAY_ARG "--result-file-overlay" "${AMENT_CMAKE_GOOGLE_BENCHMARK_OVERLAY}")
   endif()
 

ament_cmake_libraries/cmake/ament_libraries_pack_build_configuration.cmake

@@ -33,7 +33,9 @@ macro(ament_libraries_pack_build_configuration VAR)
     if("${_lib}" MATCHES "^(debug|optimized|general)$")
       math(EXPR _index "${_index} + 1")
       if(${_index} EQUAL ${_count})
-        message(FATAL_ERROR "ament_libraries_pack_build_configuration() the list of libraries '${_argn}' ends with '${_lib}' which is a build configuration keyword and must be followed by a library")
+        message(FATAL_ERROR
+          "ament_libraries_pack_build_configuration() the list of libraries '${_argn}' ends with '${_lib}' "
+          "which is a build configuration keyword and must be followed by a library")
       endif()
       list(GET _argn ${_index} library)
       list(APPEND ${VAR} "${_lib}${AMENT_BUILD_CONFIGURATION_KEYWORD_SEPARATOR}${library}")

ament_cmake_python/cmake/ament_python_install_package.cmake

@@ -86,7 +86,6 @@ function(_ament_cmake_python_install_package package_name)
   set(build_dir "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_python/${package_name}")
 
   string(CONFIGURE "\
-import os
 from setuptools import find_packages
 from setuptools import setup
 

ament_cmake_test/ament_cmake_test-extras.cmake

@@ -33,7 +33,7 @@ if(BUILD_TESTING)
   site_name(SITE)
   configure_file(
     ${CMAKE_ROOT}/Modules/DartConfiguration.tcl.in
-    ${PROJECT_BINARY_DIR}/CTestConfiguration.ini )
+    ${PROJECT_BINARY_DIR}/CTestConfiguration.ini)
 endif()
 
 find_package(ament_cmake_core QUIET REQUIRED)

ament_cmake_test/ament_cmake_test/__init__.py

@@ -194,7 +194,7 @@ def log(msg, **kwargs):
     encodings = ['utf-8']
     if locale.getpreferredencoding(False) not in encodings:
         encodings.append(locale.getpreferredencoding(False))
-    
+
     start_time = time.monotonic()
 
     try:
@@ -250,12 +250,15 @@ def log(msg, **kwargs):
 
         if content == failure_result_file:
             if args.skip_return_code is not None and args.skip_return_code == rc:
-                log("-- run_test.py: generate result file '%s' with skipped test" % args.result_file)
+                log(
+                    '-- run_test.py: generate result file '
+                    "'%s' with skipped test" % args.result_file)
                 # regenerate result file to indicate that the test was skipped
                 result_file = _generate_result(args.result_file, skip=True, test_time=test_time)
             else:
-                log("-- run_test.py: generate result file '%s' with failed test" % args.result_file,
-                    file=sys.stderr)
+                log(
+                    '-- run_test.py: generate result file '
+                    "'%s' with failed test" % args.result_file, file=sys.stderr)
                 # regenerate result file to include output / exception of the invoked command
                 result_file = _generate_result(
                     args.result_file,
@@ -316,7 +319,8 @@ def log(msg, **kwargs):
     return rc
 
 
-def _generate_result(result_file, *, failure_message=None, skip=False, error_message=None, test_time=0):
+def _generate_result(result_file, *, failure_message=None, skip=False,
+                     error_message=None, test_time=0):
     # the generated result file must be readable
     # by any of the Jenkins test result report publishers
     pkgname = os.path.basename(os.path.dirname(result_file))