Skip to content

Add content-filtered-topic interfaces (backport #1506)#1520

Merged
fujitatomoya merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-1506
Oct 12, 2025
Merged

Add content-filtered-topic interfaces (backport #1506)#1520
fujitatomoya merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-1506

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 10, 2025

Description

Add ContentFilteredTopic interface

Fixes #1504

Is this user-facing behavior change?

No

Did you use Generative AI?

No

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

@Barry-Xu-2018 @mergify
Add content-filtered-topic interfaces (#1506)
ec5a516 
Signed-off-by: Barry Xu <Barry.Xu@sony.com>
(cherry picked from commit 8d42eaa)

# Conflicts:
#	rclpy/rclpy/impl/_rclpy_pybind11.pyi
#	rclpy/rclpy/node.py
#	rclpy/src/rclpy/subscription.cpp
#	rclpy/src/rclpy/subscription.hpp
#	rclpy/test/test_subscription.py
@mergify mergify bot added the conflicts label Oct 10, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Oct 10, 2025

Cherry-pick of 8d42eaa has failed:

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

You are currently cherry-picking commit 8d42eaa.
  (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/rclpy/subscription.py
	new file:   rclpy/rclpy/subscription_content_filter_options.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclpy/rclpy/impl/_rclpy_pybind11.pyi
	both modified:   rclpy/rclpy/node.py
	both modified:   rclpy/src/rclpy/subscription.cpp
	both modified:   rclpy/src/rclpy/subscription.hpp
	both modified:   rclpy/test/test_subscription.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 mentioned this pull request Oct 10, 2025
Merged
@Barry-Xu-2018
Copy link
Copy Markdown
Contributor

Barry-Xu-2018 commented Oct 10, 2025

I will handle build issue.

@Barry-Xu-2018 Barry-Xu-2018 mentioned this pull request Oct 11, 2025
Merged
@Barry-Xu-2018
Resolve merge conflicts (#1522)
e85fcfd 
Signed-off-by: Barry Xu <Barry.Xu@sony.com>
@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Oct 12, 2025

Pulls: #1520
Gist: https://gist.githubusercontent.com/fujitatomoya/d08e31f06bf321cbe7a6e76b0240e1e5/raw/284ad0d46be88359899923df5b3a47a0d2ac5022/ros2.repos
BUILD args: --packages-above-and-dependencies rclpy
TEST args: --packages-above rclpy
ROS Distro: kilted
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/17277

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

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Oct 12, 2025

https://ci.ros2.org/job/ci_linux/25415/cmake/source.fef39a69-ae86-4e5b-97db-3ef6bd2a98bf/#116 is known issue and not related to this PR.

@fujitatomoya fujitatomoya merged commit eb27b18 into kilted Oct 12, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Barry-Xu-2018 @fujitatomoya