automatic merge triggered by jenkins to include upstream (ros/rosdist…

…ro) updates
LCAS · Sep 7, 2024 · 37b6ff7 · 37b6ff7
2 parents 4ec68bb + d293a5b
commit 37b6ff7
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 22 deletions.
diff --git a/humble/distribution.yaml b/humble/distribution.yaml
@@ -4268,7 +4268,6 @@ repositories:
       - swri_image_util
       - swri_math_util
       - swri_opencv_util
-      - swri_prefix_tools
       - swri_roscpp
       - swri_route_util
       - swri_serial_util
@@ -4277,7 +4276,7 @@ repositories:
       tags:
         release: release/humble/{package}/{version}
       url: https://github.com/ros2-gbp/marti_common-release.git
-      version: 3.6.1-1
+      version: 3.7.1-1
     source:
       test_pull_requests: true
       type: git
@@ -4303,7 +4302,7 @@ repositories:
       tags:
         release: release/humble/{package}/{version}
       url: https://github.com/ros2-gbp/marti_messages-release.git
-      version: 1.6.0-1
+      version: 1.6.1-1
     source:
       test_pull_requests: true
       type: git

diff --git a/jazzy/distribution.yaml b/jazzy/distribution.yaml
@@ -1215,7 +1215,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/demos-release.git
-      version: 0.33.4-1
+      version: 0.33.5-1
     source:
       test_pull_requests: true
       type: git
@@ -3483,7 +3483,6 @@ repositories:
       - swri_image_util
       - swri_math_util
       - swri_opencv_util
-      - swri_prefix_tools
       - swri_roscpp
       - swri_route_util
       - swri_serial_util
@@ -3492,7 +3491,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/marti_common-release.git
-      version: 3.6.1-3
+      version: 3.7.1-1
     source:
       test_pull_requests: true
       type: git
@@ -3518,7 +3517,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/marti_messages-release.git
-      version: 1.6.0-1
+      version: 1.6.1-1
     source:
       test_pull_requests: true
       type: git
@@ -3685,7 +3684,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/mimick_vendor-release.git
-      version: 0.6.1-2
+      version: 0.6.2-1
     source:
       type: git
       url: https://github.com/ros2/mimick_vendor.git
@@ -4829,7 +4828,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/performance_test_fixture-release.git
-      version: 0.2.0-3
+      version: 0.2.1-2
     source:
       test_pull_requests: true
       type: git
@@ -5595,7 +5594,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/rclcpp-release.git
-      version: 28.1.3-1
+      version: 28.1.4-1
     source:
       test_pull_requests: true
       type: git
@@ -5611,7 +5610,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/rclpy-release.git
-      version: 7.1.1-2
+      version: 7.1.2-1
     source:
       test_pull_requests: true
       type: git
@@ -6425,7 +6424,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/ros2_tracing-release.git
-      version: 8.2.1-1
+      version: 8.2.2-1
     source:
       test_pull_requests: true
       type: git
@@ -6778,7 +6777,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/rosidl-release.git
-      version: 4.6.3-1
+      version: 4.6.4-1
     source:
       test_pull_requests: true
       type: git
@@ -7070,7 +7069,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/rqt_bag-release.git
-      version: 1.5.3-1
+      version: 1.5.4-1
     source:
       type: git
       url: https://github.com/ros-visualization/rqt_bag.git
@@ -7544,7 +7543,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/rviz-release.git
-      version: 14.1.4-1
+      version: 14.1.5-1
     source:
       test_pull_requests: true
       type: git
@@ -8073,7 +8072,7 @@ repositories:
       tags:
         release: release/jazzy/{package}/{version}
       url: https://github.com/ros2-gbp/teleop_twist_joy-release.git
-      version: 2.6.0-3
+      version: 2.6.1-1
     source:
       test_pull_requests: true
       type: git

diff --git a/noetic/distribution.yaml b/noetic/distribution.yaml
@@ -5501,7 +5501,7 @@ repositories:
       tags:
         release: release/noetic/{package}/{version}
       url: https://github.com/swri-robotics-gbp/mapviz-release.git
