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

[Spawner] Accept parsing multiple --param-file arguments to spawner (backport #1805) #1894

Merged
merged 7 commits into from
Dec 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2024

When we use multiple controlers to activate or deactivate, it is quite cumbersome to accept only one --param-file arg as it is not very scalable. For this reason, now the spawner can accept multiple --param-file args and set the respective param_file to those corresponding controllers.

Along with the above mentioned change, now the controllers can accept multiple param-file args as well, and this is very helpful to be able to override parameters between parameter files as how it is done with the standard ROS 2 nodes


This is an automatic backport of pull request #1805 done by Mergify.

Copy link
Contributor Author

mergify bot commented Nov 28, 2024

Cherry-pick of 73fe227 has failed:

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

You are currently cherry-picking commit 73fe227.
  (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:   controller_manager/controller_manager/__init__.py
	modified:   controller_manager/doc/userdoc.rst
	modified:   hardware_interface/include/hardware_interface/controller_info.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/controller_manager/controller_manager_services.py
	both modified:   controller_manager/controller_manager/launch_utils.py
	both modified:   controller_manager/controller_manager/spawner.py
	both modified:   controller_manager/src/controller_manager.cpp
	both modified:   controller_manager/test/test_spawner_unspawner.cpp
	both modified:   doc/release_notes.rst
	both modified:   ros2controlcli/ros2controlcli/verb/load_controller.py

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 Nov 28, 2024
@christophfroehlich christophfroehlich marked this pull request as draft November 29, 2024 12:14
@christophfroehlich
Copy link
Contributor

will need
#1898
#1899

@saikishor saikishor force-pushed the mergify/bp/humble/pr-1805 branch from f42ef1a to 825ebfa Compare December 3, 2024 19:25
@saikishor saikishor marked this pull request as ready for review December 3, 2024 21:26
Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this!

@christophfroehlich christophfroehlich merged commit 63269d4 into humble Dec 3, 2024
6 of 10 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1805 branch December 3, 2024 22:18
Copy link

codecov bot commented Dec 3, 2024

Codecov Report

Attention: Patch coverage is 52.53456% with 103 lines in your changes missing coverage. Please review.

Project coverage is 63.00%. Comparing base (5a3433c) to head (bbee523).
Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
controller_manager/test/test_spawner_unspawner.cpp 49.20% 2 Missing and 62 partials ⚠️
...troller_manager/controller_manager/launch_utils.py 0.00% 19 Missing ⚠️
.../controller_manager/controller_manager_services.py 79.59% 5 Missing and 5 partials ⚠️
controller_manager/src/controller_manager.cpp 56.25% 4 Missing and 3 partials ⚠️
controller_manager/controller_manager/spawner.py 57.14% 1 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1894      +/-   ##
==========================================
- Coverage   63.18%   63.00%   -0.19%     
==========================================
  Files         109      109              
  Lines       12290    12448     +158     
  Branches     8314     8444     +130     
==========================================
+ Hits         7766     7843      +77     
- Misses        820      841      +21     
- Partials     3704     3764      +60     
Flag Coverage Δ
unittests 63.00% <52.53%> (-0.19%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
controller_manager/controller_manager/__init__.py 100.00% <ø> (ø)
controller_manager/controller_manager/spawner.py 69.40% <57.14%> (+0.46%) ⬆️
controller_manager/src/controller_manager.cpp 67.05% <56.25%> (-0.03%) ⬇️
.../controller_manager/controller_manager_services.py 80.95% <79.59%> (-1.08%) ⬇️
...troller_manager/controller_manager/launch_utils.py 0.00% <0.00%> (ø)
controller_manager/test/test_spawner_unspawner.cpp 53.88% <49.20%> (-1.05%) ⬇️

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