Skip to content

Commit

Permalink
cleanup before release (#200)
Browse files Browse the repository at this point in the history
  • Loading branch information
fred-labs committed Oct 2, 2024
1 parent 1b699af commit f93584e
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 20 deletions.
2 changes: 1 addition & 1 deletion libs/scenario_execution_kubernetes/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_execution_kubernetes</name>
<version>1.1.0</version>
<version>1.2.0</version>
<description>Package for scenario execution kubernetes library</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion libs/scenario_execution_kubernetes/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

setup(
name=PACKAGE_NAME,
version='1.1.0',
version='1.2.0',
packages=find_namespace_packages(),
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
17 changes: 1 addition & 16 deletions scenario_execution_ros/launch/scenario_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ def generate_launch_description():
log_model = LaunchConfiguration('log_model')
log_level = LaunchConfiguration('log_level')
scenario_execution = LaunchConfiguration('scenario_execution')
scenario_status = LaunchConfiguration('scenario_status')
output_dir = LaunchConfiguration('output_dir')
scenario_parameter_file = LaunchConfiguration('scenario_parameter_file')

Expand All @@ -44,8 +43,6 @@ def generate_launch_description():
description='log parsed model'),
DeclareLaunchArgument('scenario_execution', default_value='True',
description='Wether to execute scenario execution'),
DeclareLaunchArgument('scenario_status', default_value='False',
description='Wether to execute scenario status'),
DeclareLaunchArgument('log_level', default_value='info',
description='Log level for scenario execution'),
DeclareLaunchArgument('output_dir', description='Output directory', default_value=''),
Expand All @@ -70,21 +67,9 @@ def generate_launch_description():
}],
on_exit=Shutdown()),

Node(
condition=IfCondition(scenario_status),
package='scenario_status',
executable='scenario_status_node',
name='scenario_status_node',
parameters=[{
'scenario_status_topic': '/scenario_status',

}],
output='screen'
),

# Parse log for message on how to execute scenario separately
LogInfo(
condition=UnlessCondition(scenario_execution),
msg=["Skipping: ros2 launch scenario_execution_ros scenario_launch.py scenario:=",
scenario, ' log_model:=', log_model, ' live_tree:=', live_tree, ' debug:=', debug]),
scenario, ' log_model:=', log_model, ' live_tree:=', live_tree, ' debug:=', debug, ' output_dir:=', output_dir, ' scenario_parameter_file:=', scenario_parameter_file]),
])
1 change: 0 additions & 1 deletion scenario_execution_ros/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<exec_depend>visualization_msgs</exec_depend>
<exec_depend>xacro</exec_depend>
<exec_depend>rcl_interfaces</exec_depend>
<exec_depend>scenario_status</exec_depend>
<exec_depend>python3-transforms3d</exec_depend>

<test_depend>ament_copyright</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion scenario_execution_rviz/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>scenario_execution_rviz</name>
<version>0.0.1</version>
<version>1.2.0</version>
<description>The scenario_execution_rviz package</description>
<author email="[email protected]">Intel Labs</author>
<maintainer email="[email protected]">Intel Labs</maintainer>
Expand Down

0 comments on commit f93584e

Please sign in to comment.