(moveit_py) fix pyi files (backport #2526)

moveit_py/moveit/README.md

@@ -10,7 +10,7 @@ For this project we leverage (stubgen)[https://mypy.readthedocs.io/en/stable/stu
 Python package to autogenerate stub files. To do so we simply build the moveit_py Python library and run the following command from an environment containing the built package:
 
 ```
-stubgen -p moveit_py
+stubgen -p moveit
 ```
 
 This outputs the outgenerated stub files to an `out` directory. These are the stub files we use.

moveit_py/moveit/core/robot_trajectory.pyi

@@ -3,6 +3,8 @@ from typing import Any
 class RobotTrajectory:
     joint_model_group_name: Any
     def __init__(self, *args, **kwargs) -> None: ...
+    def apply_totg_time_parameterization(self, *args, **kwargs) -> Any: ...
+    def apply_ruckig_smoothing(self, *args, **kwargs) -> Any: ...
     def get_robot_trajectory_msg(self, *args, **kwargs) -> Any: ...
     def get_waypoint_durations(self, *args, **kwargs) -> Any: ...
     def set_robot_trajectory_msg(self, *args, **kwargs) -> Any: ...

moveit_py/moveit/planning.pyi

@@ -60,3 +60,26 @@ class PlanningSceneMonitor:
     def wait_for_current_robot_state(self, *args, **kwargs) -> Any: ...
     @property
     def name(self) -> Any: ...
+<<<<<<< HEAD
+=======
+
+class TrajectoryExecutionManager:
+    def __init__(self, *args, **kwargs) -> None: ...
+    def are_controllers_active(self, *args, **kwargs) -> Any: ...
+    def clear(self, *args, **kwargs) -> Any: ...
+    def enable_execution_duration_monitoring(self, *args, **kwargs) -> Any: ...
+    def ensure_active_controller(self, *args, **kwargs) -> Any: ...
+    def ensure_active_controllers(self, *args, **kwargs) -> Any: ...
+    def ensure_active_controllers_for_group(self, *args, **kwargs) -> Any: ...
+    def ensure_active_controllers_for_joints(self, *args, **kwargs) -> Any: ...
+    def is_controller_active(self, *args, **kwargs) -> Any: ...
+    def is_managing_controllers(self, *args, **kwargs) -> Any: ...
+    def process_event(self, *args, **kwargs) -> Any: ...
+    def push(self, *args, **kwargs) -> Any: ...
+    def set_allowed_execution_duration_scaling(self, *args, **kwargs) -> Any: ...
+    def set_allowed_goal_duration_margin(self, *args, **kwargs) -> Any: ...
+    def set_allowed_start_tolerance(self, *args, **kwargs) -> Any: ...
+    def set_execution_velocity_scaling(self, *args, **kwargs) -> Any: ...
+    def set_wait_for_trajectory_completion(self, *args, **kwargs) -> Any: ...
+    def stop_execution(self, *args, **kwargs) -> Any: ...
+>>>>>>> 4b73edb2d ((moveit_py) fix pyi files (#2526))