summaryrefslogtreecommitdiff
path: root/dev-ros/rosservice
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ros/rosservice')
-rw-r--r--dev-ros/rosservice/Manifest17
-rw-r--r--dev-ros/rosservice/files/yaml.patch62
-rw-r--r--dev-ros/rosservice/rosservice-1.13.1.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.2.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.4.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.5.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.6.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.14.2.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.14.3-r1.ebuild (renamed from dev-ros/rosservice/rosservice-1.13.0.ebuild)1
-rw-r--r--dev-ros/rosservice/rosservice-1.14.3.ebuild24
10 files changed, 65 insertions, 183 deletions
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 7fb2cc40b7d0..59a11cfa76fb 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/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 2657 BLAKE2B 16f9cc5cafd8306d06f64370bf334f68038e3b2e7feb6d48110cdddb12e00fb27b8f36492bd6ddca8eb0902da727d371266b3cd65440c82c3b9785c9823e1ad3 SHA512 3b71ccb1b3579bb16c86a0dbbc0708e7417461a91b31d1ab166ed38a3e75f117df355d91d9c1644d9c5da19c29b61ea208e6eed31ae6dfdd74bc6f057b0c1908
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosservice-1.13.0.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.1.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.2.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.4.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.5.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.6.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.14.2.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.14.3.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
+EBUILD rosservice-1.14.3-r1.ebuild 569 BLAKE2B 6f14e98a38f340d36f2103cf1741a82ba3045bdaa6eb43fd572a88089d230c0b5b12b4f55324483896cd2206aa2aa185dd86f7b0930a6de448b923f14ebe275d SHA512 34831de6a2ccbb552cd4a984d4c779d512db1839b2f9e7179b9dcad9e63aaf07bf4b1f68c5290ae5963ccccb621c8ad090ce0ef1c74432991b0b68cc42e541c1
EBUILD rosservice-9999.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/files/yaml.patch b/dev-ros/rosservice/files/yaml.patch
new file mode 100644
index 000000000000..f5dfcd3553fe
--- /dev/null
+++ b/dev-ros/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/tools/rosservice/src/rosservice/__init__.py b/tools/rosservice/src/rosservice/__init__.py
+index 6d58807a4..e6c41a73d 100644
+--- a/tools/rosservice/src/rosservice/__init__.py
++++ b/tools/rosservice/src/rosservice/__init__.py
+@@ -607,7 +607,7 @@ def _rosservice_cmd_call(argv):
+ # convert empty args to YAML-empty strings
+ if arg == '':
+ arg = "''"
+- service_args.append(yaml.load(arg))
++ service_args.append(yaml.safe_load(arg))
+ if not service_args and has_service_args(service_name, service_class=service_class):
+ if sys.stdin.isatty():
+ parser.error("Please specify service arguments")
+@@ -650,7 +650,7 @@ def _stdin_yaml_arg():
+ elif arg.strip() != '---':
+ buff = buff + arg
+ try:
+- loaded = yaml.load(buff.rstrip())
++ loaded = yaml.safe_load(buff.rstrip())
+ except Exception as e:
+ print("Invalid YAML: %s"%str(e), file=sys.stderr)
+ if loaded is not None:
diff --git a/dev-ros/rosservice/rosservice-1.13.1.ebuild b/dev-ros/rosservice/rosservice-1.13.1.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.1.ebuild
+++ /dev/null
@@ -1,24 +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=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.2.ebuild b/dev-ros/rosservice/rosservice-1.13.2.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.2.ebuild
+++ /dev/null
@@ -1,24 +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=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.4.ebuild b/dev-ros/rosservice/rosservice-1.13.4.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.4.ebuild
+++ /dev/null
@@ -1,24 +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=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.5.ebuild b/dev-ros/rosservice/rosservice-1.13.5.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.5.ebuild
+++ /dev/null
@@ -1,24 +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=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.6.ebuild b/dev-ros/rosservice/rosservice-1.13.6.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.6.ebuild
+++ /dev/null
@@ -1,24 +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=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.14.2.ebuild b/dev-ros/rosservice/rosservice-1.14.2.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.14.2.ebuild
+++ /dev/null
@@ -1,24 +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=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.0.ebuild b/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild
index 6372e787748f..ae68b95f7321 100644
--- a/dev-ros/rosservice/rosservice-1.13.0.ebuild
+++ b/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild
@@ -22,3 +22,4 @@ RDEPEND="
dev-ros/rosmsg[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosservice/rosservice-1.14.3.ebuild b/dev-ros/rosservice/rosservice-1.14.3.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.14.3.ebuild
+++ /dev/null
@@ -1,24 +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=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 21:09:29 +0000