Migrate to package format 3

fzi-forschungszentrum-informatik · Sep 8, 2021 · 37a78e5 · 37a78e5
1 parent e4095e0
commit 37a78e5
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 29 deletions.
diff --git a/p3iv/package.xml b/p3iv/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv</name>
   <version>0.0.0</version>
   <description>Meta pkg for Probabilistic Prediction and Planning for Intelligent Vehicles Simulator</description>

diff --git a/p3iv_core/package.xml b/p3iv_core/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_core</name>
   <version>0.0.0</version>
   <description>Core functions of p3iv</description>
@@ -16,9 +16,13 @@
   <depend>p3iv_utils</depend>
   <depend>p3iv_types</depend>
 
-  <exec_depend>python3-termcolor</exec_depend>
-  <exec_depend>python3-yaml</exec_depend>
-  <exec_depend>python3-matplotlib</exec_depend>
   <exec_depend>lanelet2_python</exec_depend>
 
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-termcolor</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-termcolor</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
+
 </package>
diff --git a/p3iv_modules/package.xml b/p3iv_modules/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_modules</name>
   <version>0.0.0</version>
   <description>Modules of p3iv</description>
@@ -19,10 +19,13 @@
   <depend>p3iv_utils_polyvision</depend>
   <depend>p3iv_utils_probability</depend>
 
-  <exec_depend>python3-numpy</exec_depend>
-  <exec_depend>python3-shapely</exec_depend>
   <exec_depend>lanelet2_python</exec_depend>
 
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-shapely</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-scipy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-shapely</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
+
   <export>
     <rosdoc config="../rosdoc.yaml" />
   </export>

diff --git a/p3iv_types/package.xml b/p3iv_types/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_types</name>
   <version>0.0.0</version>
   <description>Type definitions of p3iv</description>
@@ -16,8 +16,10 @@
   <depend>pybind11-dev</depend>
   <depend>p3iv_utils_probability</depend>
 
-  <exec_depend>python3-numpy</exec_depend>
-  <exec_depend>python3-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
 
   <export>
     <rosdoc config="../rosdoc.yaml" />

diff --git a/p3iv_utils/package.xml b/p3iv_utils/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_utils</name>
   <version>0.0.0</version>
   <description>Utility functions of p3iv</description>
@@ -14,9 +14,14 @@
   <test_depend>gtest</test_depend>
 
   <exec_depend>lanelet2_python</exec_depend>
-  <exec_depend>python3-numpy</exec_depend>  
-  <exec_depend>python3-scipy</exec_depend>  
-  <exec_depend>python3-simplejson</exec_depend>  
+
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-scipy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-simplejson</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-scipy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-simplejson</exec_depend>
+
 
   <export>
     <rosdoc config="../rosdoc.yaml" />

diff --git a/p3iv_utils_polyline/package.xml b/p3iv_utils_polyline/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_utils_polyline</name>
   <version>0.0.0</version>
   <description>Feature interpolation among polyline segments</description>
@@ -16,8 +16,10 @@
   <depend>libgoogle-glog-dev</depend>
   <depend>pybind11-dev</depend>
 
-  <exec_depend>python3-numpy</exec_depend>
-  <exec_depend>python3-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
 
   <export>
     <rosdoc config="../rosdoc.yaml" />

diff --git a/p3iv_utils_polyvision/package.xml b/p3iv_utils_polyvision/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_utils_polyvision</name>
   <version>0.0.0</version>
   <description>Polygon intersection and offsetting operations for visible area calculations</description>
@@ -17,8 +17,10 @@
   <depend>cgal</depend>
   <depend>pybind11-dev</depend>
 
-  <exec_depend>python3-numpy</exec_depend>
-  <exec_depend>python3-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
 
   <export>
     <rosdoc config="../rosdoc.yaml" />

diff --git a/p3iv_utils_probability/package.xml b/p3iv_utils_probability/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_utils_probability</name>
   <version>0.0.0</version>
   <description>Definitions and functions for probability distributions</description>
@@ -17,9 +17,12 @@
   <depend>eigen</depend>
   <depend>libgoogle-glog-dev</depend>
 
-  <exec_depend>python3-scipy</exec_depend>
-  <exec_depend>python3-numpy</exec_depend>
-  <exec_depend>python3-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-scipy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-scipy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
 
   <export>
     <rosdoc config="../rosdoc.yaml" />

diff --git a/p3iv_visualization/package.xml b/p3iv_visualization/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>p3iv_visualization</name>
   <version>0.0.0</version>
   <description>Visualization tools for P3IV Simulator</description>
@@ -16,9 +16,10 @@
   <depend>lanelet2_core</depend>
   <depend>p3iv_utils</depend>
 
-  <exec_depend>python3-numpy</exec_depend>
-  <exec_depend>python3-matplotlib</exec_depend>
-
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
 
   <export>
     <rosdoc config="../rosdoc.yaml" />