Skip to content

Commit

Permalink
Tools: format files with pre-commit for continuous integration
Browse files Browse the repository at this point in the history
  • Loading branch information
pedro-fuoco authored and Ryanf55 committed Jul 20, 2023
1 parent a98faa9 commit 6523ed7
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 45 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ colcon build --cmake-args -DBUILD_TESTING=ON

```bash
source ./install/setup.bash
colcon test --packages-select ardupilot_sitl ardupilot_dds_tests ardupilot_gazebo ardupilot_gz_applications ardupilot_gz_description ardupilot_gz_gazebo ardupilot_gz_bringup
colcon test --packages-select ardupilot_sitl ardupilot_dds_tests ardupilot_gazebo ardupilot_gz_applications ardupilot_gz_description ardupilot_gz_gazebo ardupilot_gz_bringup
colcon test-result --all --verbose
```

Expand Down Expand Up @@ -133,7 +133,7 @@ git clone https://github.com/swri-robotics/gps_umd.git -b ros2-devel
```

When building from source add `COLCON_IGNORE` to `gpsd_client` as
this package is not required and will not build on macOS.
this package is not required and will not build on macOS.

### 2. `sdformat_urdf`

Expand Down Expand Up @@ -177,4 +177,3 @@ export SDF_PATH=$GZ_SIM_RESOURCE_PATH

This is assigned in the `iris.launch.py` file as `SDF_PATH` is not usually set
by the `ament` environment hooks.

3 changes: 1 addition & 2 deletions ardupilot_gz_application/.flake8
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# Match black line length (default 88).
max-line-length = 88
# Match black configuration where there are conflicts.
extend-ignore =
extend-ignore =
# Q000: Double quotes found but single quotes preferred
Q000,
# W503: Line break before binary operator
W503

4 changes: 0 additions & 4 deletions ardupilot_gz_application/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@
<description>Application code for `ardupilot_gz`.</description>
<maintainer email="[email protected]">Rhys Mainwaring</maintainer>
<license>GPL-3.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>

3 changes: 1 addition & 2 deletions ardupilot_gz_bringup/.flake8
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# Match black line length (default 88).
max-line-length = 88
# Match black configuration where there are conflicts.
extend-ignore =
extend-ignore =
# Q000: Double quotes found but single quotes preferred
Q000,
# W503: Line break before binary operator
W503

5 changes: 0 additions & 5 deletions ardupilot_gz_bringup/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,15 @@
<description>Launch files for `ardupilot_gz`.</description>
<maintainer email="[email protected]">Rhys Mainwaring</maintainer>
<license>GPL-3.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake_python</buildtool_depend>

<exec_depend>ament_index_python</exec_depend>
<exec_depend>launch</exec_depend>
<exec_depend>launch_ros</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>

3 changes: 1 addition & 2 deletions ardupilot_gz_description/.flake8
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# Match black line length (default 88).
max-line-length = 88
# Match black configuration where there are conflicts.
extend-ignore =
extend-ignore =
# Q000: Double quotes found but single quotes preferred
Q000,
# W503: Line break before binary operator
W503

Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
ament_prepend_unique_value GZ_SIM_RESOURCE_PATH "$AMENT_CURRENT_PREFIX/share/@PROJECT_NAME@/models"

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>Pedro Fuoco</name>
<email>[email protected]</email>
</author>

<maintainer email="[email protected]">Pedro Fuoco</maintainer>

<description>
Expand Down
6 changes: 3 additions & 3 deletions ardupilot_gz_description/models/iris_with_lidar/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
</box>
</geometry>
</collision>

<visual name="visual">
<geometry>
<box>
Expand All @@ -320,7 +320,7 @@
</visual>

<sensor name='gpu_lidar' type='gpu_lidar'>
<ignition_frame_id>iris/base_scan</ignition_frame_id>
<ignition_frame_id>iris/base_scan</ignition_frame_id>
<pose>0 0 0 0 0 0</pose>
<topic>lidar</topic>
<update_rate>10</update_rate>
Expand Down Expand Up @@ -360,7 +360,7 @@
</limit>
<dynamics>
<damping>1</damping>
</dynamics>
</dynamics>
</axis>
</joint>

Expand Down
3 changes: 0 additions & 3 deletions ardupilot_gz_description/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
<description>Model descriptions for `ardupilot_gz`.</description>
<maintainer email="[email protected]">Rhys Mainwaring</maintainer>
<license>GPL-3.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
Expand Down
3 changes: 1 addition & 2 deletions ardupilot_gz_gazebo/.flake8
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# Match black line length (default 88).
max-line-length = 88
# Match black configuration where there are conflicts.
extend-ignore =
extend-ignore =
# Q000: Double quotes found but single quotes preferred
Q000,
# W503: Line break before binary operator
W503

4 changes: 0 additions & 4 deletions ardupilot_gz_gazebo/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
<description>Gazebo specific systems for `ardupilot_gz`.</description>
<maintainer email="[email protected]">Rhys Mainwaring</maintainer>
<license>GPL-3.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<test_depend>ament_lint_auto</test_depend>
<!-- <test_depend>ament_lint_common</test_depend> -->
<!-- <test_depend>ament_cmake_clang_format</test_depend> -->
Expand All @@ -24,9 +22,7 @@
<test_depend>ament_cmake_pycodestyle</test_depend>
<!-- <test_depend>ament_cmake_uncrustify</test_depend> -->
<test_depend>ament_cmake_xmllint</test_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>

26 changes: 13 additions & 13 deletions ardupilot_gz_gazebo/worlds/iris_maze.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</material>
</visual>
</link>

<link name='Wall_1'>
<pose>-10 -10 0 0 0 0</pose>
<collision name='Wall_1_Collision'>
Expand Down Expand Up @@ -137,7 +137,7 @@
</material>
</visual>
</link>

<link name='Wall_3'>
<pose>-10 10 0 0 0 0</pose>
<collision name='Wall_3_Collision'>
Expand All @@ -160,7 +160,7 @@
</material>
</visual>
</link>

<link name='Wall_4'>
<pose>-7 -7 0 0 0 0</pose>
<collision name='Wall_4_Collision'>
Expand All @@ -183,7 +183,7 @@
</material>
</visual>
</link>

<link name='Wall_5'>
<pose degrees="true">-7 -7 0 0 0 90</pose>
<collision name='Wall_5_Collision'>
Expand All @@ -206,7 +206,7 @@
</material>
</visual>
</link>

<link name='Wall_6'>
<pose>-4 -4 0 0 0 0</pose>
<collision name='Wall_6_Collision'>
Expand All @@ -229,7 +229,7 @@
</material>
</visual>
</link>

<link name='Wall_7'>
<pose degrees="true">-4 -4 0 0 0 90</pose>
<collision name='Wall_7_Collision'>
Expand All @@ -252,7 +252,7 @@
</material>
</visual>
</link>

<link name='Wall_8'>
<pose>-1 -1 0 0 0 0</pose>
<collision name='Wall_8_Collision'>
Expand All @@ -275,7 +275,7 @@
</material>
</visual>
</link>

<link name='Wall_9'>
<pose degrees="true">-1 -1 0 0 0 90</pose>
<collision name='Wall_9_Collision'>
Expand All @@ -298,7 +298,7 @@
</material>
</visual>
</link>

<link name='Wall_10'>
<pose degrees="true">-4 7 0 0 0 90</pose>
<collision name='Wall_10_Collision'>
Expand All @@ -321,7 +321,7 @@
</material>
</visual>
</link>

<link name='Wall_11'>
<pose>-1 4 0 0 0 0</pose>
<collision name='Wall_11_Collision'>
Expand All @@ -344,7 +344,7 @@
</material>
</visual>
</link>

<link name='Wall_12'>
<pose>2 7 0 0 0 0</pose>
<collision name='Wall_12_Collision'>
Expand All @@ -367,7 +367,7 @@
</material>
</visual>
</link>

<link name='Wall_13'>
<pose degrees="true">5 2 0 0 0 90</pose>
<collision name='Wall_13_Collision'>
Expand Down Expand Up @@ -431,6 +431,6 @@
<name>iris</name>
<pose degrees="true">0 0 0.194923 0 0 90</pose>
</include>

</world>
</sdf>

0 comments on commit 6523ed7

Please sign in to comment.