From 5fa5a278045d2c7240f59d3fdd910473f475ae56 Mon Sep 17 00:00:00 2001 From: iory Date: Mon, 13 Jun 2022 14:32:27 +0900 Subject: [PATCH 1/4] Revert "[tf_conversions_python3] Fixed wrong package name. tf -> tf_conversions" This reverts commit fb8ff7461d0f3103c2ee12de947a137367afc9da. --- tf_conversions_python3/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf_conversions_python3/CMakeLists.txt b/tf_conversions_python3/CMakeLists.txt index 1f39c45f..5eec1e11 100644 --- a/tf_conversions_python3/CMakeLists.txt +++ b/tf_conversions_python3/CMakeLists.txt @@ -57,6 +57,6 @@ endif() # RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) ## tf_pytyhon3 :: re-set PROJECT_NAME to tf -set(PROJECT_NAME tf_conversions) +set(PROJECT_NAME tf) ## tf_pytyhon3 :: re-set CATKIN_PACKAGE_PYTHON_DESTINATION with PROJECT_NAME as tf set(CATKIN_PACKAGE_PYTHON_DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/${PROJECT_NAME}) From 39889a3e85ec1a4005d66d0d601ea5992be02139 Mon Sep 17 00:00:00 2001 From: iory Date: Mon, 13 Jun 2022 14:32:36 +0900 Subject: [PATCH 2/4] Revert "[tf_conversions_python3] Set python3" This reverts commit 1388592e3a8c109f3fc06ea5f8ed1e61b229c88f. --- tf_conversions_python3/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tf_conversions_python3/CMakeLists.txt b/tf_conversions_python3/CMakeLists.txt index 5eec1e11..d0677128 100644 --- a/tf_conversions_python3/CMakeLists.txt +++ b/tf_conversions_python3/CMakeLists.txt @@ -5,10 +5,6 @@ find_package(orocos_kdl REQUIRED) find_package(catkin REQUIRED geometry_msgs kdl_conversions tf) find_package(Eigen3 REQUIRED) -set(Python_ADDITIONAL_VERSIONS 3.6;3.7;3.8) ## https://stackoverflow.com/questions/29245558/how-to-link-with-python3-libs-with-cmake -find_package(PythonInterp 3 REQUIRED) ## tf_python3 :: use Python3 by default -find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") - catkin_python_setup() catkin_package( From 97318da29957a3e46e2c7e1405dcd7cefcf517fa Mon Sep 17 00:00:00 2001 From: iory Date: Mon, 13 Jun 2022 14:33:35 +0900 Subject: [PATCH 3/4] Revert "Rename tf_conversions to tf_conversions_python3 for melodic python3 user" --- .../CHANGELOG.rst | 0 .../CMakeLists.txt | 19 +++++++------------ .../conf.py | 0 .../include/tf_conversions/mainpage.dox | 0 .../include/tf_conversions/tf_eigen.h | 0 .../include/tf_conversions/tf_kdl.h | 0 .../index.rst | 0 .../package.xml | 2 +- .../rosdoc.yaml | 0 .../setup.py | 0 .../src/tf_conversions/__init__.py | 0 .../src/tf_conversions/posemath.py | 0 .../src/tf_eigen.cpp | 0 .../src/tf_kdl.cpp | 0 .../test/posemath.py | 0 .../test/test_eigen_tf.cpp | 0 .../test/test_kdl_tf.cpp | 0 17 files changed, 8 insertions(+), 13 deletions(-) rename {tf_conversions_python3 => tf_conversions}/CHANGELOG.rst (100%) rename {tf_conversions_python3 => tf_conversions}/CMakeLists.txt (64%) rename {tf_conversions_python3 => tf_conversions}/conf.py (100%) rename {tf_conversions_python3 => tf_conversions}/include/tf_conversions/mainpage.dox (100%) rename {tf_conversions_python3 => tf_conversions}/include/tf_conversions/tf_eigen.h (100%) rename {tf_conversions_python3 => tf_conversions}/include/tf_conversions/tf_kdl.h (100%) rename {tf_conversions_python3 => tf_conversions}/index.rst (100%) rename {tf_conversions_python3 => tf_conversions}/package.xml (95%) rename {tf_conversions_python3 => tf_conversions}/rosdoc.yaml (100%) rename {tf_conversions_python3 => tf_conversions}/setup.py (100%) rename {tf_conversions_python3 => tf_conversions}/src/tf_conversions/__init__.py (100%) rename {tf_conversions_python3 => tf_conversions}/src/tf_conversions/posemath.py (100%) rename {tf_conversions_python3 => tf_conversions}/src/tf_eigen.cpp (100%) rename {tf_conversions_python3 => tf_conversions}/src/tf_kdl.cpp (100%) rename {tf_conversions_python3 => tf_conversions}/test/posemath.py (100%) rename {tf_conversions_python3 => tf_conversions}/test/test_eigen_tf.cpp (100%) rename {tf_conversions_python3 => tf_conversions}/test/test_kdl_tf.cpp (100%) diff --git a/tf_conversions_python3/CHANGELOG.rst b/tf_conversions/CHANGELOG.rst similarity index 100% rename from tf_conversions_python3/CHANGELOG.rst rename to tf_conversions/CHANGELOG.rst diff --git a/tf_conversions_python3/CMakeLists.txt b/tf_conversions/CMakeLists.txt similarity index 64% rename from tf_conversions_python3/CMakeLists.txt rename to tf_conversions/CMakeLists.txt index d0677128..eb2c1c25 100644 --- a/tf_conversions_python3/CMakeLists.txt +++ b/tf_conversions/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0.2) -project(tf_conversions_python3) +project(tf_conversions) find_package(orocos_kdl REQUIRED) find_package(catkin REQUIRED geometry_msgs kdl_conversions tf) @@ -43,16 +43,11 @@ catkin_add_nosetests(test/posemath.py) endif() -## tf_conversions_python3 :: we can share include, library and executable directories. -# install(DIRECTORY include/${PROJECT_NAME}/ -# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) -# install(TARGETS ${PROJECT_NAME} -# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) -## tf_pytyhon3 :: re-set PROJECT_NAME to tf -set(PROJECT_NAME tf) -## tf_pytyhon3 :: re-set CATKIN_PACKAGE_PYTHON_DESTINATION with PROJECT_NAME as tf -set(CATKIN_PACKAGE_PYTHON_DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/${PROJECT_NAME}) +install(TARGETS ${PROJECT_NAME} + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) diff --git a/tf_conversions_python3/conf.py b/tf_conversions/conf.py similarity index 100% rename from tf_conversions_python3/conf.py rename to tf_conversions/conf.py diff --git a/tf_conversions_python3/include/tf_conversions/mainpage.dox b/tf_conversions/include/tf_conversions/mainpage.dox similarity index 100% rename from tf_conversions_python3/include/tf_conversions/mainpage.dox rename to tf_conversions/include/tf_conversions/mainpage.dox diff --git a/tf_conversions_python3/include/tf_conversions/tf_eigen.h b/tf_conversions/include/tf_conversions/tf_eigen.h similarity index 100% rename from tf_conversions_python3/include/tf_conversions/tf_eigen.h rename to tf_conversions/include/tf_conversions/tf_eigen.h diff --git a/tf_conversions_python3/include/tf_conversions/tf_kdl.h b/tf_conversions/include/tf_conversions/tf_kdl.h similarity index 100% rename from tf_conversions_python3/include/tf_conversions/tf_kdl.h rename to tf_conversions/include/tf_conversions/tf_kdl.h diff --git a/tf_conversions_python3/index.rst b/tf_conversions/index.rst similarity index 100% rename from tf_conversions_python3/index.rst rename to tf_conversions/index.rst diff --git a/tf_conversions_python3/package.xml b/tf_conversions/package.xml similarity index 95% rename from tf_conversions_python3/package.xml rename to tf_conversions/package.xml index d590286e..8c142547 100644 --- a/tf_conversions_python3/package.xml +++ b/tf_conversions/package.xml @@ -1,6 +1,7 @@ tf_conversions_python3 1.12.3 + This package contains a set of conversion functions to convert @@ -20,7 +21,6 @@ the next major release cycle (see roadmap). http://www.ros.org/wiki/tf_conversions catkin - python3-catkin-pkg-modules eigen geometry_msgs diff --git a/tf_conversions_python3/rosdoc.yaml b/tf_conversions/rosdoc.yaml similarity index 100% rename from tf_conversions_python3/rosdoc.yaml rename to tf_conversions/rosdoc.yaml diff --git a/tf_conversions_python3/setup.py b/tf_conversions/setup.py similarity index 100% rename from tf_conversions_python3/setup.py rename to tf_conversions/setup.py diff --git a/tf_conversions_python3/src/tf_conversions/__init__.py b/tf_conversions/src/tf_conversions/__init__.py similarity index 100% rename from tf_conversions_python3/src/tf_conversions/__init__.py rename to tf_conversions/src/tf_conversions/__init__.py diff --git a/tf_conversions_python3/src/tf_conversions/posemath.py b/tf_conversions/src/tf_conversions/posemath.py similarity index 100% rename from tf_conversions_python3/src/tf_conversions/posemath.py rename to tf_conversions/src/tf_conversions/posemath.py diff --git a/tf_conversions_python3/src/tf_eigen.cpp b/tf_conversions/src/tf_eigen.cpp similarity index 100% rename from tf_conversions_python3/src/tf_eigen.cpp rename to tf_conversions/src/tf_eigen.cpp diff --git a/tf_conversions_python3/src/tf_kdl.cpp b/tf_conversions/src/tf_kdl.cpp similarity index 100% rename from tf_conversions_python3/src/tf_kdl.cpp rename to tf_conversions/src/tf_kdl.cpp diff --git a/tf_conversions_python3/test/posemath.py b/tf_conversions/test/posemath.py similarity index 100% rename from tf_conversions_python3/test/posemath.py rename to tf_conversions/test/posemath.py diff --git a/tf_conversions_python3/test/test_eigen_tf.cpp b/tf_conversions/test/test_eigen_tf.cpp similarity index 100% rename from tf_conversions_python3/test/test_eigen_tf.cpp rename to tf_conversions/test/test_eigen_tf.cpp diff --git a/tf_conversions_python3/test/test_kdl_tf.cpp b/tf_conversions/test/test_kdl_tf.cpp similarity index 100% rename from tf_conversions_python3/test/test_kdl_tf.cpp rename to tf_conversions/test/test_kdl_tf.cpp From 08735c3a86df9f3e5a7a7a94c50587d8c8145ab1 Mon Sep 17 00:00:00 2001 From: iory Date: Mon, 13 Jun 2022 14:34:51 +0900 Subject: [PATCH 4/4] 1.12.4 --- eigen_conversions/package.xml | 2 +- geometry/package.xml | 2 +- kdl_conversions/package.xml | 2 +- tf_conversions/package.xml | 2 +- tf_python3/package.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eigen_conversions/package.xml b/eigen_conversions/package.xml index 364f0985..7fb687bd 100644 --- a/eigen_conversions/package.xml +++ b/eigen_conversions/package.xml @@ -1,6 +1,6 @@ eigen_conversions - 1.12.3 + 1.12.4 Conversion functions between: diff --git a/geometry/package.xml b/geometry/package.xml index 1779276f..173f38fb 100644 --- a/geometry/package.xml +++ b/geometry/package.xml @@ -1,6 +1,6 @@ geometry - 1.12.3 + 1.12.4

