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 xacro args loading issue #2684

Merged
merged 6 commits into from
Mar 19, 2024
Merged

Fix xacro args loading issue #2684

merged 6 commits into from
Mar 19, 2024

Conversation

alexnavtt
Copy link
Contributor

In certain cases, the xacro args provided to moveit_setup_assistant were not loaded properly by moveit_configs_builder. This was due to an incorrect indentation in moveit_configs_builder.py which had the xacro args loaded only if self.__urdf_package was None which seemed incorrect to me. Now it depends only on the existence of the urdf config file.

Copy link

codecov bot commented Feb 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 42.38%. Comparing base (d962501) to head (62b7211).
Report is 19 commits behind head on main.

❗ Current head 62b7211 differs from pull request most recent head fb1583e. Consider uploading reports for the commit fb1583e to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2684      +/-   ##
==========================================
- Coverage   50.74%   42.38%   -8.36%     
==========================================
  Files         392      692     +300     
  Lines       32553    56327   +23774     
  Branches        0     7272    +7272     
==========================================
+ Hits        16517    23867    +7350     
- Misses      16036    32296   +16260     
- Partials        0      164     +164     

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

@tylerjw
Copy link
Member

tylerjw commented Feb 14, 2024

Please run pre-commit to format your python code with black.

@alexnavtt
Copy link
Contributor Author

Also, as an aside, xacro arg loading was introduced for Iron, but not for Humble. Is there a reason for that or did it simply fall through the cracks?

@sjahr
Copy link
Contributor

sjahr commented Mar 4, 2024

Also, as an aside, xacro arg loading was introduced for Iron, but not for Humble. Is there a reason for that or did it simply fall through the cracks?

Maybe that was not properly backported or it is a breaking change in which case we did not backport it to humble. Can you link the corresponding PR? Our backporting strategy is document in this blogpost: https://moveit.ros.org/moveit%202/ros/2023/05/31/balancing-stability-and-development.html

@alexnavtt
Copy link
Contributor Author

Yeah of course. Here's the initial PR into main (#2172). Can't find a separate commit for adding to the Iron branch so must have been a rebase.

With that version of the code, my robot always loaded without attachments that used xacro args because I was providing a urdf package so that branch of the code was never taken. Seems to me more like a bugfix than anything since without it the config builder doesn't work properly.

Copy link
Contributor

@sjahr sjahr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for linking the code and the explanation. Do you mind opening a separate PR to add this to the humble branch?

@sjahr sjahr added the backport-iron Mergify label that triggers a PR backport to Iron label Mar 5, 2024
@sjahr sjahr enabled auto-merge (squash) March 5, 2024 09:29
@alexnavtt
Copy link
Contributor Author

Sure thing. I'll wait until this PR is merged then I'll cherry pick the two commits to get it in. However, one of the CI tests seems to be failing and I don't know how to fix that. Any suggestions?

@sjahr
Copy link
Contributor

sjahr commented Mar 7, 2024

Sure thing. I'll wait until this PR is merged then I'll cherry pick the two commits to get it in. However, one of the CI tests seems to be failing and I don't know how to fix that. Any suggestions?

Thanks, this test failure is not caused by these changes but the test is sometimes flacky. I'll merge main into this PR one last time and then we can merge it

@sjahr sjahr disabled auto-merge March 7, 2024 16:06
@sjahr sjahr enabled auto-merge (squash) March 7, 2024 16:06
@alexnavtt
Copy link
Contributor Author

Still have checks failing which I don't believe are on my end

@sjahr sjahr merged commit cdb20ae into moveit:main Mar 19, 2024
7 of 11 checks passed
mergify bot pushed a commit that referenced this pull request Mar 19, 2024
* Fixed xacro args loading issue

* Formatting fixes with pre-commit action

---------

Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
(cherry picked from commit cdb20ae)
sjahr pushed a commit that referenced this pull request Mar 22, 2024
---------
Co-authored-by: Alex Navarro <56406642+alexnavtt@users.noreply.github.com>
sjahr pushed a commit that referenced this pull request Apr 3, 2024
* Parse xacro args from .setup_assistant config in MoveIt Configs Builder (#2172)

Co-authored-by: Jafar <jafar.uruc@gmail.com>
(cherry picked from commit 79a2fa5)

* Fix xacro args loading issue (#2684)

* Fixed xacro args loading issue

* Formatting fixes with pre-commit action

---------
(cherry picked from commit cdb20ae)

---------

Co-authored-by: Anthony Baker <abake48@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-iron Mergify label that triggers a PR backport to Iron
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants