Skip to content

Commit 2e4944d

Browse files
authored
Merge branch 'moveit:main' into main
2 parents 8e0ff1d + f81936e commit 2e4944d

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/upstream.repos

+6-5
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ repositories:
3030
type: git
3131
url: https://github.com/tylerjw/serial.git
3232
version: ros2
33-
# This package was removed from binaries in the 2025-01-02 Rolling sync.
34-
# If/when this is re-added, can remove from this list.
35-
gz_ros2_control:
33+
# This package was removed from binaries in the 2025-02-03 Rolling sync.
34+
# If/when https://github.com/PickNikRobotics/picknik_controllers/pull/14 is merged and the package is re-added,
35+
# we can remove from this list.
36+
picknik_controllers:
3637
type: git
37-
url: https://github.com/ros-controls/gz_ros2_control.git
38-
version: rolling
38+
url: https://github.com/sea-bass/picknik_controllers.git
39+
version: fix-deprecated-realtime-tools-imports

moveit2_tutorials.repos

+6-5
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ repositories:
3838
type: git
3939
url: https://github.com/moveit/moveit_msgs
4040
version: ros2
41-
# This package was removed from binaries in the 2025-01-02 Rolling sync.
42-
# If/when this is re-added, can remove from this list.
43-
gz_ros2_control:
41+
# This package was removed from binaries in the 2025-02-03 Rolling sync.
42+
# If/when https://github.com/PickNikRobotics/picknik_controllers/pull/14 is merged and the package is re-added,
43+
# we can remove from this list.
44+
picknik_controllers:
4445
type: git
45-
url: https://github.com/ros-controls/gz_ros2_control.git
46-
version: rolling
46+
url: https://github.com/sea-bass/picknik_controllers.git
47+
version: fix-deprecated-realtime-tools-imports

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ sphinx-tabs
55
sphinx-multiversion
66
sphinx-rtd-theme
77
sphinx-copybutton
8-
sphinxcontrib-doxylink@git+https://github.com/sphinx-contrib/doxylink.git@master
8+
sphinxcontrib-doxylink>=1.12.4

0 commit comments

Comments
 (0)