Noetic support

.travis.yml

@@ -5,7 +5,7 @@
 # https://github.com/ros-infrastructure/ros_buildfarm/blob/master/doc/jobs/prerelease_jobs.rst
 # while this doesn't require sudo we don't want to run within a Docker container
 sudo: true
-dist: bionic
+dist: focal
 language: python
 python:
   - "3.7"
@@ -24,10 +24,10 @@ install:
   # check python code code compatibility
   - docker run --rm -v$(pwd):/opt/code -ti ${OS_NAME}:${OS_CODE_NAME} bash -c 'set -x; set -e; apt update -qq; apt install -y -qq lsb-release libroslib-dev python 2>&1 >/dev/null; set +x; for file in /etc/catkin/profile.d/*.sh; do echo $file; source $file; done; set -x; apt install -y -qq python${ROS_PYTHON_VERSION} 2>&1 >/dev/null; lsb_release -a; python${ROS_PYTHON_VERSION} --version; set +x; cd /opt/code; EXIT_STATUS=0; for file in $(find -type f); do if [[ $file == *.py || \"$(head -1 $file)\" =~ \"python\" ]]; then echo \"Check if $file is compatible with python${ROS_PYTHON_VERSION}\"; set -x; python${ROS_PYTHON_VERSION} -m py_compile $file || EXIT_STATUS=1; set +x; fi; done; exit $EXIT_STATUS';
   # either install the latest released version of ros_buildfarm
-  - pip install ros_buildfarm
+  # - pip install ros_buildfarm
   # or checkout a specific branch
-  #- git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm
-  #- pip install /tmp/ros_buildfarm
+  - git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm
+  - pip install /tmp/ros_buildfarm
   # checkout catkin for catkin_test_results script
   - git clone https://github.com/ros/catkin /tmp/catkin
   # run devel job for a ROS repository with the same name as this repo
@@ -44,4 +44,3 @@ script:
   - /tmp/catkin/bin/catkin_test_results $JOB_PATH/ws/test_results --all
 notifications:
   email: false
-

README.md

@@ -1,2 +1,2 @@
 executive_smach_visualization [![Build Status](https://travis-ci.com/ros-visualization/executive_smach_visualization.svg?branch=melodic-devel)](https://travis-ci.com/ros-visualization/executive_smach_visualization)
-=====================================================================================================================================================================================================================
+=====================================================================================================================================================================================================================

smach_viewer/CMakeLists.txt

@@ -13,3 +13,9 @@ catkin_package(
 # Install targets
 install(PROGRAMS scripts/smach_viewer.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
+# Add rostest
+if(CATKIN_ENABLE_TESTING)
+  find_package(rostest REQUIRED)
+  add_rostest(test/test_smach_viewer.test)
+endif()

smach_viewer/package.xml

@@ -1,4 +1,4 @@
-<package>
+<package format="3">
   <name>smach_viewer</name>
   <version>3.0.1</version>
   <description>
@@ -25,14 +25,22 @@
   <build_depend>rostest</build_depend>
 
   <!-- Dependencies needed after this package is compiled. -->
-  <run_depend>smach_ros</run_depend>
-  <run_depend>smach_msgs</run_depend>
+  <exec_depend>smach_ros</exec_depend>
+  <exec_depend>smach_msgs</exec_depend>
   <!-- originally depends on xdot : https://github.com/jbohren/xdot/blob/2.0.1/package.xml#L25-L26 -->
-  <run_depend>wxpython</run_depend>
-  <run_depend>graphviz</run_depend>
-  <run_depend>python-gi</run_depend>
-  <run_depend>python-gi-cairo</run_depend>
-  <run_depend>gtk3</run_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">wxpython</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-xdot</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-wxgtk4.0</exec_depend>
+  <exec_depend>graphviz</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-gi</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-gi</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-qt5-bindings</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-qt5-bindings</exec_depend>
+  <exec_depend>python-gi-cairo</exec_depend>
+  <!-- <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-gi-cairo</exec_depend> -->
+  <exec_depend>gtk3</exec_depend>
 
   <export>