[simulation/gazebo_ros_pkgs] Update to 2.8.6

patch-ab: adapt patch-ad: python 3 compatibility Changelog for package gazebo_ros ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 2.8.6 (2019-12-26) ------------------ * ROS API: remove unhelpful error in GetWorldProperties call (`%747 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/747>`_) * Create reconfigure thread only if network enabled (`%919 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/919>`_) This thread was blocked in client.waitForExistance because the services it depends on are only created if `enable_ros_network` is true. This in turn blocked gazebo from being shut down. Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * spawn_model: Fix urlparse imports for Python 3 * spawn_model: Ensure that "model_xml" is a string, required for Python 3 * catkin_find gazebo plugin from bin folder. (`%993 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/993>`_) * [Windows][melodic-devel] more Windows build break fix (`%975 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/975>`_) * Fix CMake install error for Windows build. * conditionally include <sys/time.h> * provide Windows implemenation for setenv. (`%879 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/879>`_) * implement basic gazebo scripts to support launch file on Windows build. (`%880 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/880>`_) * Contributors: Kartik Mohta, Kevin Allen, Sean Yen, Shane Loretz 2.8.5 (2019-06-04) ------------------ * Add output arg to launch files, plus some small fixes (melodic) (`%907 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/907>`_) * Add output arg to empty_world * add output arg to elevator_world * add output arg to range_world * don't set use_sim_time in range_world Instead parse it to empty world, where it will be set. * add xml prolog to all launch files * Remove unnecessary arg in range_world.launch * use C++11 std sleep instead of usleep. (`%877 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/877>`_) * fix issue `%198 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/198>`_ (`%825 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/825>`_) * Lower minimum cmake version (`%817 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/817>`_) * Contributors: Matthijs van der Burgh, Paul Bovbel, Sean Yen [MSFT], Steven Peters Changelog for package gazebo_ros_control ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 2.8.6 (2019-12-26) ------------------ * restrict Windows header namespace. (`%1023 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/1023>`_) * [Windows][melodic-devel] more Windows build break fix (`%975 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/975>`_) * Fix CMake install error for Windows build. * conditionally include <sys/time.h> * Contributors: Sean Yen 2.8.5 (2019-06-04) ------------------ * use C++11 std sleep instead of usleep. (`%877 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/877>`_) * Lower minimum cmake version (`%817 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/817>`_) * Contributors: Paul Bovbel, Sean Yen [MSFT] Changelog for package gazebo_plugins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 2.8.6 (2019-12-26) ------------------ * gazebo_plugins: export plugin path in package.xml (`%923 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/923>`_) * Fix destructor of gazebo_ros_diff_drive.cpp (`%1021 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/1021>`_) Fix issue referenced in `%123 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/123>`_ where the destructor of ROS DiffDrive plugin causes gzserver to crash on model deletion. * [Windows][melodic-devel] more Windows build break fix (`%975 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/975>`_) * Fix CMake install error for Windows build. * conditionally include <sys/time.h> * Use ignition::math::Rand utility for portability. (`%878 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/878>`_) * Contributors: Ben Wolsieffer, RemiRigal, Sean Yen 2.8.5 (2019-06-04) ------------------ * use C++11 std sleep instead of usleep. (`%877 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/877>`_) * Lower minimum cmake version (`%817 <https://github.com/ros-simulation/gazebo_ros_pkgs/issues/817>`_) * Contributors: Paul Bovbel, Sean Yen [MSFT]
nim65s · Mar 5, 2020 · 065f4f9 · 065f4f9
1 parent f93ab5a
commit 065f4f9
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 8 deletions.
diff --git a/simulation/gazebo-ros-pkgs/Makefile b/simulation/gazebo-ros-pkgs/Makefile
@@ -5,7 +5,7 @@
 ROS_PKG=	gazebo_ros_pkgs
 PKGNAME=	$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 ROS_METAPKG=	yes
-ROS_VERSION=	2.8.4
+ROS_VERSION=	2.8.6
 ROS_REPO=       ros-simulation
 
 CATEGORIES=	simulation

diff --git a/simulation/gazebo-ros-pkgs/distinfo b/simulation/gazebo-ros-pkgs/distinfo
@@ -1,6 +1,7 @@
-SHA1 (ros/gazebo_ros_pkgs/2.8.4.tar.gz) = 9421bc3657a52278c10c0eecfb513e660572f1fe
-RMD160 (ros/gazebo_ros_pkgs/2.8.4.tar.gz) = b7249bfb91e0c4cb872f94268e0596b5fddddb10
-Size (ros/gazebo_ros_pkgs/2.8.4.tar.gz) = 1853755 bytes
+SHA1 (ros/gazebo_ros_pkgs/2.8.6.tar.gz) = 7516060f9d4bbc06faabc65c1a9c6d7ea8bf9969
+RMD160 (ros/gazebo_ros_pkgs/2.8.6.tar.gz) = e3bdff0f56ab427d36956111347c03ec10a7a2c5
+Size (ros/gazebo_ros_pkgs/2.8.6.tar.gz) = 1856580 bytes
 SHA1 (patch-aa) = 3a377f17761f171bf1b279985ee724e983d63356
-SHA1 (patch-ab) = 93328abee8d81067b9e56e311b2ea5def725fdf5
+SHA1 (patch-ab) = 30fb2bda40bf8af249159e7f4a5ffa476f741546
 SHA1 (patch-ac) = 5cd2acc030f2b8c6f154e17da3ed9ab2646396d7
+SHA1 (patch-ad) = 87f2e167c262090f79e358615484afd472db8297
diff --git a/simulation/gazebo-ros-pkgs/patches/patch-ab b/simulation/gazebo-ros-pkgs/patches/patch-ab
@@ -3,23 +3,23 @@ Don't require crazy cmake version for fun
 --- gazebo_ros/CMakeLists.txt~	2018-07-06 23:42:26.000000000 +0200
 +++ gazebo_ros/CMakeLists.txt	2018-09-14 14:50:08.621829979 +0200
 @@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.6.3)
+-cmake_minimum_required(VERSION 3.5.1)
 +cmake_minimum_required(VERSION 2.8)
  project(gazebo_ros)
 
  find_package(catkin REQUIRED COMPONENTS
 --- gazebo_ros_control/CMakeLists.txt~	2018-07-06 23:42:26.000000000 +0200
 +++ gazebo_ros_control/CMakeLists.txt	2018-09-14 14:51:22.218411276 +0200
 @@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.6.3)
+-cmake_minimum_required(VERSION 3.5.1)
 +cmake_minimum_required(VERSION 2.8)
  project(gazebo_ros_control)
 
  # Load catkin and all dependencies required for this package
 --- gazebo_plugins/CMakeLists.txt~	2018-07-06 23:42:26.000000000 +0200
 +++ gazebo_plugins/CMakeLists.txt	2018-09-14 14:50:50.006156863 +0200
 @@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.6.3)
+-cmake_minimum_required(VERSION 3.5.1)
 +cmake_minimum_required(VERSION 2.8)
  project(gazebo_plugins)
 

