diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/test_rosparam | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/test_rosparam')
-rw-r--r-- | dev-ros/test_rosparam/Manifest | 11 | ||||
-rw-r--r-- | dev-ros/test_rosparam/files/yaml.patch | 75 | ||||
-rw-r--r-- | dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild (renamed from dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild) | 10 | ||||
-rw-r--r-- | dev-ros/test_rosparam/test_rosparam-1.15.8.ebuild (renamed from dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild) | 18 | ||||
-rw-r--r-- | dev-ros/test_rosparam/test_rosparam-9999.ebuild | 17 |
5 files changed, 29 insertions, 102 deletions
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest index 80a4a8a83e80..e510a02cecbc 100644 --- a/dev-ros/test_rosparam/Manifest +++ b/dev-ros/test_rosparam/Manifest @@ -1,7 +1,6 @@ -AUX yaml.patch 3286 BLAKE2B ff83da906b271b957a63e89b26b7ab8b30abf8464635ac773a23d86a82d304ad09fcb9f78eba4f599655231ba59bb509fa89f146529f927742480eb4b777ca37 SHA512 85c1674cc7de77b08e8f632df97e772a325b5595086153690a289f8c2f33e9392ade4a17ab198969baf21f17f2e0414df4aefc2eb758866fa0da2ffe069f5ed0 -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_rosparam-1.14.3.ebuild 537 BLAKE2B ee1b480b906b2606b85c128dfe22e364187bb6866606623bb524e82d2be666bb59d5da501493dfe7fd0933a1c2037cc406802bd9fd2d020b2edce336b5a0dcb4 SHA512 7f6700c3584b8500757db238544252360b1426b7a1b863b15f33fde7a50f87e52f3915181df6db8ea80d7e8a353b1003bc0ca29c0689bfdf83ee2460349eb85e -EBUILD test_rosparam-1.15.4.ebuild 500 BLAKE2B c4e62babd10d7dda9da6769b5094c763759ff9afa3d05b5fc54b26c17bb19feca8d202de279541a38aa7625acff8815c95670ff2912b08f1094d764c6de1a282 SHA512 d5ae65e1cf92443d496a116e2829a4d5fbccc36980c47fad6c6879995714c772567b88f49b5c5a49e778ae3379d06f747621558eae6503ae87232713e5cb0148 -EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654 +DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e +DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9 +EBUILD test_rosparam-1.15.7.ebuild 511 BLAKE2B a324a281705bc80360f1c447f7191aae44dbef988217d13d3addcee32bd91b705aa947a53c778f9cf6e3e442cba7c6e64f8cf46100727be29f99f76bb8c0a8cf SHA512 f1d00655518e6aea60aef0100c357b6526d38354ce03b98c7baaf2d76c1d4cbb6a6c1f11877c1847bf6ecd61393f577c9330814b3876832736ee12f5db1325d5 +EBUILD test_rosparam-1.15.8.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380 +EBUILD test_rosparam-9999.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45 diff --git a/dev-ros/test_rosparam/files/yaml.patch b/dev-ros/test_rosparam/files/yaml.patch deleted file mode 100644 index 48f2c1d5bb19..000000000000 --- a/dev-ros/test_rosparam/files/yaml.patch +++ /dev/null @@ -1,75 +0,0 @@ -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_rosparam/test/check_rosparam.py b/test/test_rosparam/test/check_rosparam.py -index 52ed976b5..fe8c03fb4 100755 ---- a/test/test_rosparam/test/check_rosparam.py -+++ b/test/test_rosparam/test/check_rosparam.py -@@ -227,7 +227,7 @@ def test_rosparam_get(self): - with fakestdout() as b: - rosparam.yamlmain([cmd, 'get', "g1"]) - import yaml -- d = yaml.load(b.getvalue()) -+ d = yaml.safe_load(b.getvalue()) - self.assertEquals(d['float'], 10.0) - self.assertEquals(d['int'], 10.0) - self.assertEquals(d['string'], "g1-foo-value") -@@ -346,18 +346,18 @@ def test_rosparam_dump(self): - import yaml - with open(f_out) as b: - with open(f) as b2: -- self.assertEquals(yaml.load(b.read()), yaml.load(b2.read())) -+ self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read())) - - rosparam.yamlmain([cmd, 'dump', '-v', f_out, 'rosparam_dump']) - with open(f_out) as b: - with open(f) as b2: -- self.assertEquals(yaml.load(b.read()), yaml.load(b2.read())) -+ self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read())) - - # yaml file and std_out should be the same - with fakestdout() as b: - rosparam.yamlmain([cmd, 'dump']) - with open(f) as b2: -- self.assertEquals(yaml.load(b.getvalue())['rosparam_dump'], yaml.load(b2.read())) -+ self.assertEquals(yaml.safe_load(b.getvalue())['rosparam_dump'], yaml.safe_load(b2.read())) - - def test_fullusage(self): - import rosparam diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild index 5193bcbb1300..16022d629a45 100644 --- a/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild +++ b/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild @@ -1,15 +1,13 @@ # 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" ROS_SUBDIR=test/${PN} CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) - inherit ros-catkin DESCRIPTION="Unit tests for rosparam" @@ -19,8 +17,8 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-ros/rosparam[${PYTHON_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}] )" diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.8.ebuild index 9deec865fa13..712bc9fd620e 100644 --- a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild +++ b/dev-ros/test_rosparam/test_rosparam-1.15.8.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# 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" ROS_SUBDIR=test/${PN} CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) - inherit ros-catkin DESCRIPTION="Unit tests for rosparam" @@ -19,9 +17,13 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-ros/rosparam[${PYTHON_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}] )" -PATCHES=( "${FILESDIR}/yaml.patch" ) + +src_test() { + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + ros-catkin_src_test +} diff --git a/dev-ros/test_rosparam/test_rosparam-9999.ebuild b/dev-ros/test_rosparam/test_rosparam-9999.ebuild index 3a0084ca2436..712bc9fd620e 100644 --- a/dev-ros/test_rosparam/test_rosparam-9999.ebuild +++ b/dev-ros/test_rosparam/test_rosparam-9999.ebuild @@ -1,15 +1,13 @@ -# 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" ROS_SUBDIR=test/${PN} CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) - inherit ros-catkin DESCRIPTION="Unit tests for rosparam" @@ -19,8 +17,13 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-ros/rosparam[${PYTHON_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}] )" + +src_test() { + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + ros-catkin_src_test +} |