Skip to content

Commit 56640df

Browse files
committed
Enable linters explicitly instead of using ament_lint_common
This gives more control over which linters are run. For example, we don't need to depend on Python linters for many packages. This commit also worksaround an upstream issue with CI, where ament_cmake_flake8 is currently failing with a Dashing installation if flake8 is installed from pip. See ament/ament_lint#252 for a fix upstream. Signed-off-by: Jacob Perron <[email protected]>
1 parent 4f842ed commit 56640df

File tree

5 files changed

+24
-5
lines changed

5 files changed

+24
-5
lines changed

ament_cmake_export_jars/package.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
<build_depend>ament_java_resources</build_depend>
1919
<exec_depend>ament_java_resources</exec_depend>
2020

21+
<test_depend>ament_cmake_copyright</test_depend>
22+
<test_depend>ament_cmake_lint_cmake</test_depend>
23+
<test_depend>ament_cmake_xmllint</test_depend>
2124
<test_depend>ament_lint_auto</test_depend>
22-
<test_depend>ament_lint_common</test_depend>
2325

2426
<export>
2527
<build_type>ament_cmake</build_type>

ament_cmake_export_jni_libraries/package.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
<build_depend>ament_java_resources</build_depend>
1919
<exec_depend>ament_java_resources</exec_depend>
2020

21+
<test_depend>ament_cmake_copyright</test_depend>
22+
<test_depend>ament_cmake_lint_cmake</test_depend>
23+
<test_depend>ament_cmake_xmllint</test_depend>
2124
<test_depend>ament_lint_auto</test_depend>
22-
<test_depend>ament_lint_common</test_depend>
2325

2426
<export>
2527
<build_type>ament_cmake</build_type>

rcljava/package.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
<exec_depend>rosidl_generator_c</exec_depend>
3535
<exec_depend>rosidl_parser</exec_depend>
3636

37+
<test_depend>ament_cmake_copyright</test_depend>
38+
<test_depend>ament_cmake_cppcheck</test_depend>
39+
<test_depend>ament_cmake_lint_cmake</test_depend>
40+
<test_depend>ament_cmake_uncrustify</test_depend>
41+
<test_depend>ament_cmake_xmllint</test_depend>
3742
<test_depend>ament_lint_auto</test_depend>
38-
<test_depend>ament_lint_common</test_depend>
3943
<test_depend>builtin_interfaces</test_depend>
4044
<test_depend>rcl_interfaces</test_depend>
4145
<test_depend>rcljava_common</test_depend>

rcljava_common/package.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@
1212
<buildtool_depend>ament_cmake_export_libraries</buildtool_depend>
1313
<buildtool_export_depend>rosidl_cmake</buildtool_export_depend>
1414

15+
<test_depend>ament_cmake_copyright</test_depend>
16+
<test_depend>ament_cmake_cppcheck</test_depend>
17+
<test_depend>ament_cmake_lint_cmake</test_depend>
18+
<test_depend>ament_cmake_uncrustify</test_depend>
19+
<test_depend>ament_cmake_xmllint</test_depend>
1520
<test_depend>ament_lint_auto</test_depend>
16-
<test_depend>ament_lint_common</test_depend>
1721

1822
<export>
1923
<build_type>ament_cmake</build_type>

rosidl_generator_java/package.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,16 @@
2727
<exec_depend>rosidl_generator_c</exec_depend>
2828
<exec_depend>rosidl_parser</exec_depend>
2929

30+
<test_depend>ament_cmake_copyright</test_depend>
31+
<test_depend>ament_cmake_cppcheck</test_depend>
32+
<!-- TODO(jacobperron): Re-enable after https://github.com/ament/ament_lint/pull/252 -->
33+
<!--test_depend>ament_cmake_flake8</test_depend-->
3034
<test_depend>ament_cmake_gtest</test_depend>
35+
<test_depend>ament_cmake_lint_cmake</test_depend>
36+
<test_depend>ament_cmake_pep257</test_depend>
37+
<test_depend>ament_cmake_uncrustify</test_depend>
38+
<test_depend>ament_cmake_xmllint</test_depend>
3139
<test_depend>ament_lint_auto</test_depend>
32-
<test_depend>ament_lint_common</test_depend>
3340

3441
<test_depend>rmw_implementation</test_depend>
3542
<test_depend>rmw_implementation_cmake</test_depend>

0 commit comments

Comments
 (0)