From a54b2db89eaac91b1b3f212709cdbbcc5ff4df4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Mon, 27 May 2024 18:37:23 +0200 Subject: [PATCH 1/3] Changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- camera_calibration/CHANGELOG.rst | 52 +++++++++++++++++++++++++ depth_image_proc/CHANGELOG.rst | 3 ++ image_pipeline/CHANGELOG.rst | 3 ++ image_proc/CHANGELOG.rst | 3 ++ image_publisher/CHANGELOG.rst | 3 ++ image_rotate/CHANGELOG.rst | 3 ++ image_view/CHANGELOG.rst | 3 ++ stereo_image_proc/CHANGELOG.rst | 3 ++ tracetools_image_pipeline/CHANGELOG.rst | 3 ++ 9 files changed, 76 insertions(+) diff --git a/camera_calibration/CHANGELOG.rst b/camera_calibration/CHANGELOG.rst index 2b17998b0..cb3a808c1 100644 --- 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 `_) (`#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
This + is an automatic backport of pull request `#979 `_ done by + [Mergify](https://mergify.com). + Co-authored-by: Földi Tamás +* Update for compatibility with image_pipeline 4.1.0 (`#968 `_) + This is a PR to fix: + - `#966 `_ + As noted in `#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 `_) + Fix for + - `#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 `_) diff --git a/depth_image_proc/CHANGELOG.rst b/depth_image_proc/CHANGELOG.rst index be4ce86a7..dd1f51082 100644 --- 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 `_) diff --git a/image_pipeline/CHANGELOG.rst b/image_pipeline/CHANGELOG.rst index 3934f4b8c..56a460e8e 100644 --- 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 `_) diff --git a/image_proc/CHANGELOG.rst b/image_proc/CHANGELOG.rst index 57068c078..d6950418b 100644 --- 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 `_) diff --git a/image_publisher/CHANGELOG.rst b/image_publisher/CHANGELOG.rst index 483b8b710..d067925ea 100644 --- 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 `_) diff --git a/image_rotate/CHANGELOG.rst b/image_rotate/CHANGELOG.rst index 253d9fc3d..4f9a13be7 100644 --- 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 `_) diff --git a/image_view/CHANGELOG.rst b/image_view/CHANGELOG.rst index ae487c0e9..1df6b5536 100644 --- 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 `_) diff --git a/stereo_image_proc/CHANGELOG.rst b/stereo_image_proc/CHANGELOG.rst index 40dd74037..56f637ed4 100644 --- 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 `_) diff --git a/tracetools_image_pipeline/CHANGELOG.rst b/tracetools_image_pipeline/CHANGELOG.rst index 04b3096f1..32d6c7675 100644 --- 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) ------------------ From d72a3d826ed2e28b5338c2187e5bf85e70766801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Mon, 27 May 2024 18:37:38 +0200 Subject: [PATCH 2/3] 5.0.2 --- camera_calibration/package.xml | 2 +- camera_calibration/setup.py | 2 +- depth_image_proc/package.xml | 2 +- image_pipeline/package.xml | 2 +- image_proc/package.xml | 2 +- image_publisher/package.xml | 2 +- image_rotate/package.xml | 2 +- image_view/package.xml | 2 +- stereo_image_proc/package.xml | 2 +- tracetools_image_pipeline/package.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/camera_calibration/package.xml b/camera_calibration/package.xml index 189154f7f..f012224a7 100644 --- a/camera_calibration/package.xml +++ b/camera_calibration/package.xml @@ -2,7 +2,7 @@ camera_calibration - 5.0.1 + 5.0.2 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 index 7e88c130b..9e977bb15 100644 --- 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/package.xml b/depth_image_proc/package.xml index 3946351c6..31dd905f8 100644 --- a/depth_image_proc/package.xml +++ b/depth_image_proc/package.xml @@ -2,7 +2,7 @@ depth_image_proc - 5.0.1 + 5.0.2 Contains components for processing depth images such as those diff --git a/image_pipeline/package.xml b/image_pipeline/package.xml index e24213ced..9ada7ad05 100644 --- a/image_pipeline/package.xml +++ b/image_pipeline/package.xml @@ -2,7 +2,7 @@ image_pipeline - 5.0.1 + 5.0.2 image_pipeline fills the gap between getting raw images from a camera driver and higher-level vision processing. Vincent Rabaud diff --git a/image_proc/package.xml b/image_proc/package.xml index 96b4b9d9a..49e9fd12b 100644 --- a/image_proc/package.xml +++ b/image_proc/package.xml @@ -2,7 +2,7 @@ image_proc - 5.0.1 + 5.0.2 Single image rectification and color processing. Vincent Rabaud diff --git a/image_publisher/package.xml b/image_publisher/package.xml index 9339658b4..866505829 100644 --- a/image_publisher/package.xml +++ b/image_publisher/package.xml @@ -2,7 +2,7 @@ image_publisher - 5.0.1 + 5.0.2 Contains a node publish an image stream from single image file diff --git a/image_rotate/package.xml b/image_rotate/package.xml index e5de6e7ac..097d56bc5 100644 --- a/image_rotate/package.xml +++ b/image_rotate/package.xml @@ -2,7 +2,7 @@ image_rotate - 5.0.1 + 5.0.2

Contains a node that rotates an image stream in a way that minimizes diff --git a/image_view/package.xml b/image_view/package.xml index 59c2a20ce..cafa7fb65 100644 --- a/image_view/package.xml +++ b/image_view/package.xml @@ -2,7 +2,7 @@ image_view - 5.0.1 + 5.0.2 A simple viewer for ROS image topics. Includes a specialized viewer for stereo + disparity images. diff --git a/stereo_image_proc/package.xml b/stereo_image_proc/package.xml index 4ef157fb2..422b29b1d 100644 --- a/stereo_image_proc/package.xml +++ b/stereo_image_proc/package.xml @@ -2,7 +2,7 @@ stereo_image_proc - 5.0.1 + 5.0.2 Stereo and single image rectification and disparity processing. Vincent Rabaud diff --git a/tracetools_image_pipeline/package.xml b/tracetools_image_pipeline/package.xml index 91cb7f16a..55bcbe31c 100644 --- a/tracetools_image_pipeline/package.xml +++ b/tracetools_image_pipeline/package.xml @@ -2,7 +2,7 @@ tracetools_image_pipeline - 5.0.1 + 5.0.2 LTTng tracing provider wrapper for image_pipeline ROS 2 meta-package. From 4c46e6827a36b1459e0c0f6f36bcae88dbb25504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Mon, 27 May 2024 22:08:33 +0200 Subject: [PATCH 3/3] Fixed jazzy CI (#991) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- .github/workflows/basic-build-ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/basic-build-ci.yaml b/.github/workflows/basic-build-ci.yaml index e308066fb..80206c4bd 100644 --- 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: |