Skip to content

Commit 2dbcf6d

Browse files
authored
new pip wheels (#443)
i've also improved the bazel logic to be able to run the minimal dependencies variant (which tripped on CI) locally.
1 parent e11db27 commit 2dbcf6d

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ jobs:
193193
"from pathlib import Path; from pydrake.all import GetDrakePath; \
194194
print(Path(GetDrakePath()).parent)"` \
195195
MANIPULATION_DATA_DIR="`pwd`/book/data" \
196-
./book/htmlbook/workflows/ci/jammy/test_w_installed_deps
196+
BAZEL_TEST_FLAGS="--define=use_dependencies=none" \
197+
./book/htmlbook/workflows/ci/jammy/test
197198
shell: bash
198199
jammy-pip-extra:
199200
# This should emulate a student's experience if they are doing the psets
@@ -231,5 +232,6 @@ jobs:
231232
"from pathlib import Path; from pydrake.all import GetDrakePath; \
232233
print(Path(GetDrakePath()).parent)"` \
233234
MANIPULATION_DATA_DIR="`pwd`/book/data" \
234-
./book/htmlbook/workflows/ci/jammy/test_w_installed_deps
235+
BAZEL_TEST_FLAGS="--define=use_dependencies=none" \
236+
./book/htmlbook/workflows/ci/jammy/test
235237
shell: bash

book/chapters.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manipulation/BUILD.bazel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ rt_py_library(
4141
deps = [
4242
requirement("drake"),
4343
requirement("lxml"),
44+
],
45+
optional_deps = [
4446
requirement("pycollada"),
4547
requirement("trimesh"),
4648
],
@@ -151,6 +153,8 @@ rt_py_test(
151153
deps = [
152154
"manipulation",
153155
requirement("lxml"),
156+
],
157+
optional_deps = [
154158
requirement("trimesh"),
155159
requirement("vhacdx"),
156160
],
@@ -165,6 +169,8 @@ rt_py_test(
165169
"//manipulation/envs:box_flipup",
166170
"manipulation",
167171
"scenarios",
172+
],
173+
optional_deps = [
168174
requirement("stable-baselines3"),
169175
],
170176
)

manipulation/test/test_make_drake_compatible_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
from lxml import etree
77
from pydrake.multibody.parsing import PackageMap
88

9-
from manipulation.remotes import AddMujocoMenagerie
109
from manipulation.utils import FindResource
1110

1211
try:
1312
from manipulation.make_drake_compatible_model import (
1413
MakeDrakeCompatibleModel,
1514
_convert_mesh,
1615
)
16+
from manipulation.remotes import AddMujocoMenagerie
1717

1818
trimesh_available = True
1919
except ImportError:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "manipulation"
33
# Use e.g. 2024.10.4.rc0 if I need to release a release candidate.
44
# Use e.g. 2024.10.4.post1 if I need to rerelease on the same day.
5-
version = "2025.1.24"
5+
version = "2025.2.16"
66
description = "MIT 6.421 - Robotic Manipulation"
77
authors = ["Russ Tedrake <[email protected]>"]
88
license = "BSD License"

0 commit comments

Comments
 (0)