From c2372c48b7bc00897fac25669ca3fbc0223af9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Caron?= Date: Tue, 23 Jul 2024 18:58:49 +0200 Subject: [PATCH 1/4] Update Pinocchio visualize submodule path See https://github.com/stephane-caron/pink/issues/100#issuecomment-2212542639 Thanks @domrachev03! --- doc/environment.yml | 2 +- pink/visualization.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/environment.yml b/doc/environment.yml index 00f5a9f1..e1b9df6f 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -2,7 +2,7 @@ name: pink channels: - conda-forge dependencies: - - pinocchio <3 + - pinocchio - pink - pip >=21.3.1 - pip: diff --git a/pink/visualization.py b/pink/visualization.py index aaee334c..cf9629a8 100644 --- a/pink/visualization.py +++ b/pink/visualization.py @@ -7,11 +7,12 @@ """Visualization helpers.""" import pinocchio as pin +from pinocchio import visualize def start_meshcat_visualizer( robot: pin.RobotWrapper, -) -> pin.visualize.MeshcatVisualizer: +) -> visualize.MeshcatVisualizer: """Open a MeshCat visualizer in a web browser. Args: @@ -20,7 +21,7 @@ def start_meshcat_visualizer( Returns: MeshCat visualizer. """ - viz = pin.visualize.MeshcatVisualizer( + viz = visualize.MeshcatVisualizer( robot.model, robot.collision_model, robot.visual_model ) robot.setVisualizer(viz, init=False) From f25f94450a19c804daf3b1ef0913d374f3297311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Caron?= Date: Tue, 23 Jul 2024 19:03:19 +0200 Subject: [PATCH 2/4] Update the changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 715dfeca..02adbdbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. - CICD: Update ruff to 0.4.3 - Configuration accepts list of Control Barrier Functions +- Update to Pinocchio 3 with 2.7 backward compatibility ### Fixed From 40b5453adec44a8ba1563ea8bbf7fd1551a894e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Caron?= Date: Tue, 23 Jul 2024 19:13:11 +0200 Subject: [PATCH 3/4] doc: Fix Sphinx configuration --- doc/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index c8a4eafe..d47e3bcd 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -39,7 +39,7 @@ # You can specify multiple suffix as a list of string: # # source_suffix = ['.rst', '.md'] -source_suffix = ".rst" +source_suffix = {'.rst': 'restructuredtext'} # The encoding of source files. # @@ -341,7 +341,7 @@ nitpicky = True nitpick_ignore = [ - ("py:class", "pinocchio.pinocchio_pywrap.SE3"), + ("py:class", "pinocchio.pinocchio_pywrap_default.SE3"), ("py:data", "typing.Optional"), ("py:data", "typing.Tuple"), ("py:data", "typing.Union"), From 6ec0d4d8852a8326eab846a5452aec400f34e7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Caron?= Date: Tue, 23 Jul 2024 19:13:41 +0200 Subject: [PATCH 4/4] doc: Update environment.yml --- doc/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/environment.yml b/doc/environment.yml index e1b9df6f..150039ef 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -2,7 +2,7 @@ name: pink channels: - conda-forge dependencies: - - pinocchio + - pinocchio >=3.0.0 - pink - pip >=21.3.1 - pip: