Noetic devel

.Dockerfile

@@ -1,12 +1,12 @@
 # ROSPlan docker image
-FROM ros:melodic
+FROM ros:noetic
 
 SHELL ["/bin/bash", "-c"]
 WORKDIR /root/ws
 
 
 # install dependencies
-RUN apt update -qq && apt install python-catkin-tools git vim bash-completion -y -qq
+RUN apt update -qq && apt install python3-catkin-tools python3-osrf-pycommon git vim bash-completion -y -qq
 
 # Create WS
 RUN source /opt/ros/$ROS_DISTRO/setup.bash &&\
@@ -35,4 +35,4 @@ RUN catkin build --summarize --no-status
 
 # Prepare workspace for runtime. Set the prompt to be colored
 RUN echo -e "source /opt/ros/$ROS_DISTRO/setup.bash\nsource devel/setup.bash" >> ~/.bashrc &&\
-    sed -i s/^#force_color_prompt/force_color_prompt/g ~/.bashrc
+    sed -i s/^#force_color_prompt/force_color_prompt/g ~/.bashrc

.github/workflows/build.yml

@@ -7,20 +7,20 @@ on:
     branches-ignore: gh-pages
 
 env:
-  ROS_VERSION: melodic
+  ROS_VERSION: noetic
 jobs:
   build:
     runs-on: ubuntu-latest    
     container:
-      image: ros:melodic
+      image: ros:noetic
     steps:
       - name: Prepare docker
         run: |
           # Install newer git from ppa to prevent https://github.com/actions/checkout/issues/126
           APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true apt-key adv --keyserver keyserver.ubuntu.com --recv-key E1DD270288B4E6030699E45FA1715D88E1DF1F24 2>&1
           echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main" | tee /etc/apt/sources.list.d/git.list 
           sudo apt update -qq
-          sudo apt install python-catkin-tools git -y -qq
+          sudo apt install python3-catkin-tools python3-osrf-pycommon git -y -qq
       - name: Create ROS workspace
         run: |
           source /opt/ros/$ROS_VERSION/setup.bash

.github/workflows/test.yml

@@ -3,19 +3,19 @@ name: test
 on: [push, pull_request]
 
 env:
-  ROS_VERSION: melodic
+  ROS_VERSION: noetic
 jobs:
   build-and-test:
     runs-on: ubuntu-latest    
-    container: ros:melodic
+    container: ros:noetic
     steps:
       - name: Prepare docker
         run: |
           # Install newer git from ppa to prevent https://github.com/actions/checkout/issues/126
           APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true apt-key adv --keyserver keyserver.ubuntu.com --recv-key E1DD270288B4E6030699E45FA1715D88E1DF1F24 2>&1
           echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main" | tee /etc/apt/sources.list.d/git.list 
           sudo apt update -qq
-          sudo apt install python-catkin-tools git -y -qq
+          sudo apt install python3-catkin-tools python3-osrf-pycommon git -y -qq
       - name: Create ROS workspace
         run: |
           source /opt/ros/$ROS_VERSION/setup.bash

README.md

