Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 3, 2022

This is an automatic backport of pull request #509 done by Mergify.
Cherry-pick of 6b18a40 has failed:

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

You are currently cherry-picking commit 6b18a400.
  (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:
	new file:   tf2_geometry_msgs/pytest.ini
	deleted:    tf2_geometry_msgs/scripts/test.py
	modified:   tf2_ros_py/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tf2_geometry_msgs/CMakeLists.txt
	both modified:   tf2_geometry_msgs/package.xml
	both modified:   tf2_geometry_msgs/src/tf2_geometry_msgs/tf2_geometry_msgs.py
	both modified:   tf2_geometry_msgs/test/test_tf2_geometry_msgs.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Drop PyKDL dependency

Signed-off-by: Florian Vahl <git@flova.de>
Co-authored-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 6b18a40)

# Conflicts:
#	tf2_geometry_msgs/CMakeLists.txt
#	tf2_geometry_msgs/package.xml
#	tf2_geometry_msgs/src/tf2_geometry_msgs/tf2_geometry_msgs.py
#	tf2_geometry_msgs/test/test_tf2_geometry_msgs.py
@dawsonc
Copy link

dawsonc commented Jun 3, 2022

Fixed by #533

@clalancette
Copy link
Contributor

Closing in favor of #533.

@clalancette clalancette closed this Jul 8, 2022
@mergify mergify bot deleted the mergify/bp/galactic/pr-509 branch July 8, 2022 15:35
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