diff --git a/simulation/gazebo-ros-pkgs/patches/patch-ad b/simulation/gazebo-ros-pkgs/patches/patch-ad
@@ -0,0 +1,191 @@
+Python 3
+
+--- gazebo_plugins/scripts/set_wrench.py~	2019-12-26 22:57:00.000000000 +0100
++++ gazebo_plugins/scripts/set_wrench.py	2020-03-05 15:08:29.017347564 +0100
+@@ -107,7 +107,7 @@
+         time.sleep(0.001)
+
+ def print_usage(exit_code = 0):
+-    print '''Commands:
++    print('''Commands:
+     -update_rate <Hz> - update rate, default to 10 Hz
+     -timeout <seconds> - test timeout in seconds. default to 1 seconds
+     -x <x in meters>
+@@ -117,7 +117,7 @@
+     -P <pitch in radians>
+     -Y <yaw in radians>
+     -t set wrench topic name
+-'''
++''')
+
+ if __name__ == '__main__':
+     #print usage if not arguments
+--- gazebo_plugins/src/gazebo_plugins/gazebo_plugins_interface.py~	2019-12-26 22:57:00.000000000 +0100
++++ gazebo_plugins/src/gazebo_plugins/gazebo_plugins_interface.py	2020-03-05 15:10:22.945051818 +0100
+@@ -12,14 +12,14 @@
+ from geometry_msgs.msg import Pose, Point, Quaternion
+
+ def load_model(model_msg):
+-    print "waiting for service spawn_model"
++    print("waiting for service spawn_model")
+     rospy.wait_for_service('spawn_model')
+     try:
+         spawn_model= rospy.ServiceProxy('spawn_model', SpawnModel)
+         resp1 = spawn_model(model_msg)
+         return resp1.success
+-    except rospy.ServiceException, e:
+-        print "Service call failed: %s"%e
++    except rospy.ServiceException as e:
++        print("Service call failed: %s"%e)
+
+
+
+--- gazebo_plugins/test/bumper_test/test_bumper.py~	2019-12-26 22:57:00.000000000 +0100
++++ gazebo_plugins/test/bumper_test/test_bumper.py	2020-03-05 15:11:55.243622354 +0100
+@@ -87,12 +87,12 @@
+         # see if total wrench is close to 98.1N
+         if self.sample_count > 20:
+           if abs(self.fz_avg - 98.1) < 0.01:
+-            print "z force ",self.fz_avg
++            print("z force ",self.fz_avg)
+             self.success = True
+
+
+     def test_bumper(self):
+-        print "LNK\n"
++        print("LNK\n")
+         rospy.init_node(NAME, anonymous=True)
+         self.bumper_topic = rospy.get_param(self.bumper_topic_name,self.bumper_topic);
+         self.min_samples = rospy.get_param(self.min_samples_topic,self.min_samples);
+@@ -103,7 +103,7 @@
+             rospy.stdinfo("Waiting for test to start at time [%s]"% self.test_start_time)
+             time.sleep(0.1)
+
+-        print "subscribe"
++        print("subscribe")
+         rospy.Subscriber(self.bumper_topic, ContactsState, self.bumperStateInput)
+
+         start_t = time.time()
+@@ -114,7 +114,7 @@
+         self.assert_(self.success)
+
+ if __name__ == '__main__':
+-    print "Waiting for test to start at time "
++    print("Waiting for test to start at time ")
+     rostest.run(PKG, sys.argv[0], BumperTest, sys.argv) #, text_mode=True)
+
+
+--- gazebo_plugins/test/p3d_test/test_link_pose.py~	2019-12-26 22:57:00.000000000 +0100
++++ gazebo_plugins/test/p3d_test/test_link_pose.py	2020-03-05 15:13:32.083220965 +0100
+@@ -92,19 +92,19 @@
+         self.valid_pose = Pose()
+
+     def printLinkPose(self, p3d):
+-        print "P3D pose translan: " + "x: " + str(p3d.pose.pose.position.x)
+-        print "                   " + "y: " + str(p3d.pose.pose.position.y)
+-        print "                   " + "z: " + str(p3d.pose.pose.position.z)
+-        print "P3D pose rotation: " + "x: " + str(p3d.pose.pose.orientation.x)
+-        print "                   " + "y: " + str(p3d.pose.pose.orientation.y)
+-        print "                   " + "z: " + str(p3d.pose.pose.orientation.z)
+-        print "                   " + "w: " + str(p3d.pose.pose.orientation.w)
+-        print "P3D rate translan: " + "x: " + str(p3d.twist.twist.linear.x)
+-        print "                   " + "y: " + str(p3d.twist.twist.linear.y)
+-        print "                   " + "z: " + str(p3d.twist.twist.linear.z)
+-        print "P3D rate rotation: " + "x: " + str(p3d.twist.twist.angular.x)
+-        print "                   " + "y: " + str(p3d.twist.twist.angular.y)
+-        print "                   " + "z: " + str(p3d.twist.twist.angular.z)
++        print("P3D pose translan: " + "x: " + str(p3d.pose.pose.position.x))
++        print("                   " + "y: " + str(p3d.pose.pose.position.y))
++        print("                   " + "z: " + str(p3d.pose.pose.position.z))
++        print("P3D pose rotation: " + "x: " + str(p3d.pose.pose.orientation.x))
++        print("                   " + "y: " + str(p3d.pose.pose.orientation.y))
++        print("                   " + "z: " + str(p3d.pose.pose.orientation.z))
++        print("                   " + "w: " + str(p3d.pose.pose.orientation.w))
++        print("P3D rate translan: " + "x: " + str(p3d.twist.twist.linear.x))
++        print("                   " + "y: " + str(p3d.twist.twist.linear.y))
++        print("                   " + "z: " + str(p3d.twist.twist.linear.z))
++        print("P3D rate rotation: " + "x: " + str(p3d.twist.twist.angular.x))
++        print("                   " + "y: " + str(p3d.twist.twist.angular.y))
++        print("                   " + "z: " + str(p3d.twist.twist.angular.z))
+
+
+     def linkP3dInput(self, p3d):
+@@ -130,11 +130,11 @@
+
+     def checkPose(self):
+         # difference in pose
+-        print  "error: "   + str(self.link_sample_count) \
++        print("error: "   + str(self.link_sample_count) \
+                            + " error:" + str(self.link_error_total) \
+                            + " avg err:" + str(self.link_error_rms) \
+                            + " max err:" + str(self.link_error_max) \
+-                           + " count: " + str(self.link_sample_count)
++                           + " count: " + str(self.link_sample_count))
+         if self.link_sample_count >= self.min_link_samples:
+           if self.link_error_rms < self.tolerance:
+             if self.link_error_max < self.max_error:
+@@ -142,7 +142,7 @@
+
+
+     def test_link_pose(self):
+-        print "LNK\n"
++        print("LNK\n")
+         rospy.init_node(NAME, anonymous=True)
+         self.link_pose_topic = rospy.get_param(self.link_pose_topic_name,self.link_pose_topic);
+         self.valid_pose_topic = rospy.get_param(self.valid_pose_topic_name,self.valid_pose_topic);
+@@ -157,7 +157,7 @@
+             rospy.stdinfo("Waiting for test to start at time [%s]"% self.test_start_time)
+             time.sleep(0.1)
+
+-        print "subscribe"
++        print("subscribe")
+         rospy.Subscriber(self.link_pose_topic, Odometry, self.linkP3dInput)
+         rospy.Subscriber(self.valid_pose_topic, Odometry, self.validP3dInput)
+
+@@ -169,7 +169,7 @@
+         self.assert_(self.success)
+
+ if __name__ == '__main__':
+-    print "Waiting for test to start at time "
++    print("Waiting for test to start at time ")
+     rostest.run(PKG, sys.argv[0], LinkPoseTest, sys.argv) #, text_mode=True)
+
+
+--- gazebo_plugins/scripts/set_pose.py~	2019-12-26 22:57:00.000000000 +0100
++++ gazebo_plugins/scripts/set_pose.py	2020-03-05 15:09:24.160688444 +0100
+@@ -95,14 +95,14 @@
+     rospy.init_node(NAME, anonymous=True)
+
+   def setPoseService(self,pose_msg):
+-    print "waiting for service to set pose"
++    print("waiting for service to set pose")
+     rospy.wait_for_service(self.service_name);
+     try:
+       set_pose = rospy.ServiceProxy(self.service_name, SetPose)
+       resp1 = set_pose(pose_msg)
+       return resp1.success
+-    except rospy.ServiceException, e:
+-      print "service call failed: %s"%e
++    except rospy.ServiceException as e:
++      print("service call failed: %s"%e)
+
+   def waitTopicInput(self,p3d):
+     #self.p3d_p = [p3d.pose.pose.position.x, p3d.pose.pose.position.y, p3d.pose.pose.position.z]
+@@ -191,7 +191,7 @@
+           time.sleep(0.001)
+
+ def print_usage(exit_code = 0):
+-    print '''Commands:
++    print('''Commands:
+     -update_rate <Hz> - update rate, default to 10 Hz
+     -timeout <seconds> - test timeout in seconds. default to 1 seconds
+     -x <x in meters>
+@@ -204,7 +204,7 @@
+     -s set pose service name
+     -t set pose topic name
+     -p wait for this ros topic to be published first
+-'''
++''')
+
+ if __name__ == '__main__':
+     #print usage if not arguments