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

rename header files so debs are installable #1443

Merged
merged 1 commit into from
Jul 28, 2022

Conversation

mikeferguson
Copy link
Contributor

Description

These files were copied in, now causing installation issues for our Debians: #1442

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

@mikeferguson
Copy link
Contributor Author

mikeferguson commented Jul 21, 2022

So it turns out this is more involved than I thought - the files we copied in are not what eventually got merged - in particular support for "namespace" has been lost - so our options are either:

A) Remove the namespace usage within our codebase
B) Keep the copied files, but rename them so we don't collide with the Debian
C) Get an updated version into ros2_control, get that released, and then release this change

EDIT: option A looks untenable

@mikeferguson mikeferguson changed the title remove joint_limits, now in ros2_control rename header files so debs are installable Jul 28, 2022
@mikeferguson
Copy link
Contributor Author

This now implements option B

@vatanaksoytezer
Copy link
Contributor

@mikeferguson are we planning to eventually switch to option C, or keep it this way?

@mikeferguson
Copy link
Contributor Author

@vatanaksoytezer I think we should eventually do option C (and I'll make sure there is a ticket for it) - but that is going to require at least 2 release cycles and somebody who is actually active on ros2_control (which I'm not). My goal with this PR is simply to get our debs to properly install - we can clean up the tech debt later

@codecov
Copy link

codecov bot commented Jul 28, 2022

Codecov Report

Merging #1443 (38b42aa) into main (3abc428) will increase coverage by 0.02%.
The diff coverage is n/a.

❗ Current head 38b42aa differs from pull request most recent head d12c8b5. Consider uploading reports for the commit d12c8b5 to get more accurate results

@@            Coverage Diff             @@
##             main    #1443      +/-   ##
==========================================
+ Coverage   50.90%   50.91%   +0.02%     
==========================================
  Files         381      381              
  Lines       31784    31784              
==========================================
+ Hits        16175    16179       +4     
+ Misses      15609    15605       -4     
Impacted Files Coverage Δ
...planner/include/joint_limits_copy/joint_limits.hpp 100.00% <ø> (ø)
...nclude/joint_limits_copy/joint_limits_rosparam.hpp 88.47% <ø> (ø)
...industrial_motion_planner/joint_limits_extension.h 100.00% <ø> (ø)
..._motion_planner/joint_limits_interface_extension.h 73.34% <ø> (ø)
...nning_scene_monitor/src/planning_scene_monitor.cpp 45.73% <0.00%> (+0.44%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3abc428...d12c8b5. Read the comment docs.

@vatanaksoytezer vatanaksoytezer merged commit 70d99c3 into moveit:main Jul 28, 2022
@mikeferguson mikeferguson deleted the remove_joint_limits branch July 28, 2022 15:51
@vatanaksoytezer
Copy link
Contributor

I'll try to cut a new release today.

@mikeferguson
Copy link
Contributor Author

Ticketed Option C here: #1451

peterdavidfagan pushed a commit to peterdavidfagan/moveit2 that referenced this pull request Jul 28, 2022
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.

3 participants