diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros/test_rosservice | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/test_rosservice')
-rw-r--r-- | dev-ros/test_rosservice/Manifest | 17 | ||||
-rw-r--r-- | dev-ros/test_rosservice/files/yaml.patch | 62 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild | 30 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild | 30 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild | 30 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild | 30 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild | 30 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild | 30 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild (renamed from dev-ros/test_rosservice/test_rosservice-1.13.0.ebuild) | 3 | ||||
-rw-r--r-- | dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild | 30 |
10 files changed, 66 insertions, 226 deletions
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest index a9d556ff5668..0b574b9acc4e 100644 --- a/dev-ros/test_rosservice/Manifest +++ b/dev-ros/test_rosservice/Manifest @@ -1,18 +1,5 @@ -DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b -DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7 -DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9 -DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce -DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3 -DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155 -DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777 +AUX yaml.patch 2877 BLAKE2B af708d68c805323af1e337789798c0318f49e7805cc3b6a52a895edff40fcb71a48c467c2e009c04f19e5ad75231f07e60d94cbfe2baa7a47a5d3d4cd78bd379 SHA512 cd3099ed89f475603151e290dbdddcc170bad5a01002ce51e5a44ceed0ab864480e8daf1eaaf3ab5fbf4fec550f6a0e91ec7dc6400b2fb227abc2bdadc3d64b2 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 -EBUILD test_rosservice-1.13.0.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d -EBUILD test_rosservice-1.13.1.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d -EBUILD test_rosservice-1.13.2.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d -EBUILD test_rosservice-1.13.4.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d -EBUILD test_rosservice-1.13.5.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d -EBUILD test_rosservice-1.13.6.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33 -EBUILD test_rosservice-1.14.2.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33 -EBUILD test_rosservice-1.14.3.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33 +EBUILD test_rosservice-1.14.3-r1.ebuild 713 BLAKE2B faacb0d4583af8cde634e608012ed3d1d89a0cd912a54f3c8931a109d3e2ab06965c85c123e7bd92cc83a1a86bc222e5f6648e079dc9e2644ae19268bf96d2b5 SHA512 8604ba792e6a01dc7f085061889d278d48474da3ad21a2580f560ba771dafb3041afd2fe9a797c886bc01af8f04c7f4108f0c8387c25501d5ef3d1667813373a EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc 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 new file mode 100644 index 000000000000..e8d089cbfd09 --- /dev/null +++ b/dev-ros/test_rosservice/files/yaml.patch @@ -0,0 +1,62 @@ +From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001 +From: Martijn Buijs <Martijn.buijs@gmail.com> +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.13.1.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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.13.2.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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.13.4.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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.13.5.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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.13.6.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild deleted file mode 100644 index e129fbdc99eb..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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.14.2.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild deleted file mode 100644 index e129fbdc99eb..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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.13.0.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild index 36347c5c5286..eb480554239e 100644 --- a/dev-ros/test_rosservice/test_rosservice-1.13.0.ebuild +++ b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -28,3 +28,4 @@ DEPEND="${RDEPEND} dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" ) diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild deleted file mode 100644 index e129fbdc99eb..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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}] - )" |