Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 24, 2025

Part of #1399.
According to the documentation of rcl_node_get_logger_name the value of the string may change, so I think it's best to fetch the most recent string when getting the logger_name property.


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

… and client (#1471)

Signed-off-by: Nadav Elkabets <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit 4859c8a)

# Conflicts:
#	rclpy/rclpy/client.py
#	rclpy/rclpy/impl/_rclpy_pybind11.pyi
#	rclpy/rclpy/publisher.py
#	rclpy/rclpy/service.py
#	rclpy/rclpy/subscription.py
#	rclpy/src/rclpy/client.cpp
#	rclpy/src/rclpy/client.hpp
#	rclpy/src/rclpy/service.cpp
#	rclpy/test/test_client.py
#	rclpy/test/test_service.py
@mergify mergify bot added the conflicts label Jun 24, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 24, 2025

Cherry-pick of 4859c8a has failed:

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

You are currently cherry-picking commit 4859c8a.
  (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:   rclpy/src/rclpy/service.hpp
	modified:   rclpy/test/test_publisher.py
	modified:   rclpy/test/test_subscription.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   rclpy/rclpy/client.py
	deleted by us:   rclpy/rclpy/impl/_rclpy_pybind11.pyi
	both modified:   rclpy/rclpy/publisher.py
	both modified:   rclpy/rclpy/service.py
	both modified:   rclpy/rclpy/subscription.py
	both modified:   rclpy/src/rclpy/client.cpp
	both modified:   rclpy/src/rclpy/client.hpp
	both modified:   rclpy/src/rclpy/service.cpp
	both modified:   rclpy/test/test_client.py
	deleted by us:   rclpy/test/test_service.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

ahcorde added 3 commits June 24, 2025 17:00
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

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

lgtm with green CI.

@ahcorde thanks for fixing up the conflicts.

@fujitatomoya
Copy link
Collaborator

Pulls: #1476
Gist: https://gist.githubusercontent.com/fujitatomoya/836deca012d2713438a0a5ed4b2c97aa/raw/acc176367701462758151648ff4618ab09fe6c62/ros2.repos
BUILD args: --packages-above-and-dependencies rclpy
TEST args: --packages-above rclpy
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/16309

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde
Copy link
Contributor

ahcorde commented Jun 27, 2025

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde ahcorde merged commit 6135c49 into humble Jun 30, 2025
3 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-1471 branch June 30, 2025 11:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants