Skip to content

Commit e3d08be

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into agent/cable-routing-latest-develop-review
# Conflicts: # uv.lock
2 parents 3cf1c97 + a6060a9 commit e3d08be

715 files changed

Lines changed: 25791 additions & 3643 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
/source/isaaclab_newton/ @AntoineRichard @StafaH @hujc7 @kellyguo11
4242
/source/isaaclab_newton/isaaclab_newton/physics/kamino_manager.py @david-cao-mueller @aserifi @rubengrandia @AntoineRichard
4343

44-
/source/isaaclab_ov/ @huidongc @rilei-nvidia @pbarejko @kellyguo11
45-
46-
/source/isaaclab_ovphysx/ @AntoineRichard @marcodiiga @kellyguo11
44+
/source/isaaclab_ov/ @huidongc @rilei-nvidia @pbarejko @AntoineRichard @marcodiiga
4745

4846
/source/isaaclab_physx/ @AntoineRichard @ooctipus @kellyguo11
4947
/source/isaaclab_ppisp/ @moennen @pbarejko @kellyguo11

.github/actions/multi-gpu/multi_gpu_shard_runner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
set +e # keep going on errors; per-shard exit codes are aggregated at the end
3535
cd /workspace/isaaclab
36-
unset HUB__ARGS__DETECT_ONLY DISPLAY # clear vars that would force Kit into detect-only / headed (X11) mode
36+
unset DISPLAY # clear the var that would force Kit into headed (X11) mode
3737

3838
# Container-level HOME + PYTHONUSERBASE for pip --user installs. The image
3939
# runs as --user $host_uid:$host_gid with no matching /etc/passwd entry, so

.github/actions/run-tests/run_tests.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,6 @@ run_tests() {
321321
mkdir -p tests
322322
rm _isaac_sim || true
323323
ln -s /isaac-sim _isaac_sim
324-
# Allow OmniHub to start in the test container. Some base images
325-
# set this detect-only flag, which makes cold asset downloads
326-
# fall back to slow repeated retries.
327-
unset HUB__ARGS__DETECT_ONLY
328324
./isaaclab.sh -p -m pip install pytest pytest-mock junitparser flaky \"coverage>=7.6.1\"
329325
if [ -n \"\${WARP_CACHE_PATH:-}\" ]; then
330326
./isaaclab.sh -p tools/verify_warp_cache.py

.github/actions/validate-kitless-image/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,8 @@ runs:
5454
print("ovrtx renderer initialized")
5555
'
5656
57-
# The Newton training probe is the shared one architecture CI also runs, so
58-
# the command and its assertions live in one place. pytest goes only into
59-
# this disposable layer; reinstalling the workspace would fail against the
60-
# read-only source mount.
57+
# Discover files by grep, not by pointing pytest at a directory: this image has no Isaac
58+
# Sim, and collecting a directory imports every module to read its markers.
6159
docker run --rm --gpus all --network host \
6260
"${mount_args[@]}" \
6361
"$IMAGE_TAG" \
@@ -67,6 +65,8 @@ runs:
6765
python -m pytest \
6866
source/isaaclab/test/install_ci/misc/cartpole_training_smoke.py::test_train_cartpole_state_completes \
6967
source/isaaclab/test/benchmark/test_asset_suite_runtime_semantics.py \
68+
source/isaaclab/test/sim/test_urdf_converter.py \
69+
source/isaaclab/test/sim/test_mjcf_converter.py \
7070
-q -p no:cacheprovider
7171
'
7272

.github/workflows/build.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,27 @@ jobs:
552552
filter-pattern: "isaaclab_assets"
553553
container-name: isaac-lab-assets-test
554554

555+
test-isaaclab-experimental:
556+
name: isaaclab_experimental
557+
runs-on: [self-hosted, gpu]
558+
timeout-minutes: 180
559+
needs: [build, config]
560+
if: >-
561+
github.event_name != 'push' &&
562+
needs.build.result == 'success'
563+
steps:
564+
- uses: actions/checkout@v6
565+
with:
566+
fetch-depth: 1
567+
lfs: true
568+
- uses: ./.github/actions/run-package-tests
569+
with:
570+
image-tag: ${{ needs.config.outputs.ci_image_tag }}
571+
isaacsim-base-image: ${{ needs.config.outputs.isaacsim_image_name }}
572+
isaacsim-version: ${{ needs.config.outputs.isaacsim_image_tag }}
573+
filter-pattern: "isaaclab_experimental"
574+
container-name: isaac-lab-experimental-test
575+
555576
test-isaaclab-newton:
556577
name: isaaclab_newton
557578
runs-on: [self-hosted, gpu]

.github/workflows/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
# which the CI credential can reach.
1111
isaacsim_image_name: nvcr.io/0947644777160149/internal/isaac-sim
1212
# Pinned to Isaac Sim 6.1.0-alpha.47 (commit 0d707bba) for reproducible CI.
13-
isaacsim_image_tag: latest-develop@sha256:dc49acc482221d5302cc7095771b6a807de97a17c7835064f812dd013ff2b806
13+
isaacsim_image_tag: latest-develop@sha256:a0fe646aa0d2c717a51231589eb210a8f59db7d3e6ccb8e8ba8b11f9ae13ed85
1414
isaaclab_image_name: nvcr.io/0947644777160149/internal/isaac-lab
1515
ovphysx_wheelhouse_image: ""

.github/workflows/kitless-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
^source/[^/]+/pyproject\.toml$ :: Package manifests
5858
^source/isaaclab/isaaclab/cli/ :: Install CLI implementation
5959
^source/isaaclab/isaaclab/test/fixtures/ :: Isolated asset fixture implementation
60-
^source/isaaclab_(physx|newton|ovphysx)/isaaclab_.*/test/fixtures/ :: Backend fixture implementation
60+
^source/isaaclab_(physx|newton|ov)/isaaclab_.*/test/fixtures/ :: Backend fixture implementation
6161
^source/isaaclab/test/benchmark/test_asset_suite_runtime_semantics\.py$ :: Kit-less pytest subset
6262
^\.github/workflows/kitless-docker\.yml$ :: This workflow file
6363
^\.github/actions/detect-changes/ :: Change-detection action

.github/workflows/pre-commit.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ jobs:
2222
with:
2323
python-version: "3.12"
2424
- uses: pre-commit/action@v3.0.0
25+
# The local fragment hook needs a full base-branch history. The
26+
# dedicated changelog-check workflow supplies that authoritative gate.
27+
env:
28+
SKIP: check-changelog-fragments

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ _build
7171
# Teleop Recorded Dataset
7272
/datasets/
7373

74+
# Local Franka Pour reset-generator references retained while the public one-file workflow is slimmed.
75+
/scripts/tools/generate_franka_pour_reset_dataset_legacy.py
76+
/source/isaaclab_tasks/isaaclab_tasks/contrib/franka_pour/reset_dataset_generator_legacy.py
77+
7478
# Tests
7579
/tests/
7680

.pre-commit-config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ repos:
7777
- id: rst-inline-touching-normal
7878
- repo: local
7979
hooks:
80+
- id: check-changelog-fragments
81+
name: check changelog fragments
82+
entry: python tools/changelog/cli.py check --include-worktree
83+
language: python
84+
always_run: true
85+
pass_filenames: false
8086
- id: check-git-lfs-pointers
8187
name: check Git LFS pointers
8288
entry: tools/pre_commit/check_git_lfs_pointers.sh

0 commit comments

Comments
 (0)