A metapackage for geometry library suite.

Migration: Since ROS Hydro, tf has been "deprecated" in favor of tf2. tf2 is an iteration on tf providing generally the same feature set more efficiently. As well as adding a few new features.
As tf2 is a major change the tf API has been maintained in its current form. Since tf2 has a superset of the tf features with a subset of the dependencies the tf implementation has been removed and replaced with calls to tf2 under the hood. This will mean that all users will be compatible with tf2. It is recommended for new work to use tf2 directly as it has a cleaner interface. However tf will continue to be supported for through at least J Turtle. diff --git a/kdl_conversions/package.xml b/kdl_conversions/package.xml index ec283aaf..cc02354a 100644 --- a/kdl_conversions/package.xml +++ b/kdl_conversions/package.xml @@ -1,6 +1,6 @@ kdl_conversions - 1.12.3 + 1.12.4 Conversion functions between KDL and geometry_msgs types. diff --git a/tf_conversions/package.xml b/tf_conversions/package.xml index 8c142547..e0a77ce4 100644 --- a/tf_conversions/package.xml +++ b/tf_conversions/package.xml @@ -1,6 +1,6 @@ tf_conversions_python3 - 1.12.3 + 1.12.4 diff --git a/tf_python3/package.xml b/tf_python3/package.xml index 8ed2b975..95fd4ffe 100644 --- a/tf_python3/package.xml +++ b/tf_python3/package.xml @@ -1,6 +1,6 @@ tf_python3 - 1.12.3 + 1.12.4 tf is a package that lets the user keep track of multiple coordinate