.pre-commit-config.yaml

@@ -26,11 +26,11 @@ repos:
     -   id: mixed-line-ending
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
     -   id: black
 -   repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
     -   id: flake8
 -   repo: https://github.com/cheshirekow/cmake-format-precommit

CMakeLists.txt

@@ -28,9 +28,12 @@ project(${PROJECT_NAME} ${PROJECT_ARGS})
 check_minimal_cxx_standard(14 ENFORCE)
 
 # Project dependencies
+set(PYTHON_COMPONENTS Interpreter Development NumPy)
 add_project_dependency(dynamic-graph 4.4.0 REQUIRED)
 add_project_dependency(eigenpy 2.7.10 REQUIRED)
-include(cmake/python.cmake) # TODO: overwriting eigenpy/python.cmake
+set(PYTHON_EXPORT_DEPENDENCY_MACROS
+    "list(APPEND PYTHON_COMPONENTS ${PYTHON_COMPONENTS})\n${PYTHON_EXPORT_DEPENDENCY_MACROS}"
+)
 if(BUILD_TESTING)
   find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 endif(BUILD_TESTING)
@@ -60,10 +63,18 @@ set(${PROJECT_NAME}_SOURCES
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES}
                                    ${${PROJECT_NAME}_HEADERS})
 target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
-target_link_libraries(
-  ${PROJECT_NAME} PUBLIC dynamic-graph::dynamic-graph
-                         Python${PYTHON_VERSION_MAJOR}::Python)
-target_link_boost_python(${PROJECT_NAME} PRIVATE)
+target_link_libraries(${PROJECT_NAME} PUBLIC dynamic-graph::dynamic-graph)
+modernize_target_link_libraries(
+  ${PROJECT_NAME}
+  SCOPE
+  PUBLIC
+  TARGETS
+  Python${PYTHON_VERSION_MAJOR}::Python
+  LIBRARIES
+  ${PYTHON_LIBRARIES}
+  INCLUDE_DIRS
+  ${PYTHON_INCLUDE_DIRS})
+target_link_boost_python(${PROJECT_NAME} PUBLIC)
 
 if(SUFFIX_SO_VERSION)
   set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})

cmake @ 08c2c18b

-Subproject commit a7567987b03fcad59e68aa9c4bf4580af7551144
+Subproject commit 08c2c18b9033c2f0a86b885b589f4fa63a163caf

package.xml

 <?xml version="1.0"?>
 <package format="3">
   <name>dynamic-graph-python</name>
-  <version>4.0.5</version>
-  <description>
-    Dynamic graph library Python bindings
-  </description>
+  <version>4.0.11</version>
+  <description>Dynamic graph library Python bindings</description>
   <maintainer email="guilhem.saurel@laas.fr">Guilhem Saurel</maintainer>
-  <license>BSD</license>
-
-  <url>http://github.com/stack-of-tasks/dynamic-graph-python</url>
   <author>Nicolas Mansard</author>
   <author>Olivier Stasse</author>
+  <license>BSD</license>
+
+  <url type="website">https://github.com/stack-of-tasks/dynamic-graph-python</url>
 
   <build_depend>git</build_depend>
   <build_depend>doxygen</build_depend>
-  <doc_depend>doxygen</doc_depend>
-  <!-- The following tags are recommended by REP-136 -->
+
+  <!-- The following tag is recommended by REP-136 -->
   <exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
-  <exec_depend condition="$ROS_VERSION == 2">ament_cmake</exec_depend>
-  <depend>dynamic-graph</depend>
+
+  <depend condition="$ROS_PYTHON_VERSION == 2">python</depend>
+  <depend condition="$ROS_PYTHON_VERSION == 3">python3</depend>
+  <depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</depend>
+  <depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</depend>
+  <depend>eigen</depend>
   <depend>boost</depend>
   <depend>eigenpy</depend>
+  <depend>dynamic-graph</depend>
 
   <buildtool_depend>cmake</buildtool_depend>
-
   <export>
     <build_type>cmake</build_type>
   </export>
-
 </package>

src/dynamic_graph/CMakeLists.txt

@@ -8,7 +8,6 @@ add_library(
                           pool-py.cc signal-base-py.cc signal-wrapper.cc)
 
 target_link_libraries(${PYTHON_MODULE} PUBLIC ${PROJECT_NAME} eigenpy::eigenpy)
-target_link_boost_python(${PYTHON_MODULE} PRIVATE)
 
 # Remove prefix lib
 set_target_properties(${PYTHON_MODULE} PROPERTIES PREFIX "")

tests/CMakeLists.txt

@@ -44,9 +44,6 @@ if(UNIX AND NOT APPLE)
 endif(UNIX AND NOT APPLE)
 
 target_link_libraries(${PYTHON_MODULE} PRIVATE ${LIBRARY_NAME} ${PROJECT_NAME})
-target_link_boost_python(${PYTHON_MODULE} PRIVATE)
-target_include_directories(${PYTHON_MODULE} SYSTEM
-                           PRIVATE ${PYTHON_INCLUDE_DIRS})
 
 # Test it
 add_python_unit_test("test-custom-entity" "tests/test_custom_entity.py" src