@@ -15,11 +15,11 @@ Several demos are available in the [rosplan_demos repository](https://github.com
 
 ## Installation
 
-ROSPlan supports kinetic and melodic ROS distributions and is developed under Ubuntu 16.04 / 18.04, being linux Ubuntu 18.04 + melodic the recommended setup.
+ROSPlan supports by default noetic ROS1 distribution and is developed under Ubuntu 20.04.
 
 Install dependencies:
 ```sh
-sudo apt install flex bison freeglut3-dev libbdd-dev python-catkin-tools ros-$ROS_DISTRO-tf2-bullet
+sudo apt install flex bison freeglut3-dev libbdd-dev python3-osrf-pycommon python3-catkin-tools
 ```
 
 Select or create a [catkin workspace](http://wiki.ros.org/catkin/Tutorials/create_a_workspace):

rosplan_action_interface/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from distutils.core import setup
 from catkin_pkg.python_setup import generate_distutils_setup

rosplan_action_interface/src/ActionInterfaceManager.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import rospy
 from rosplan_dispatch_msgs.msg import ActionDispatch, ActionFeedback

rosplan_action_interface/src/ActionlibActionInterface.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import rospy
 import importlib

rosplan_action_interface/src/BaseActionInterface.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import rospy
 import actionlib

rosplan_action_interface/src/FSMActionInterface.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import rospy, copy
 import actionlib

rosplan_action_interface/src/RPKnowledgeBaseLink.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from collections import defaultdict
 

rosplan_action_interface/src/ServiceActionInterface.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import rospy
 import importlib

rosplan_dependencies/CMakeLists.txt

@@ -89,7 +89,7 @@ if (LBITS EQUAL 64)
 else()
     SET (RDDL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 endif(LBITS EQUAL 64)
-SET (RDDL_CMAKE_CXX_FLAGS "${RDDL_CMAKE_CXX_FLAGS} -g -Wall -W -Wno-sign-compare -Wno-deprecated -ansi -pedantic -Werror -std=c++11 -O3 -DNDEBUG -fomit-frame-pointer")
+SET (RDDL_CMAKE_CXX_FLAGS "${RDDL_CMAKE_CXX_FLAGS} -g -Wall -W -Wno-sign-compare -Wno-deprecated -ansi -pedantic -Werror -std=c++11 -O3 -DNDEBUG -fomit-frame-pointer -Wno-error=deprecated-copy")
 
 # Lexer and parser
 find_package(BISON 3.0.4 REQUIRED)
@@ -346,4 +346,3 @@ endif(ROSPLAN_COMPILE_CHIMP)
 
 ########################################################################################################################
 ########################################################################################################################
-

rosplan_planning_system/scripts/direct_esterel_parser.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import rospy
 import genpy

rosplan_rqt/package.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <package>
-	<name>rosplan_rqt</name>
-	<version>0.0.0</version>
-	<description>The rosplan_rqt package</description>
-	<maintainer email="[email protected]">michael</maintainer>
-	<license>BSD</license>
-	<url type="website">https://github.com/KCL-Planning/ROSPlan</url>
+    <name>rosplan_rqt</name>
+    <version>0.0.0</version>
+    <description>The rosplan_rqt package</description>
+    <maintainer email="[email protected]">michael</maintainer>
+    <license>BSD</license>
+    <url type="website">https://github.com/KCL-Planning/ROSPlan</url>
 
-	<buildtool_depend>catkin</buildtool_depend>
+    <buildtool_depend>catkin</buildtool_depend>
 
-	<run_depend>python-rospkg</run_depend>
-	<run_depend>rqt_gui</run_depend>
-	<run_depend>rqt_gui_py</run_depend>
-	<run_depend>std_msgs</run_depend>
-	<run_depend>rqt_graph</run_depend>
+    <run_depend>python3-rospkg</run_depend>
+    <run_depend>rqt_gui</run_depend>
+    <run_depend>rqt_gui_py</run_depend>
+    <run_depend>std_msgs</run_depend>
+    <run_depend>rqt_graph</run_depend>
 
-	<export>
-		<rqt_gui plugin="${prefix}/plugin.xml"/>
-	</export>
+    <export>
+        <rqt_gui plugin="${prefix}/plugin.xml"/>
+    </export>
 </package>

rosplan_rqt/scripts/esterel_plan_viewer.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 

rosplan_rqt/src/rosplan_rqt/ROSPlanActionDispatcher.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import rospy
@@ -51,8 +51,8 @@ def __init__(self, plugin=None):
                     label_list.append(param.key)
                 self._parameter_type_list[op.name] = param_list
                 self._parameter_label_list[op.name] = label_list
-        except rospy.ServiceException, e:
-            print "Service call failed: %s"%e
+        except rospy.ServiceException as e:
+            rospy.logerr(f'Service call failed: {e}')
         self._handle_operator_name_changed(0)
 
         # connect components

rosplan_rqt/src/rosplan_rqt/ROSPlanDispatcher.py

@@ -1,12 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import rospy
 import rospkg
 import sys
 
 from itertools import product
-from string import join, split
 
 from std_msgs.msg import *
 from diagnostic_msgs.msg import KeyValue
@@ -61,8 +60,8 @@ def __init__(self, plugin=None):
                     label_list.append(param.key)
                 self._predicate_param_type_list[pred.name] = param_list
                 self._predicate_param_label_list[pred.name] = label_list
-        except rospy.ServiceException, e:
-            print "Service call failed: %s"%e
+        except rospy.ServiceException as e:
+            rospy.logerr(f'Service call failed: {e}')
 
         self._handle_goal_name_changed(0)
         self._handle_fact_name_changed(0)
@@ -75,8 +74,8 @@ def __init__(self, plugin=None):
             for typename in resp.types:
                 self.typeComboBox.addItem(typename)
                 self._type_list.append(typename)
-        except rospy.ServiceException, e:
-            print "Service call failed: %s"%e
+        except rospy.ServiceException as e:
+            rospy.logerr(f'Service call failed: {e}')
 
         # connect components
         self.planButton.clicked[bool].connect(self._handle_plan_clicked)
@@ -144,8 +143,8 @@ def refresh_model(self):
                 self._goal_list[goalText] = goal
                 if goalText in selected_list:
                     item.setSelected(True)
-        except rospy.ServiceException, e:
-            print "Service call failed: %s"%e
+        except rospy.ServiceException as e:
+            rospy.logerr(f'Service call failed: {e}')
         # facts and functions
         rospy.wait_for_service('rosplan_knowledge_base/state/propositions')
         selected_list = []
@@ -171,8 +170,8 @@ def refresh_model(self):
                 self._fact_list[attributeText] = attribute
                 if attributeText in selected_list:
                     item.setSelected(True)
-        except rospy.ServiceException, e:
-            print "Service call failed: %s"%e
+        except rospy.ServiceException as e:
+            rospy.logerr(f'Service call failed: {e}')
         # instances
         expanded_list = []
         root = self.instanceView.invisibleRootItem()
@@ -184,7 +183,7 @@ def refresh_model(self):
         self.instanceView.clear()
         for typename in self._type_list:
             instance_client = rospy.ServiceProxy('rosplan_knowledge_base/state/instances', GetInstanceService)
-            resp = instance_client(typename)
+            resp = instance_client(type_name=typename)
             item = QTreeWidgetItem(self.instanceView)
             item.setText(0, typename)
             for instancename in resp.instances:
@@ -274,13 +273,15 @@ def _handle_predicate_name_change(self, predName, combo):
         for param_type in self._predicate_param_type_list[predName]:
             try:
                 predicates_client = rospy.ServiceProxy('rosplan_knowledge_base/state/instances', GetInstanceService)
-                resp = predicates_client(param_type)
+                resp = predicates_client(type_name=param_type)
                 parameters.append(resp.instances)
-            except rospy.ServiceException, e:
-                print "Service call failed: %s"%e
+            except rospy.ServiceException as e:
+                rospy.logerr(f'Service call failed: {e}')
         for element in product(*parameters):
-            pred = join(element, ' ')
-            combo.addItem(pred)
+            pred = ''
+            for single_element in element:
+                pred += f'{single_element} '
+            combo.addItem(pred[:-1])
 
     def _handle_goal_name_changed(self, index):
         self._handle_predicate_name_change(self.goalNameComboBox.itemText(index), self.goalComboBox)
@@ -299,15 +300,15 @@ def _handle_add_button_clicked(self, updateType, predName, combo):
             knowledge.knowledge_type = KnowledgeItem.FACT
             knowledge.attribute_name = predName
             index = 0
-            for param in split(combo.currentText()):
+            for param in str.split(combo.currentText()):
                 pair = KeyValue()
                 pair.key = (self._predicate_param_label_list[knowledge.attribute_name])[index]
                 index = index + 1
                 pair.value = param
                 knowledge.values.append(pair)
             resp = update_client(updateType, knowledge)
-        except rospy.ServiceException, e:
-            print "Service call failed: %s"%e
+        except rospy.ServiceException as e:
+            rospy.logerr(f'Service call failed: {e}')
 
     def _handle_add_goal_clicked(self, data):
         self._handle_add_button_clicked(KnowledgeUpdateServiceRequest.ADD_GOAL, self.goalNameComboBox.currentText(), self.goalComboBox)
@@ -326,8 +327,8 @@ def _handle_remove_button_clicked(self, updateType, removeNameList, removeMsgLis
             try:
                 update_client = rospy.ServiceProxy('rosplan_knowledge_base/update', KnowledgeUpdateService)
                 resp = update_client(updateType, removeMsgList[item.text()])
-            except rospy.ServiceException, e:
-                print "Service call failed: %s"%e
+            except rospy.ServiceException as e:
+                rospy.logerr(f'Service call failed: {e}')
         self.refresh_model()
 
     def _handle_remove_goal_clicked(self, checked):
@@ -352,8 +353,8 @@ def _handle_add_instance_clicked(self, checked):
             knowledge.instance_type = self.typeComboBox.currentText()
             knowledge.instance_name = self.instanceNameEdit.text()
             resp = update_client(KnowledgeUpdateServiceRequest.ADD_KNOWLEDGE, knowledge)
-        except rospy.ServiceException, e:
-            print "Service call failed: %s"%e
+        except rospy.ServiceException as e:
+            rospy.logerr(f'Service call failed: {e}')
         self.refresh_model()
 
     """

rosplan_rqt/src/rosplan_rqt/ROSPlanEsterelPlanViewer.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import rospy

rosplan_rqt/src/rosplan_rqt/ROSPlanProblemViewer.py

@@ -1,12 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import rospy
 import rospkg
 import sys
 
 from itertools import product
-from string import join, split
 
 from std_msgs.msg import *
 from diagnostic_msgs.msg import KeyValue

rosplan_rqt/src/rosplan_rqt/graphUpdater.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import rospy