Setup fix and version-up (#131)

IntelLabs · Jul 30, 2024 · e5983ef · e5983ef
1 parent 2ddfede
commit e5983ef
Show file tree

Hide file tree

Showing 44 changed files with 53 additions and 49 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Version information (please complete the following information):**
 - OS: [e.g. Ubuntu 22.04]
-- Version [e.g. 1.1.0]
+- Version [e.g. 1.2.0]
 - ROS version: [e.g. humble]
 
 **Additional context**

diff --git a/docs/conf.py b/docs/conf.py
@@ -14,8 +14,8 @@
 copyright = f"{datetime.datetime.now()}, Intel"
 author = "Intel"
 
-version = '1.1.0'
-release = '1.1.0'
+version = '1.2.0'
+release = '1.2.0'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/examples/example_external_method/setup.py b/examples/example_external_method/setup.py
@@ -22,7 +22,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/examples/example_library/setup.py b/examples/example_library/setup.py
@@ -22,7 +22,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/examples/example_multi_robot/package.xml b/examples/example_multi_robot/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>example_multi_robot</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Example Multi Robot</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/examples/example_multi_robot/setup.py b/examples/example_multi_robot/setup.py
@@ -22,7 +22,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/examples/example_scenario_control/package.xml b/examples/example_scenario_control/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>example_scenario_control</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution Example for Scenario Control using RVIZ</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/examples/example_scenario_control/setup.py b/examples/example_scenario_control/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=[PACKAGE_NAME],
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/examples/example_simulation/package.xml b/examples/example_simulation/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>example_simulation</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution Example for Simulation</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/examples/example_simulation/setup.py b/examples/example_simulation/setup.py
@@ -22,7 +22,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=[PACKAGE_NAME],
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/libs/scenario_execution_floorplan_dsl/package.xml b/libs/scenario_execution_floorplan_dsl/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>scenario_execution_floorplan_dsl</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution library for Floorplan DSL</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/libs/scenario_execution_floorplan_dsl/setup.py b/libs/scenario_execution_floorplan_dsl/setup.py
@@ -21,7 +21,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/libs/scenario_execution_gazebo/package.xml b/libs/scenario_execution_gazebo/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>scenario_execution_gazebo</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution library for Gazebo</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/libs/scenario_execution_gazebo/setup.py b/libs/scenario_execution_gazebo/setup.py
@@ -21,7 +21,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/libs/scenario_execution_nav2/package.xml b/libs/scenario_execution_nav2/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>scenario_execution_nav2</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution library for Nav2</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/libs/scenario_execution_nav2/setup.py b/libs/scenario_execution_nav2/setup.py
@@ -20,7 +20,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/libs/scenario_execution_os/package.xml b/libs/scenario_execution_os/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>scenario_execution_os</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution library for OS interactions</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/libs/scenario_execution_os/setup.py b/libs/scenario_execution_os/setup.py
@@ -21,7 +21,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/libs/scenario_execution_pybullet/package.xml b/libs/scenario_execution_pybullet/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>scenario_execution_pybullet</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution library for PyBullet</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/libs/scenario_execution_pybullet/setup.py b/libs/scenario_execution_pybullet/setup.py
@@ -21,7 +21,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/scenario_coverage/package.xml b/scenario_coverage/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>scenario_coverage</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Robotics Scenario Execution Coverage Tools</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/scenario_coverage/setup.py b/scenario_coverage/setup.py
@@ -22,7 +22,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/scenario_execution/package.xml b/scenario_execution/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>scenario_execution</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/scenario_execution/setup.py b/scenario_execution/setup.py
@@ -23,13 +23,17 @@
 PACKAGE_NAME = 'scenario_execution'
 
 # read the contents of the README file
-this_directory = Path(__file__).resolve()
-root_directory = [p for p in this_directory.parents if p.parts[-1] == PACKAGE_NAME][0]
-long_description = Path.joinpath(root_directory, "README.md").read_text()
+this_directory = Path(__file__).parent
+try:
+    LONG_DESCRIPTION = (this_directory / "README.md").read_text()
+except: # pylint: disable=W0702
+    # in case we do colcon build --symlink-install, wo do not need the
+    # description
+    LONG_DESCRIPTION = ''
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(exclude=['test*']),
     data_files=[
         ('share/ament_index/resource_index/packages',
@@ -54,7 +58,7 @@
         "Issues": "https://github.com/IntelLabs/scenario_execution/issues",
     },
     description='Scenario Execution for Robotics',
-    long_description=long_description,
+    long_description=LONG_DESCRIPTION,
     long_description_content_type='text/markdown',
     license='Apache License 2.0',
     classifiers=[

diff --git a/scenario_execution_control/package.xml b/scenario_execution_control/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>scenario_execution_control</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution Control</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/scenario_execution_control/setup.py b/scenario_execution_control/setup.py
@@ -25,7 +25,7 @@
 PACKAGE_NAME = 'scenario_execution_control'
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=[PACKAGE_NAME],
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/scenario_execution_interfaces/package.xml b/scenario_execution_interfaces/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>scenario_execution_interfaces</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>ROS2 Interfaces for Scenario Execution</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/scenario_execution_ros/package.xml b/scenario_execution_ros/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>scenario_execution_ros</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Scenario Execution for ROS</description>
   <author email="scenario-execution@intel.com">Frederik Pasch</author>
   <author email="scenario-execution@intel.com">Florian Mirus</author>

diff --git a/scenario_execution_ros/setup.py b/scenario_execution_ros/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/simulation/gazebo/gazebo_static_camera/package.xml b/simulation/gazebo/gazebo_static_camera/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>gazebo_static_camera</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Spawn a static camera within a gazebo world</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/simulation/gazebo/gazebo_static_camera/setup.py b/simulation/gazebo/gazebo_static_camera/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/simulation/gazebo/gazebo_tf_publisher/package.xml b/simulation/gazebo/gazebo_tf_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>gazebo_tf_publisher</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>
     Node to publish ignition ground truth TF tree
   </description>

diff --git a/simulation/gazebo/tb4_sim_scenario/package.xml b/simulation/gazebo/tb4_sim_scenario/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>tb4_sim_scenario</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>TurtleBot 4 Simulation Scenario Execution</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/test/scenario_execution_gazebo_test/package.xml b/test/scenario_execution_gazebo_test/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>scenario_execution_gazebo_test</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Tests for Scenario Execution library for Gazebo</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/test/scenario_execution_gazebo_test/setup.py b/test/scenario_execution_gazebo_test/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/test/scenario_execution_ros_test/package.xml b/test/scenario_execution_ros_test/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>scenario_execution_ros_test</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Tests for Scenario Execution library for ROS</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/test/scenario_execution_ros_test/setup.py b/test/scenario_execution_ros_test/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/test/scenario_execution_test/package.xml b/test/scenario_execution_test/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>scenario_execution_test</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Tests for Scenario Execution library</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/test/scenario_execution_test/setup.py b/test/scenario_execution_test/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=find_namespace_packages(),
     data_files=[
         ('share/ament_index/resource_index/packages',

diff --git a/tools/message_modification/package.xml b/tools/message_modification/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>message_modification</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>Modification of message data</description>
   <author email="scenario-execution@intel.com">Intel Labs</author>
   <maintainer email="scenario-execution@intel.com">Intel Labs</maintainer>

diff --git a/tools/message_modification/setup.py b/tools/message_modification/setup.py
@@ -25,7 +25,7 @@
 PACKAGE_NAME = 'message_modification'
 setup(
     name=PACKAGE_NAME,
-    version='1.1.0',
+    version='1.2.0',
     packages=[PACKAGE_NAME],
     data_files=[
         ('share/ament_index/resource_index/packages', ['resource/' + PACKAGE_NAME]),