diff options
author | Alexis Ballier <aballier@gentoo.org> | 2020-07-08 18:58:17 +0200 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2020-07-08 19:30:12 +0200 |
commit | d75656e23d3d57f5ffdbb2834f3f5cd42660a113 (patch) | |
tree | e43f5a15babe20159c70d1e64df1462a9b0ce162 /dev-ros/rosparam | |
parent | dev-ros/rosparam: bump eapi (diff) | |
download | gentoo-d75656e23d3d57f5ffdbb2834f3f5cd42660a113.tar.gz gentoo-d75656e23d3d57f5ffdbb2834f3f5cd42660a113.tar.bz2 gentoo-d75656e23d3d57f5ffdbb2834f3f5cd42660a113.zip |
dev-ros/rosparam: Remove old
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros/rosparam')
-rw-r--r-- | dev-ros/rosparam/Manifest | 2 | ||||
-rw-r--r-- | dev-ros/rosparam/files/yaml.patch | 22 | ||||
-rw-r--r-- | dev-ros/rosparam/files/yaml2.patch | 76 | ||||
-rw-r--r-- | dev-ros/rosparam/rosparam-1.14.3-r1.ebuild | 23 | ||||
-rw-r--r-- | dev-ros/rosparam/rosparam-1.15.4.ebuild | 22 |
5 files changed, 0 insertions, 145 deletions
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest index e7119a998e05..5d86517495e4 100644 --- a/dev-ros/rosparam/Manifest +++ b/dev-ros/rosparam/Manifest @@ -1,3 +1 @@ -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 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e diff --git a/dev-ros/rosparam/files/yaml.patch b/dev-ros/rosparam/files/yaml.patch deleted file mode 100644 index a4ed42758f13..000000000000 --- a/dev-ros/rosparam/files/yaml.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 481ad19689561052afde658ab0c54c91b0e5e04a Mon Sep 17 00:00:00 2001 -From: Maxime St-Pierre <me@maximest-pierre.me> -Date: Sun, 10 Nov 2019 06:27:40 -0500 -Subject: [PATCH] Fix #1833 change unsafe yaml.load to yaml.safe_load - ---- - tools/rosparam/src/rosparam/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py -index 3279ab97d..fd8b0569f 100644 ---- a/tools/rosparam/src/rosparam/__init__.py -+++ b/tools/rosparam/src/rosparam/__init__.py -@@ -368,7 +368,7 @@ def set_param(param, value, verbose=False): - :param param: parameter name, ``str`` - :param value: yaml-encoded value, ``str`` - """ -- set_param_raw(param, yaml.load(value), verbose=verbose) -+ set_param_raw(param, yaml.safe_load(value), verbose=verbose) - - def upload_params(ns, values, verbose=False): - """ diff --git a/dev-ros/rosparam/files/yaml2.patch b/dev-ros/rosparam/files/yaml2.patch deleted file mode 100644 index 1e36844ee38c..000000000000 --- a/dev-ros/rosparam/files/yaml2.patch +++ /dev/null @@ -1,76 +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/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py -index 41b806711..3279ab97d 100644 ---- a/tools/rosparam/src/rosparam/__init__.py -+++ b/tools/rosparam/src/rosparam/__init__.py -@@ -99,6 +99,7 @@ def construct_yaml_binary(loader, node): - # register the (de)serializers with pyyaml - yaml.add_representer(Binary,represent_xml_binary) - yaml.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary) -+yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary) - - def construct_angle_radians(loader, node): - """ -@@ -185,7 +186,7 @@ def load_str(str, filename, default_namespace=None, verbose=False): - """ - paramlist = [] - default_namespace = default_namespace or get_ros_namespace() -- for doc in yaml.load_all(str): -+ for doc in yaml.safe_load_all(str): - if NS in doc: - ns = ns_join(default_namespace, doc.get(NS, None)) - if verbose: -@@ -633,10 +634,14 @@ def yamlmain(argv=None): - - yaml.add_constructor(u'!radians', construct_angle_radians) - yaml.add_constructor(u'!degrees', construct_angle_degrees) -+yaml.SafeLoader.add_constructor(u'!radians', construct_angle_radians) -+yaml.SafeLoader.add_constructor(u'!degrees', construct_angle_degrees) - - # allow both !degrees 180, !radians 2*pi - pattern = re.compile(r'^deg\([^\)]*\)$') - yaml.add_implicit_resolver(u'!degrees', pattern, first="deg(") -+yaml.SafeLoader.add_implicit_resolver(u'!degrees', pattern, first="deg(") - pattern = re.compile(r'^rad\([^\)]*\)$') - yaml.add_implicit_resolver(u'!radians', pattern, first="rad(") -+yaml.SafeLoader.add_implicit_resolver(u'!radians', pattern, first="rad(") - diff --git a/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild b/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild deleted file mode 100644 index f0fe1a56c7cf..000000000000 --- a/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild +++ /dev/null @@ -1,23 +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=tools/${PN} -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) - -inherit ros-catkin - -DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/yaml2.patch" ) diff --git a/dev-ros/rosparam/rosparam-1.15.4.ebuild b/dev-ros/rosparam/rosparam-1.15.4.ebuild deleted file mode 100644 index 07a0e27680c2..000000000000 --- a/dev-ros/rosparam/rosparam-1.15.4.ebuild +++ /dev/null @@ -1,22 +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=tools/${PN} -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) - -inherit ros-catkin - -DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" |