From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-ros/test_rosservice/Manifest | 9 ++-- dev-ros/test_rosservice/files/yaml.patch | 62 ---------------------- .../test_rosservice-1.14.3-r1.ebuild | 31 ----------- .../test_rosservice/test_rosservice-1.15.4.ebuild | 30 ----------- .../test_rosservice/test_rosservice-1.15.8.ebuild | 29 ++++++++++ .../test_rosservice/test_rosservice-9999.ebuild | 17 +++--- 6 files changed, 40 insertions(+), 138 deletions(-) delete mode 100644 dev-ros/test_rosservice/files/yaml.patch delete mode 100644 dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild delete mode 100644 dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild create mode 100644 dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild (limited to 'dev-ros/test_rosservice') diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest index 6c1171139730..645ac9cfded6 100644 --- a/dev-ros/test_rosservice/Manifest +++ b/dev-ros/test_rosservice/Manifest @@ -1,7 +1,4 @@ -AUX yaml.patch 2877 BLAKE2B af708d68c805323af1e337789798c0318f49e7805cc3b6a52a895edff40fcb71a48c467c2e009c04f19e5ad75231f07e60d94cbfe2baa7a47a5d3d4cd78bd379 SHA512 cd3099ed89f475603151e290dbdddcc170bad5a01002ce51e5a44ceed0ab864480e8daf1eaaf3ab5fbf4fec550f6a0e91ec7dc6400b2fb227abc2bdadc3d64b2 -DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 -DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc -EBUILD test_rosservice-1.14.3-r1.ebuild 713 BLAKE2B faacb0d4583af8cde634e608012ed3d1d89a0cd912a54f3c8931a109d3e2ab06965c85c123e7bd92cc83a1a86bc222e5f6648e079dc9e2644ae19268bf96d2b5 SHA512 8604ba792e6a01dc7f085061889d278d48474da3ad21a2580f560ba771dafb3041afd2fe9a797c886bc01af8f04c7f4108f0c8387c25501d5ef3d1667813373a -EBUILD test_rosservice-1.15.4.ebuild 676 BLAKE2B ecff62b277ac96c0c94754d50a0b1640eebba549a86661f69aebf693ec39d5f66114a7f366ce1adeced5523aa3ffcb7b5d2a4d60fc7e6232f5b8dffa69680e73 SHA512 71453f94f88b1055698f09b4688ad25b5b61246eac009b7a7abed9f13ded12ab158029b16ec76e1900dd2dd8591744db95bdb40d54a20296a01cd04cf0b38f3a -EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc +DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9 +EBUILD test_rosservice-1.15.8.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd +EBUILD test_rosservice-9999.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45 diff --git a/dev-ros/test_rosservice/files/yaml.patch b/dev-ros/test_rosservice/files/yaml.patch deleted file mode 100644 index e8d089cbfd09..000000000000 --- a/dev-ros/test_rosservice/files/yaml.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001 -From: Martijn Buijs -Date: Tue, 23 Apr 2019 18:20:12 +0200 -Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning - (#1688) - -* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning - -* Change all usages of yaml.load to yaml.safe_load - -* Extend PyYAML's SafeLoader and use it with `yaml.load` - -Also added convenience functions for using this loader for reuse in -`roslaunch` - -* fix typo in rosparam.yaml_load_all - -* Modify Loader and SafeLoader in yaml module directly - -* Revert whitespace change - -* Revert unrelated change to import through global variable construction ---- - clients/rospy/src/rospy/client.py | 2 +- - .../test/test_roslib_message.py | 2 +- - .../client_verification/test_slave_api.py | 2 +- - test/test_rosparam/test/check_rosparam.py | 8 ++--- - .../check_rosparam_command_line_online.py | 2 +- - .../check_rosservice_command_line_online.py | 4 +-- - test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++---------- - tools/rosbag/src/rosbag/bag.py | 2 +- - tools/rosgraph/src/rosgraph/roslogging.py | 2 +- - tools/roslaunch/src/roslaunch/loader.py | 4 +-- - .../test/unit/test_roslaunch_dump_params.py | 4 +-- - tools/rosparam/src/rosparam/__init__.py | 7 ++++- - tools/rosservice/src/rosservice/__init__.py | 4 +-- - tools/rostopic/src/rostopic/__init__.py | 6 ++-- - tools/topic_tools/scripts/relay_field | 2 +- - 15 files changed, 43 insertions(+), 38 deletions(-) - -diff --git a/test/test_rosservice/test/check_rosservice_command_line_online.py b/test/test_rosservice/test/check_rosservice_command_line_online.py -index dc696adba..c75a52c15 100755 ---- a/test/test_rosservice/test/check_rosservice_command_line_online.py -+++ b/test/test_rosservice/test/check_rosservice_command_line_online.py -@@ -122,7 +122,7 @@ def test_rosservice(self): - output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0] - output = output.strip() - self.assert_(output, output) -- val = yaml.load(output)['header'] -+ val = yaml.safe_load(output)['header'] - self.assertEquals('', val['frame_id']) - self.assert_(val['seq'] >= 0) - self.assertEquals(0, val['stamp']['secs']) -@@ -131,7 +131,7 @@ def test_rosservice(self): - # test with auto headers - for v in ['{header: auto}', '{header: {stamp: now}}']: - output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0] -- val = yaml.load(output.strip())['header'] -+ val = yaml.safe_load(output.strip())['header'] - self.assertEquals('', val['frame_id']) - self.assert_(val['seq'] >= 0) - self.assert_(val['stamp']['secs'] >= int(t)) diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild deleted file mode 100644 index eb480554239e..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" -PATCHES=( "${FILESDIR}/yaml.patch" ) diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild deleted file mode 100644 index 507361ef503e..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild new file mode 100644 index 000000000000..7f51764ff341 --- /dev/null +++ b/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Unit tests for rospy" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + test? ( + dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] + dev-ros/rospy[${PYTHON_SINGLE_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + )" diff --git a/dev-ros/test_rosservice/test_rosservice-9999.ebuild b/dev-ros/test_rosservice/test_rosservice-9999.ebuild index e11c3e08c1d1..7f51764ff341 100644 --- a/dev-ros/test_rosservice/test_rosservice-9999.ebuild +++ b/dev-ros/test_rosservice/test_rosservice-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 ROS_REPO_URI="https://github.com/ros/ros_comm" KEYWORDS="~amd64 ~arm" @@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN} CATKIN_HAS_MESSAGES=yes CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" -PYTHON_COMPAT=( python2_7 ) - inherit ros-catkin DESCRIPTION="Unit tests for rospy" @@ -20,11 +18,12 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] + dev-ros/rospy[${PYTHON_SINGLE_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )" -- cgit v1.2.3