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

Update deprecated tf2 imports from .h to .hpp (backport #3197) #3199

Merged
merged 2 commits into from
Jan 6, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 6, 2025

Description

Surprise! More deprecations.
ros2/geometry2#720

This was also backported to Jazzy and Humble, so we will do the same here.

NOTE: Because these changes have not yet made it into Humble binaries, I have conditional includes in. But once Humble gets a sync, we can undo a lot of this and just go full .hpp.

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

This is an automatic backport of pull request #3197 done by [Mergify](https://mergify.com).

* Update deprecated tf2 imports from .h to .hpp

* make the imports conditional

* Update all the files

(cherry picked from commit 7390ebc)

# Conflicts:
#	moveit_core/robot_state/test/test_aabb.cpp
#	moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp
#	moveit_planners/chomp/chomp_motion_planner/src/chomp_planner.cpp
#	moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/trajectory_functions.hpp
#	moveit_planners/pilz_industrial_motion_planner/src/trajectory_functions.cpp
#	moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_circ.cpp
#	moveit_ros/robot_interaction/src/interactive_marker_helpers.cpp
#	moveit_ros/robot_interaction/src/robot_interaction.cpp
Copy link
Author

mergify bot commented Jan 6, 2025

Cherry-pick of 7390ebc has failed:

On branch mergify/bp/humble/pr-3197
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 7390ebc98.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   moveit_kinematics/kdl_kinematics_plugin/src/kdl_kinematics_plugin.cpp
	modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_lin.cpp
	modified:   moveit_planners/pilz_industrial_motion_planner/test/test_utils.h
	modified:   moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp
	modified:   moveit_ros/perception/depth_image_octomap_updater/src/depth_image_octomap_updater.cpp
	modified:   moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
	modified:   moveit_ros/planning/planning_scene_monitor/src/planning_scene_monitor.cpp
	modified:   moveit_ros/planning_interface/move_group_interface/src/move_group_interface.cpp
	modified:   moveit_ros/planning_interface/test/move_group_ompl_constraints_test.cpp
	modified:   moveit_ros/robot_interaction/src/interaction_handler.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   moveit_core/robot_state/test/test_aabb.cpp
	deleted by us:   moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp
	both modified:   moveit_planners/chomp/chomp_motion_planner/src/chomp_planner.cpp
	deleted by us:   moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/trajectory_functions.hpp
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_functions.cpp
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_circ.cpp
	both modified:   moveit_ros/robot_interaction/src/interactive_marker_helpers.cpp
	both modified:   moveit_ros/robot_interaction/src/robot_interaction.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jan 6, 2025
@sea-bass sea-bass removed the conflicts label Jan 6, 2025
@codecov-commenter
Copy link

codecov-commenter commented Jan 6, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.38%. Comparing base (a3685b5) to head (30c019c).
Report is 1 commits behind head on humble.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3199      +/-   ##
==========================================
+ Coverage   51.37%   51.38%   +0.01%     
==========================================
  Files         382      382              
  Lines       31890    31890              
==========================================
+ Hits        16381    16383       +2     
+ Misses      15509    15507       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sea-bass sea-bass merged commit 9ba8725 into humble Jan 6, 2025
7 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-3197 branch January 6, 2025 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants