Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: humble beta/v0.5.4 #317

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-json
- id: check-merge-conflict
Expand All @@ -19,23 +19,23 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.31.1
rev: v0.33.0
hooks:
- id: markdownlint
args: [-c, .markdownlint.yaml, --fix]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
rev: v3.0.0-alpha.4
hooks:
- id: prettier

- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.29.0
hooks:
- id: yamllint

- repo: https://github.com/tier4/pre-commit-hooks-ros
rev: v0.7.1
rev: v0.8.0
hooks:
- id: flake8-ros
- id: prettier-xacro
Expand All @@ -45,35 +45,35 @@ repos:
- id: sort-package-xml

- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.8.0.4
rev: v0.9.0.2
hooks:
- id: shellcheck

- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.5.1-1
rev: v3.6.0-1
hooks:
- id: shfmt
args: [-w, -s, -i=4]

- repo: https://github.com/pycqa/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort

- repo: https://github.com/psf/black
rev: 22.6.0
rev: 23.1.0
hooks:
- id: black
args: [--line-length=100]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v14.0.6
rev: v15.0.7
hooks:
- id: clang-format
types_or: [c++, c, cuda]

- repo: https://github.com/cpplint/cpplint
rev: 1.6.0
rev: 1.6.1
hooks:
- id: cpplint
args: [--quiet]
Expand Down
1 change: 0 additions & 1 deletion common/autoware_testing/autoware_testing/smoke_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def resolve_node(context, *args, **kwargs):

@pytest.mark.launch_test
def generate_test_description():

arg_package = DeclareLaunchArgument(
"arg_package", default_value=["default"], description="Package containing tested executable"
)
Expand Down
2 changes: 1 addition & 1 deletion common/tier4_debug_tools/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<depend>tier4_debug_msgs</depend>

<exec_depend>launch_ros</exec_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rtree</exec_depend>
<exec_depend>rclpy</exec_depend>
<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>

Expand Down
4 changes: 2 additions & 2 deletions common/web_controller/www/web_controller/js/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $(function () {
direction: "horizontal",
},
1000,
callback(tabName)
callback(tabName),
);
lastTabName = tabName;
}
Expand All @@ -31,7 +31,7 @@ $(function () {
{
direction: "horizontal",
},
1000
1000,
);
}, 1100);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def _create_mapping_tuple(name):


def generate_launch_description():

arguments = [
# component
DeclareLaunchArgument("use_intra_process"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ def create_common_pipeline(self, input_topic, output_topic):
return components

def create_single_frame_obstacle_segmentation_components(self, input_topic, output_topic):

additional_lidars = self.ground_segmentation_param["additional_lidars"]
use_ransac = bool(self.ground_segmentation_param["ransac_input_topics"])
use_additional = bool(additional_lidars)
Expand Down Expand Up @@ -425,7 +424,6 @@ def create_single_frame_outlier_filter_components(input_topic, output_topic):

@staticmethod
def get_additional_lidars_concatenated_component(input_topics, output_topic):

return ComposableNode(
package="pointcloud_preprocessor",
plugin="pointcloud_preprocessor::PointCloudConcatenateDataSynchronizerComponent",
Expand Down Expand Up @@ -505,7 +503,6 @@ def launch_setup(context, *args, **kwargs):


def generate_launch_description():

launch_arguments = []

def add_launch_arg(name: str, default_value=None):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@


def launch_setup(context, *args, **kwargs):

# vehicle information parameter
vehicle_info_param_path = LaunchConfiguration("vehicle_info_param_file").perform(context)
with open(vehicle_info_param_path, "r") as f:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@


def launch_setup(context, *args, **kwargs):

vehicle_info_param_path = LaunchConfiguration("vehicle_info_param_file").perform(context)
with open(vehicle_info_param_path, "r") as f:
vehicle_info_param = yaml.safe_load(f)["/**"]["ros__parameters"]
Expand Down
1 change: 0 additions & 1 deletion map/map_loader/test/lanelet2_map_loader_launch.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

@pytest.mark.launch_test
def generate_test_description():

lanelet2_map_path = os.path.join(
get_package_share_directory("map_loader"), "test/data/test_map.osm"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

class TrajectoryVisualizer(Node):
def __init__(self):

super().__init__("trajectory_visualizer")

self.fig = plt.figure()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@

class TrajectoryVisualizer(Node):
def __init__(self):

super().__init__("trajectory_visualizer")

self.fig = plt.figure()
Expand Down
2 changes: 2 additions & 0 deletions simulator/fault_injection/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ project(fault_injection)
find_package(autoware_cmake REQUIRED)
autoware_package()

find_package(pluginlib REQUIRED)

ament_auto_add_library(fault_injection_node_component SHARED
src/fault_injection_node/fault_injection_node.cpp
)
Expand Down
1 change: 1 addition & 0 deletions simulator/fault_injection/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<depend>diagnostic_aggregator</depend>
<depend>diagnostic_msgs</depend>
<depend>diagnostic_updater</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>rclcpp_components</depend>
<depend>tier4_autoware_utils</depend>
Expand Down
1 change: 0 additions & 1 deletion system/system_monitor/launch/system_monitor.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@


def launch_setup(context, *args, **kwargs):

with open(LaunchConfiguration("cpu_monitor_config_file").perform(context), "r") as f:
cpu_monitor_config = yaml.safe_load(f)["/**"]["ros__parameters"]
cpu_monitor = ComposableNode(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def lowpass_filter_scipy(x, sample_rate, fp, fs, g_pass, g_stop):

@staticmethod
def create_2d_map(x, y, data, color_factor, x_index_list, x_thresh, y_index_list, y_thresh):

if x.shape != y.shape or y.shape != data.shape:
print("Error: the shape of x, y, data must be same")
sys.exit()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ def view_pedal_accel_graph(
calibrated_pedal_list,
calibrated_acc_list,
):

fig = plotter.subplot_more(subplot_num)

# calibrated map
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def imshow(self, data, left, right, ws, bottom, top, hs, num_data_type="float"):
origin="lower",
)
ys, xs = np.meshgrid(width_range, height_range, indexing="ij")
for (x, y, val) in zip(xs.flatten(), ys.flatten(), data.flatten()):
for x, y, val in zip(xs.flatten(), ys.flatten(), data.flatten()):
self.plot_text(x, y, val, num_data_type)
plt.colorbar()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ def view_pedal_accel_graph(
calibrated_acc_list,
scatter_only,
):

fig = plotter.subplot_more(subplot_num)

if not scatter_only:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def _create_mapping_tuple(name):


def generate_launch_description():

arguments = [
# component
DeclareLaunchArgument("use_intra_process"),
Expand Down