Skip to content

Upgrades April 2025 #22846

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

Merged
merged 14 commits into from
Apr 2, 2025
Merged

Conversation

Aiden2244
Copy link
Contributor

@Aiden2244 Aiden2244 commented Apr 1, 2025

Towards #22836


This change is Reviewable

Copy link
Contributor Author

@Aiden2244 Aiden2244 left a comment

Choose a reason for hiding this comment

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

General notes on this month's upgrades

The following packages could not be upgraded automatically and require non-trivial fixes:

  • googlebenchmark
  • vtk_internal
  • qdldl_internal
  • osqp_internal

Some additional documentation changes may be required re osqp and qdldl: osqp released version 1.0.0 two weeks ago and seems to handle its integration with qdldl in a more robust manner, appearing to point to a stable release rather than a specified commit hash. Furthermore, the stable release of qdldl that osqp points to happens to be the same version that Drake wanted to upgrade to, and the new major version release means that the path referenced in tools/workspace/qdldl_internal/README.md no longer exists. There is a chance we may no longer need to keep track of these dependencies separately anymore and may be able to rely on the auto-update tool. Regardless, our documentation is now obsolete. No changes have been staged for it thus far, as there was a separate issue with the osqp upgrade, but I will make note of it in a separate pr.

Also worth mentioning: libpng upgrade is still being blocked by #22728, so this upgrade has been omitted for this month.

+@jwnimmer-tri +@nicolecheetham for feature review please

Reviewable status: LGTM missing from assignees jwnimmer-tri(platform),nicolecheetham, commits need curation (https://drake.mit.edu/reviewable.html#curated-commits), missing label for release notes (waiting on @Aiden2244)

@jwnimmer-tri jwnimmer-tri added release notes: fix This pull request contains fixes (no new features) status: commits are properly curated https://drake.mit.edu/reviewable.html#curated-commits and removed status: do not review labels Apr 2, 2025
Copy link
Collaborator

@jwnimmer-tri jwnimmer-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: platform / both.

-(status: do not review) +(release notes: fix) +(status: commits are properly curated)

Reviewed 1 of 1 files at r1, 1 of 1 files at r2, 1 of 1 files at r3, 1 of 1 files at r4, 1 of 1 files at r5, 1 of 1 files at r6, 1 of 1 files at r7, 1 of 1 files at r8, 1 of 1 files at r9, 1 of 1 files at r10, 1 of 1 files at r11, 1 of 1 files at r12, 17 of 17 files at r13, all commit messages.
Reviewable status: 1 unresolved discussion, LGTM missing from assignee nicolecheetham, when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @Aiden2244)


tools/workspace/crate_universe/lock/details/defs.bzl.orig line 0 at r13 (raw file):
Don't commit this file. (Amend this commit to drop this file.)

I thought the script deleted it automatically, but maybe not.

@Aiden2244 Aiden2244 force-pushed the upgrades-april branch 2 times, most recently from 853f49e to 25ade10 Compare April 2, 2025 15:41
Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 3 files at r14, 2 of 2 files at r15, all commit messages.
Reviewable status: LGTM missing from assignee nicolecheetham, when planning a "properly curated" merge commit the PR must always be rebased onto latest master (waiting on @Aiden2244)

@Aiden2244 Aiden2244 mentioned this pull request Mar 31, 2025
8 tasks
@jwnimmer-tri jwnimmer-tri added the status: single reviewer ok https://drake.mit.edu/reviewable.html label Apr 2, 2025
@jwnimmer-tri
Copy link
Collaborator

Are we OK to merge without Nicole? I am happy to approve on my own, unless you wanted to wait for her to cross-check on your first time here?

Copy link
Contributor Author

@Aiden2244 Aiden2244 left a comment

Choose a reason for hiding this comment

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

I am good to merge the Python upgrade without Nicole. For this pr, I realized that fcl_internal actually just required a trivial patchfile update: our patch to insert the line #include <cassert> was included in the latest release of fcl_internal and thus the patchfile is no longer necessary. This should solve the issue I was getting, but let's wait until CI passes to merge this branch.

Reviewable status: LGTM missing from assignee nicolecheetham

Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

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

Okay, -@nicolecheetham no need to block on review then.

Reviewed 2 of 2 files at r16, all commit messages.
Reviewable status: :shipit: complete! all discussions resolved, LGTM from assignee jwnimmer-tri(platform), base commit is latest master

@jwnimmer-tri jwnimmer-tri merged commit 81ce8c1 into RobotLocomotion:master Apr 2, 2025
9 of 10 checks passed
@Aiden2244 Aiden2244 deleted the upgrades-april branch April 2, 2025 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release notes: fix This pull request contains fixes (no new features) status: commits are properly curated https://drake.mit.edu/reviewable.html#curated-commits status: single reviewer ok https://drake.mit.edu/reviewable.html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants