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

[models] Delete robot descriptions that now live in drake_models #21243

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

jwnimmer-tri
Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri commented Apr 2, 2024

Towards #13942.

Follow-up from #21218.

Anzu CI has been checked and passed.


This change is Reviewable

@jwnimmer-tri jwnimmer-tri marked this pull request as ready for review April 2, 2024 20:00
@jwnimmer-tri jwnimmer-tri added the status: single reviewer ok https://drake.mit.edu/reviewable.html label Apr 2, 2024
@jwnimmer-tri
Copy link
Collaborator Author

+@xuchenhan-tri for both (?) reviews per schedule (tomorrow), please.

If there are parts that seem like they deserve a second reviewer, or separate feature reviewers, just let me know.

Copy link
Collaborator Author

@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.

Reviewable status: LGTM missing from assignee xuchenhan-tri(platform)


manipulation/models/jaco_description/README.md line 0 at r1 (raw file):
FYI This PR purposely doesn't delete two of the files here. Those are tracked under #21216.

Copy link
Contributor

@xuchenhan-tri xuchenhan-tri left a comment

Choose a reason for hiding this comment

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

FYI, I probably won't be able to get to it until tomorrow. I have back-to-back meetings all day today.

Reviewable status: LGTM missing from assignee xuchenhan-tri(platform)

@jwnimmer-tri
Copy link
Collaborator Author

No problem, thanks.

Copy link
Contributor

@xuchenhan-tri xuchenhan-tri left a comment

Choose a reason for hiding this comment

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

checkpoint for my sanity.

Reviewed 100 of 172 files at r1, all commit messages.
Reviewable status: 1 unresolved discussion, LGTM missing from assignee xuchenhan-tri(platform)


examples/manipulation_station/BUILD.bazel line 35 at r1 (raw file):

        # anymore, but removing them breaks too many other things. We'll
        # revisit this later when we finally delete these paths entirely.
        "//manipulation/models/iiwa_description:models",

BTW, I want to make sure that we can properly delete these now because they are already included in @drake_models://wsg_50_description and @drake_models:iiwa_description, right?

Copy link
Collaborator Author

@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.

Reviewable status: 1 unresolved discussion, LGTM missing from assignee xuchenhan-tri(platform)


examples/manipulation_station/BUILD.bazel line 35 at r1 (raw file):

Previously, xuchenhan-tri wrote…

BTW, I want to make sure that we can properly delete these now because they are already included in @drake_models://wsg_50_description and @drake_models:iiwa_description, right?

It's slightly more nuanced than that.

For the purposes of all of the code in this directory, the pre-existing "@drake_models//:iiwa_description", item (about 6 lines prior) was already sufficient -- both on master, and in this PR.

The problem (prior to this PR) was that other code that transitively depended on the manipulation station library code was relying on the manipulation station to declare "//manipulation/models/iiwa_description:models" as a data dep. Code in other packages wasn't doing "DWYU" correctly. Trying to fix that in prior PRs was too much of a headache, especially because there used to be circular model file dependencies until #21241 landed.

Now that this PR finally adjusts all of the data paths project-wide to be correct and precise, we don't need this little hack anymore.

Copy link
Contributor

@xuchenhan-tri xuchenhan-tri left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 unresolved discussion, LGTM missing from assignee xuchenhan-tri(platform)


examples/manipulation_station/BUILD.bazel line 35 at r1 (raw file):

Previously, jwnimmer-tri (Jeremy Nimmer) wrote…

It's slightly more nuanced than that.

For the purposes of all of the code in this directory, the pre-existing "@drake_models//:iiwa_description", item (about 6 lines prior) was already sufficient -- both on master, and in this PR.

The problem (prior to this PR) was that other code that transitively depended on the manipulation station library code was relying on the manipulation station to declare "//manipulation/models/iiwa_description:models" as a data dep. Code in other packages wasn't doing "DWYU" correctly. Trying to fix that in prior PRs was too much of a headache, especially because there used to be circular model file dependencies until #21241 landed.

Now that this PR finally adjusts all of the data paths project-wide to be correct and precise, we don't need this little hack anymore.

Nice, thanks!

Copy link
Contributor

@xuchenhan-tri xuchenhan-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

Reviewed 72 of 172 files at r1.
Reviewable status: 1 unresolved discussion


bindings/pydrake/examples/test/manipulation_station_test.py line 5 at r1 (raw file):

import numpy as np

from pydrake.common import FindResourceOrThrow

nit, no longer needed.

Copy link
Collaborator Author

@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.

Thanks for the slog.

Reviewable status: :shipit: complete! all discussions resolved, LGTM from assignee xuchenhan-tri(platform)

@jwnimmer-tri jwnimmer-tri merged commit 4ea4b97 into RobotLocomotion:master Apr 3, 2024
9 of 10 checks passed
@jwnimmer-tri jwnimmer-tri deleted the none-the-robots branch April 3, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: medium release notes: fix This pull request contains fixes (no new features) status: single reviewer ok https://drake.mit.edu/reviewable.html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants