Merge branch 'jazzy' into mergify/bp/jazzy/pr-986

ros-perception · May 27, 2024 · d3886c3 · d3886c3
2 parents 40fc9df + 4c46e68
commit d3886c3
Show file tree

Hide file tree

Showing 20 changed files with 90 additions and 14 deletions.
diff --git a/.github/workflows/basic-build-ci.yaml b/.github/workflows/basic-build-ci.yaml
@@ -2,17 +2,17 @@ name: Basic Build Workflow
 
 on:
   push:
-    branches: [rolling]
+    branches: [jazzy]
   pull_request:
     types: [opened, reopened, synchronize]
 
 jobs:
-  build-rolling:
+  build-jazzy:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     container:
-      image: osrf/ros2:testing
+      image: ros:jazzy-ros-core
     steps:
     - name: Checkout repo
       uses: actions/checkout@v2
@@ -24,7 +24,7 @@ jobs:
     - name: Install Prerequisites
       run: |
         bash -c 'source /opt/ros/$ROS_DISTRO/setup.bash; \
-        apt-get update && apt-get upgrade -y && rosdep update; \
+        apt-get update && apt-get upgrade -y && apt-get install ros-dev-tools -y && rosdep init && rosdep update; \
         rosdep install --from-paths src --ignore-src -y'
     - name: Build Workspace
       run: |

diff --git a/camera_calibration/CHANGELOG.rst b/camera_calibration/CHANGELOG.rst
@@ -2,6 +2,58 @@
 Changelog for package camera_calibration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+* fix: cv2.aruco.interpolateCornersCharuco is deprecated (backport `#979 <https://github.com/ros-perception/image_pipeline/issues/979>`_) (`#980 <https://github.com/ros-perception/image_pipeline/issues/980>`_)
+  There has been API Changes in the newer releases of opencv2 (from
+  4.8.0). The PR addresses this by supporting both the old and new APIs.
+  updated Syntax
+  ```
+  charucodetector = cv2.aruco.CharucoDetector(board)
+  charuco_corners, charuco_ids, marker_corners, marker_ids = charucodetector.detectBoard(image)
+  ```
+  before 4.8.0
+  ```
+  marker_corners, marker_ids, rejectedImgPoints = cv2.aruco.detectMarkers( image, dictionary)
+  retval, charuco_corners, charuco_ids = cv2.aruco.interpolateCornersCharuco( marker_corners, marker_ids, image, board)
+  ```
+  See the changed examples in the main opencv2 repo:
+  https://github.com/opencv/opencv/blob/f9a59f2592993d3dcc080e495f4f5e02dd8ec7ef/samples/python/calibrate.py#L110<hr>This
+  is an automatic backport of pull request `#979 <https://github.com/ros-perception/image_pipeline/issues/979>`_ done by
+  [Mergify](https://mergify.com).
+  Co-authored-by: Földi Tamás <[email protected]>
+* Update for compatibility with image_pipeline 4.1.0 (`#968 <https://github.com/ros-perception/image_pipeline/issues/968>`_)
+  This is a PR to fix:
+  - `#966 <https://github.com/ros-perception/image_pipeline/issues/966>`_
+  As noted in `#966 <https://github.com/ros-perception/image_pipeline/issues/966>`_, as of writing image_pipeline [4.1.0 has been
+  released](https://github.com/ros-perception/vision_opencv/releases/tag/4.1.0),
+  is updated on
+  [index.ros.org](https://index.ros.org/p/image_geometry/github-ros-perception-vision_opencv/#rolling),
+  but it has not yet been migrated to
+  [packages.ros.org](http://packages.ros.org/ros2/ubuntu/dists/noble/main/binary-amd64/Packages).
+  As such `camera_calibration` will also require the source of
+  [image_pipeline
+  4.1.0](https://github.com/ros-perception/vision_opencv/releases/tag/4.1.0)
+  or higher to successfully build.
+  I tested to ensure successful build with colcon build & colcon test.
+  Note that colcon test has the following warning that is out of scope of
+  this PR:
+  ```
+  =============================== warnings summary ===============================
+  src/camera_calibration/calibrator.py:47
+  Warning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
+  ```
+  Please let me know if there are any questions, concerns, or requested
+  changes.
+* replace disutils with python3-semver (`#970 <https://github.com/ros-perception/image_pipeline/issues/970>`_)
+  Fix for
+  - `#969 <https://github.com/ros-perception/image_pipeline/issues/969>`_
+  I added a dependency for `python3-semver` to replace version parsing
+  with `disutils`.
+  Please let me know if you have any questions, concerns, or additional
+  requested changes.
+* Contributors: Scott Monaghan, mergify[bot]
+
 5.0.1 (2024-03-26)
 ------------------
 * Fix spelling error for cv2.aruco.DICT from 6x6_50 to 7x7_1000 (`#961 <https://github.com/ros-perception/image_pipeline/issues/961>`_)

diff --git a/camera_calibration/package.xml b/camera_calibration/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>camera_calibration</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>
      camera_calibration allows easy calibration of monocular or stereo
      cameras using a checkerboard calibration target.

diff --git a/camera_calibration/setup.py b/camera_calibration/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='5.0.1',
+    version='5.0.2',
     packages=["camera_calibration", "camera_calibration.nodes"],
     data_files=[
     ('share/ament_index/resource_index/packages',

diff --git a/depth_image_proc/CHANGELOG.rst b/depth_image_proc/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package depth_image_proc
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 * Update depth_image_proc::RegisterNode documentation (`#957 <https://github.com/ros-perception/image_pipeline/issues/957>`_)

diff --git a/depth_image_proc/package.xml b/depth_image_proc/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>depth_image_proc</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>
 
      Contains components for processing depth images such as those

diff --git a/image_pipeline/CHANGELOG.rst b/image_pipeline/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package image_pipeline
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 * DisparityNode: replace full_dp parameter with sgbm_mode (`#945 <https://github.com/ros-perception/image_pipeline/issues/945>`_)

diff --git a/image_pipeline/package.xml b/image_pipeline/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>image_pipeline</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>image_pipeline fills the gap between getting raw images from a camera driver and higher-level vision processing.</description>
 
   <maintainer email="[email protected]">Vincent Rabaud</maintainer>

diff --git a/image_proc/CHANGELOG.rst b/image_proc/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package image_proc
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 * Fix parameter names in components.rst (`#959 <https://github.com/ros-perception/image_pipeline/issues/959>`_)

diff --git a/image_proc/package.xml b/image_proc/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>image_proc</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>Single image rectification and color processing.</description>
 
   <maintainer email="[email protected]">Vincent Rabaud</maintainer>

diff --git a/image_publisher/CHANGELOG.rst b/image_publisher/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package image_publisher
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 * unified changelog, add missing image, deduplicate tutorials (`#938 <https://github.com/ros-perception/image_pipeline/issues/938>`_)

diff --git a/image_publisher/package.xml b/image_publisher/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>image_publisher</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>
 
       Contains a node publish an image stream from single image file

diff --git a/image_rotate/CHANGELOG.rst b/image_rotate/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package image_rotate
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 * fix image publisher remapping (`#941 <https://github.com/ros-perception/image_pipeline/issues/941>`_)

diff --git a/image_rotate/package.xml b/image_rotate/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>image_rotate</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>
     <p>
       Contains a node that rotates an image stream in a way that minimizes

diff --git a/image_view/CHANGELOG.rst b/image_view/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package image_view
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 * unified changelog, add missing image, deduplicate tutorials (`#938 <https://github.com/ros-perception/image_pipeline/issues/938>`_)

diff --git a/image_view/package.xml b/image_view/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>image_view</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>
   A simple viewer for ROS image topics. Includes a specialized viewer
   for stereo + disparity images.

diff --git a/stereo_image_proc/CHANGELOG.rst b/stereo_image_proc/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package stereo_image_proc
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 * DisparityNode: replace full_dp parameter with sgbm_mode (`#945 <https://github.com/ros-perception/image_pipeline/issues/945>`_)

diff --git a/stereo_image_proc/package.xml b/stereo_image_proc/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>stereo_image_proc</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>Stereo and single image rectification and disparity processing.</description>
 
   <maintainer email="[email protected]">Vincent Rabaud</maintainer>

diff --git a/tracetools_image_pipeline/CHANGELOG.rst b/tracetools_image_pipeline/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package tracetools_image_pipeline
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+5.0.2 (2024-05-27)
+------------------
+
 5.0.1 (2024-03-26)
 ------------------
 

diff --git a/tracetools_image_pipeline/package.xml b/tracetools_image_pipeline/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>tracetools_image_pipeline</name>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <description>
     LTTng tracing provider wrapper for image_pipeline ROS 2 meta-package.
   </description>