Skip to content

Commit

Permalink
[workspace] Upgrade drake_models to latest commit
Browse files Browse the repository at this point in the history
  • Loading branch information
jwnimmer-tri committed Apr 2, 2024
1 parent 8658303 commit 6c87182
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
4 changes: 2 additions & 2 deletions multibody/benchmarking/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ drake_cc_googlebench_binary(
srcs = ["homecart_global_ik.cc"],
add_test_rule = True,
data = [
"//manipulation/models/ur3e:models",
"//manipulation/models/wsg_50_description:models",
"@drake_models//:tri_homecart",
"@drake_models//:ur_description",
"@drake_models//:wsg_50_description",
],
test_tags = gurobi_test_tags(),
deps = [
Expand Down
19 changes: 7 additions & 12 deletions tools/workspace/drake_models/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,11 @@ enumerate_filegroup(
data = ["@drake_models"],
)

_MODEL_DATA = [
"@drake_models",
# TODO(jwnimmer-tri) As we incrementally transition model files from
# `package://drake` to `package://drake_models` we have a problem that
# `package://drake_models` depends on `package://drake`. We should aim
# to drop these extra data dependencies after the transition completes.
"//manipulation/models/ur3e:models",
"//manipulation/models/wsg_50_description:models",
]

drake_py_unittest(
name = "parse_test",
data = _MODEL_DATA + [
data = [
":inventory.txt",
"@drake_models",
],
deps = [
"//bindings/pydrake",
Expand All @@ -30,7 +21,11 @@ drake_py_unittest(

drake_py_unittest(
name = "tri_homecart_test",
data = _MODEL_DATA,
data = [
"@drake_models//:tri_homecart",
"@drake_models//:ur_description",
"@drake_models//:wsg_50_description",
],
deps = [
"//bindings/pydrake",
],
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/drake_models/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ def drake_models_repository(
github_archive(
name = name,
repository = "RobotLocomotion/models",
commit = "d2b82d335c4f19aa9b515b483c9d5e6dff0c8997",
sha256 = "6b7390b95bc7ab50c6bbbf05a07efa727965485d71c8c5b34998cfec44dbbc27", # noqa
commit = "a8234918864d5510bd69cbb5e824b1a23991c204",
sha256 = "1e78f567f60de83e77e7646bbe3c9b215b391f36325f8822fe0307f0f23f47f3", # noqa
build_file = ":package.BUILD.bazel",
mirrors = mirrors,
)

0 comments on commit 6c87182

Please sign in to comment.