-      version: 1.4.2-1
+      version: 1.4.3-1
     source:
       test_pull_requests: true
       type: git
@@ -12075,6 +12075,21 @@ repositories:
       url: https://github.com/ThundeRatz/thunder_line_follower_pmr3100.git
       version: master
     status: developed
+  timed_roslaunch:
+    doc:
+      type: git
+      url: https://github.com/Tiryoh/timed_roslaunch.git
+      version: noetic-devel
+    release:
+      tags:
+        release: release/noetic/{package}/{version}
+      url: https://github.com/Tiryoh/timed_roslaunch-release.git
+      version: 0.2.0-1
+    source:
+      type: git
+      url: https://github.com/Tiryoh/timed_roslaunch.git
+      version: noetic-devel
+    status: maintained
   trac_ik:
     doc:
       type: git

diff --git a/rolling/distribution.yaml b/rolling/distribution.yaml
@@ -3265,7 +3265,6 @@ repositories:
       - swri_image_util
       - swri_math_util
       - swri_opencv_util
-      - swri_prefix_tools
       - swri_roscpp
       - swri_route_util
       - swri_serial_util
@@ -3274,7 +3273,7 @@ repositories:
       tags:
         release: release/rolling/{package}/{version}
       url: https://github.com/ros2-gbp/marti_common-release.git
-      version: 3.6.1-2
+      version: 3.7.1-1
     source:
       test_pull_requests: true
       type: git
@@ -3300,7 +3299,7 @@ repositories:
       tags:
         release: release/rolling/{package}/{version}
       url: https://github.com/ros2-gbp/marti_messages-release.git
-      version: 1.6.0-1
+      version: 1.6.1-1
     source:
       test_pull_requests: true
       type: git
@@ -7600,7 +7599,7 @@ repositories:
       tags:
         release: release/rolling/{package}/{version}
       url: https://github.com/ros2-gbp/teleop_twist_joy-release.git
-      version: 2.6.1-1
+      version: 2.6.2-1
     source:
       test_pull_requests: true
       type: git

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
@@ -7378,7 +7378,7 @@ opencl-headers:
   debian: [opencl-headers]
   fedora: [opencl-headers]
   gentoo: [dev-util/opencl-headers]
-  nixos: [opencl-headers]
+  nixos: [opencl-clhpp]
   openembedded: [opencl-headers@meta-oe]
   rhel: [opencl-headers]
   ubuntu: [opencl-headers]
@@ -7773,6 +7773,7 @@ pybind11-dev:
   rhel:
     '*': [pybind11-devel]
     '7': null
+    '8': null
   ubuntu: [pybind11-dev]
 pybind11-json-dev:
   debian: [pybind11-json-dev]

diff --git a/rosdep/python.yaml b/rosdep/python.yaml
@@ -6671,6 +6671,7 @@ python3-inflection-pip:
 python3-influxdb:
   debian: [python3-influxdb]
   fedora: [python3-influxdb]
+  nixos: [python3Packages.influxdb]
   opensuse: [python3-influxdb]
   rhel: [python3-influxdb]
   ubuntu: [python3-influxdb]
@@ -7640,6 +7641,14 @@ python3-owlready2-pip:
   ubuntu:
     pip:
       packages: [owlready2]
+python3-owslib:
+  arch: [python-owslib]
+  debian: [python3-owslib]
+  fedora: [python3-OWSLib]
+  gentoo: [dev-python/owslib]
+  nixos: [python312Packages.owslib]
+  rhel: [python3-OWSLib]
+  ubuntu: [python3-owslib]
 python3-packaging:
   alpine: [py3-packaging]
   arch: [python-packaging]
@@ -9144,6 +9153,7 @@ python3-seaborn:
   debian: [python3-seaborn]
   fedora: [python3-seaborn]
   gentoo: [dev-python/seaborn]
+  nixos: [python3Packages.seaborn]
   ubuntu: [python3-seaborn]
 python3-segno:
   debian:
@@ -9153,6 +9163,7 @@ python3-segno:
     '*': [python3-segno]
     '36': null
     '37': null
+  nixos: [python3Packages.segno]
   rhel:
     '*': [python3-segno]
     '7': null