diff --git a/CHANGELOG.md b/CHANGELOG.md index 81bed49..3495f65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -- Description RBY1 Mobile Manipulatior (URDF) (thanks to @uynitsuj) -- Description YAM (MJCF) (thanks to @uynitsuj) -- Description YAM (URDF) (thanks to @uynitsuj) -- Description MuJoCo Humanoid (MJCF) (thanks to @ManifoldFR) +## [1.20.0] - 2025-07-15 + +### Added + +- Description: MuJoCo Humanoid (MJCF) (thanks to @ManifoldFR) +- Description: RBY1 Mobile Manipulatior (URDF) (thanks to @uynitsuj) +- Description: YAM (MJCF) (thanks to @uynitsuj) +- Description: YAM (URDF) (thanks to @uynitsuj) ## [1.19.0] - 2025-07-03 @@ -23,7 +27,6 @@ All notable changes to this project will be documented in this file. - Description: WL P311D (URDF) - Description: WL P311E (URDF) - ### Changed - Rename `leap_hand_v1` to `leap_hand_v1_description` @@ -501,7 +504,8 @@ This initial release includes 33 robot descriptions: - Contributing instructions - This changelog -[unreleased]: https://github.com/robot-descriptions/robot_descriptions.py/compare/v1.19.0...HEAD +[unreleased]: https://github.com/robot-descriptions/robot_descriptions.py/compare/v1.20.0...HEAD +[1.20.0]: https://github.com/robot-descriptions/robot_descriptions.py/compare/v1.19.0...v1.20.0 [1.19.0]: https://github.com/robot-descriptions/robot_descriptions.py/compare/v1.18.0...v1.19.0 [1.18.0]: https://github.com/robot-descriptions/robot_descriptions.py/compare/v1.17.0...v1.18.0 [1.17.0]: https://github.com/robot-descriptions/robot_descriptions.py/compare/v1.16.0...v1.17.0 diff --git a/CITATION.cff b/CITATION.cff index 4289f89..2d1922d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,8 +1,8 @@ cff-version: 1.2.0 message: "If you find this code helpful, please cite it as below." title: "robot_descriptions.py: Robot descriptions in Python" -version: 1.19.0 -date-released: 2025-05-08 +version: 1.20.0 +date-released: 2025-07-15 url: "https://github.com/robot-descriptions/robot_descriptions.py" license: "Apache-2.0" authors: @@ -38,4 +38,7 @@ authors: - family-names: "Tao" given-names: "Haixuan Xavier" - family-names: "Yu" - given-names: "Justin" \ No newline at end of file + given-names: "Justin" +- family-names: "Jallet" + given-names: "Wilson" + orcid: "https://orcid.org/0000-0001-8222-2739" diff --git a/README.md b/README.md index 64621a4..412c7f5 100644 --- a/README.md +++ b/README.md @@ -199,14 +199,14 @@ The DOF column denotes the number of actuated degrees of freedom. ### Educational -| Name | Robot | DOF | Format | -|-------------------------------|-----------------------|-----|------------| -| `double_pendulum_description` | Double Pendulum | 2 | URDF | -| `dynamixel_2r_mj_description` | Dynamixel 2R | 2 | MJCF | -| `finger_edu_description` | FingerEdu | 3 | URDF | -| `mujoco_humanoid_description` | MuJoCo Humanoid | 27 | MJCF | -| `simple_humanoid_description` | Simple Humanoid | 29 | URDF | -| `trifinger_edu_description` | TriFingerEdu | 9 | URDF | +| Name | Robot | DOF | Format | License | +|----------------------------------|-----------------------|-----|------------|--------- +| `double_pendulum_description` | Double Pendulum | 2 | URDF | BSD-3-Clause | +| `dynamixel_2r_mj_description` | Dynamixel 2R | 2 | MJCF | MIT | +| `finger_edu_description` | FingerEdu | 3 | URDF | BSD-3-Clause | +| `mujoco_humanoid_mj_description` | MuJoCo Humanoid | 27 | MJCF | [Apache-2.0](https://github.com/google-deepmind/mujoco/blob/ad0dc0de5e10a075a2c65be629e9a8d557d383a6/LICENSE) | +| `simple_humanoid_description` | Simple Humanoid | 29 | URDF | BSD-2-Clause | +| `trifinger_edu_description` | TriFingerEdu | 9 | URDF | MIT | ### End effectors @@ -329,10 +329,10 @@ If you use this project in your works, please cite as follows: ```bibtex @software{robot_descriptions_py, title = {{robot_descriptions.py: Robot descriptions in Python}}, - author = {Caron, Stéphane and Romualdi, Giulio and Kozlov, Lev and Ordoñez Apraez, Daniel Felipe and Tadashi Kussaba, Hugo and Bang, Seung Hyeon and Zakka, Kevin and Schramm, Fabian and Uru\c{c}, Jafar and Traversaro, Silvio and Castro, Sebastian and Tao, Haixuan Xavier}, + author = {Caron, Stéphane and Romualdi, Giulio and Kozlov, Lev and Ordoñez Apraez, Daniel Felipe and Tadashi Kussaba, Hugo and Bang, Seung Hyeon and Zakka, Kevin and Schramm, Fabian and Uru\c{c}, Jafar and Traversaro, Silvio and Castro, Sebastian and Tao, Haixuan Xavier and Jallet, Wilson}, license = {Apache-2.0}, url = {https://github.com/robot-descriptions/robot_descriptions.py}, - version = {1.19.0}, + version = {1.20.0}, year = {2025} } ``` diff --git a/robot_descriptions/__init__.py b/robot_descriptions/__init__.py index feda576..519738d 100644 --- a/robot_descriptions/__init__.py +++ b/robot_descriptions/__init__.py @@ -8,6 +8,6 @@ from ._descriptions import DESCRIPTIONS -__version__ = "1.19.0" +__version__ = "1.20.0" __all__ = ["DESCRIPTIONS"] diff --git a/robot_descriptions/_descriptions.py b/robot_descriptions/_descriptions.py index 42e6cc7..1766e8d 100644 --- a/robot_descriptions/_descriptions.py +++ b/robot_descriptions/_descriptions.py @@ -151,7 +151,7 @@ def has_urdf(self) -> bool: ), "mini_cheetah_description": Description(Format.URDF, tags={"quadruped"}), "minitaur_description": Description(Format.URDF, tags={"quadruped"}), - "mujoco_humanoid_description": Description( + "mujoco_humanoid_mj_description": Description( Format.MJCF, tags={"educational", "humanoid"} ), "n1_description": Description(Format.URDF, tags={"humanoid"}), diff --git a/robot_descriptions/_repositories.py b/robot_descriptions/_repositories.py index 15afa4d..7938ce1 100644 --- a/robot_descriptions/_repositories.py +++ b/robot_descriptions/_repositories.py @@ -198,16 +198,16 @@ class Repository: commit="1988bceb26e81f28594a16e7d5e6abe5cbb27ace", cache_path="mini_cheetah_urdf", ), - "mujoco_menagerie": Repository( - url="https://github.com/deepmind/mujoco_menagerie.git", - commit="66384c6b8581c811a7b1eb63bcf4fa944fa43602", - cache_path="mujoco_menagerie", - ), "mujoco": Repository( url="https://github.com/google-deepmind/mujoco.git", commit="ad0dc0de5e10a075a2c65be629e9a8d557d383a6", cache_path="mujoco", ), + "mujoco_menagerie": Repository( + url="https://github.com/deepmind/mujoco_menagerie.git", + commit="66384c6b8581c811a7b1eb63bcf4fa944fa43602", + cache_path="mujoco_menagerie", + ), "nao_robot": Repository( url="https://github.com/ros-naoqi/nao_robot.git", commit="67476469a1371b00b17538eb6ea336367ece7d44", diff --git a/robot_descriptions/mujoco_humanoid_description.py b/robot_descriptions/mujoco_humanoid_mj_description.py similarity index 100% rename from robot_descriptions/mujoco_humanoid_description.py rename to robot_descriptions/mujoco_humanoid_mj_description.py