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

Upgrade to Drake 1.34.0 #368

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Conversation

jwnimmer-tri
Copy link
Contributor

@jwnimmer-tri jwnimmer-tri commented Oct 16, 2024

Closes #367.


This change is Reviewable

BetsyMcPhail

This comment was marked as duplicate.

Copy link
Collaborator

@BetsyMcPhail BetsyMcPhail left a comment

Choose a reason for hiding this comment

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

Formatting - yikes! Let't try again...

diff --git a/drake_ros/CMakeLists.txt b/drake_ros/CMakeLists.txt
index a40174c..82b6996 100644
--- a/drake_ros/CMakeLists.txt
+++ b/drake_ros/CMakeLists.txt
@@ -13,6 +13,7 @@ endif()
 find_package(ament_cmake_ros REQUIRED)

 find_package(drake REQUIRED)
+find_package(Python3 COMPONENTS Interpreter Development)
 # Must use Drake's fork of Pybind11
 find_package(pybind11 REQUIRED HINTS "${drake_DIR}/../pybind11" NO_DEFAULT_PATH)

diff --git a/drake_ros/drake_ros/CMakeLists.txt b/drake_ros/drake_ros/CMakeLists.txt
index fba53e3..05b7a13 100644
--- a/drake_ros/drake_ros/CMakeLists.txt
+++ b/drake_ros/drake_ros/CMakeLists.txt
@@ -25,7 +25,6 @@ install(
 )

 if(BUILD_TESTING)
-  find_package(Python3 COMPONENTS Interpreter)
   find_package(ament_cmake_test REQUIRED)

   # TODO(eric.cousineau): I am not sure how to place a test-only Python library

Reviewable status: 0 of 3 files reviewed, all discussions resolved

@jwnimmer-tri
Copy link
Contributor Author

Please try another push? I added you to the project settings just now.

@jwnimmer-tri
Copy link
Contributor Author

+@SeanCurtis-TRI for both reviews per schedule, please.

Copy link

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

:LGTM: x2

To the extent that I've ever touched/looked at drake-ros. But it all seems resonable and well spelled.

Reviewed 3 of 3 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @jwnimmer-tri)

@jwnimmer-tri jwnimmer-tri merged commit ab1f7e6 into RobotLocomotion:main Oct 16, 2024
6 checks passed
@jwnimmer-tri jwnimmer-tri deleted the 1.34.0 branch October 16, 2024 20:06
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.

Please update DRAKE_SUGGESTED_VERSION to v1.34.0
3 participants