Merge branch 'main' into mujoco/stretch-3

Author: stephane-caron

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+### Changed
+
+- Update repository for ``gen3_mj_description`` to ``mujoco_menagerie``
+
 ## [1.11.0] - 2024-06-27
 
 ### Added

README.md

@@ -136,7 +136,7 @@ The DOF column denotes the number of actuated degrees of freedom.
 | `fr3_mj_description`          | FR3                   | Franka Robotics          | 7   | MJCF       |
 | `gen2_description`            | Gen2 (Jaco)           | Kinova                   | 6   | URDF       |
 | `gen3_description`            | Gen3 (Jaco)           | Kinova                   | 6   | URDF       |
-| `gen3_mj_description`         | Gen3 (Jaco)           | Kinova                   | 7   | MJCF       |
+| `gen3_mj_description`         | Gen3                  | Kinova                   | 7   | MJCF       |
 | `iiwa14_description`          | iiwa 14               | KUKA                     | 7   | URDF       |
 | `iiwa14_mj_description`       | iiwa 14               | KUKA                     | 7   | MJCF       |
 | `iiwa7_description`           | iiwa 7                | KUKA                     | 7   | URDF       |

robot_descriptions/_repositories.py

@@ -152,7 +152,7 @@ class Repository:
     ),
     "mujoco_menagerie": Repository(
         url="https://github.com/deepmind/mujoco_menagerie.git",
-        commit="bf50a5bd3c0ae757f768893bb06d4595df8e346f",
+        commit="3d593a327ff8d5efd10f4926ccc477820e9252c1",
         cache_path="mujoco_menagerie",
     ),
     "nao_robot": Repository(

robot_descriptions/gen3_mj_description.py

@@ -4,18 +4,18 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2022 Stéphane Caron
 
-"""Kinova Jaco Gen3 description."""
+"""Kinova Gen3 MJCF description."""
 
 from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
-    "kinova_mj_description",
+    "mujoco_menagerie",
     commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
-PACKAGE_PATH: str = _path.join(REPOSITORY_PATH)
+PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "kinova_gen3")
 
-MJCF_PATH: str = _path.join(PACKAGE_PATH, "xml", "gen3_7dof_mujoco.xml")
+MJCF_PATH: str = _path.join(PACKAGE_PATH, "gen3.xml")

robot_descriptions/shadow_dexee_mj_description.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Stéphane Caron
 
 """Shadow DEX-EE MJCF description."""