commit: 0365af1878417f029fb50816a591c0a0cb61a662 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Wed Jul 8 17:07:42 2020 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Wed Jul 8 17:30:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0365af18
dev-ros/test_rosmaster: Remove old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-ros/test_rosmaster/Manifest | 2 - dev-ros/test_rosmaster/files/empty.patch | 12 ----- dev-ros/test_rosmaster/files/py3.patch | 54 ---------------------- dev-ros/test_rosmaster/files/yaml.patch | 53 --------------------- .../test_rosmaster/test_rosmaster-1.14.3-r2.ebuild | 34 -------------- .../test_rosmaster/test_rosmaster-1.15.4.ebuild | 33 ------------- 6 files changed, 188 deletions(-) diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest index e7119a998e0..5d86517495e 100644 --- a/dev-ros/test_rosmaster/Manifest +++ b/dev-ros/test_rosmaster/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/test_rosmaster/files/empty.patch b/dev-ros/test_rosmaster/files/empty.patch deleted file mode 100644 index 8ec371c917c..00000000000 --- a/dev-ros/test_rosmaster/files/empty.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: test_rosmaster/CMakeLists.txt -=================================================================== ---- test_rosmaster.orig/CMakeLists.txt -+++ test_rosmaster/CMakeLists.txt -@@ -10,6 +10,7 @@ if(CATKIN_ENABLE_TESTING) - String.msg - Arrays.msg - CompositeA.msg CompositeB.msg Composite.msg -+ Empty.msg - Embed.msg Floats.msg Simple.msg - RosmsgA.msg - RosmsgB.msg diff --git a/dev-ros/test_rosmaster/files/py3.patch b/dev-ros/test_rosmaster/files/py3.patch deleted file mode 100644 index 579d24f9f0b..00000000000 --- a/dev-ros/test_rosmaster/files/py3.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001 -From: Dirk Thomas <[email protected]> -Date: Tue, 6 Aug 2019 12:50:24 -0700 -Subject: [PATCH] more Python 3 compatibility (#1782) - ---- - test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +- - test/test_rosmaster/test/nodes/testMaster | 2 +- - test/test_rosmaster/test/nodes/testSlave | 2 +- - test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++- - tools/rosgraph/test/test_roslogging.py | 5 ++++- - tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++- - tools/roslaunch/src/roslaunch/depends.py | 8 ++++---- - 7 files changed, 22 insertions(+), 10 deletions(-) - -diff --git a/test/test_rosmaster/test/nodes/testAllCommonFlows b/test/test_rosmaster/test/nodes/testAllCommonFlows -index 4d3e053f8..a22ffb8d8 100755 ---- a/test/test_rosmaster/test/nodes/testAllCommonFlows -+++ b/test/test_rosmaster/test/nodes/testAllCommonFlows -@@ -12,7 +12,7 @@ import sys, os - BOOTSTRAP_VERSION = "0.1" - - # Read in ROS_ROOT --if not os.environ.has_key('ROS_ROOT'): -+if 'ROS_ROOT' not in os.environ: - print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the - location of your ROS install.\n""" - sys.exit(-1) -diff --git a/test/test_rosmaster/test/nodes/testMaster b/test/test_rosmaster/test/nodes/testMaster -index f3ec36be4..4dca1cb4a 100755 ---- a/test/test_rosmaster/test/nodes/testMaster -+++ b/test/test_rosmaster/test/nodes/testMaster -@@ -12,7 +12,7 @@ import sys, os - BOOTSTRAP_VERSION = "0.1" - - # Read in ROS_ROOT --if not os.environ.has_key('ROS_ROOT'): -+if 'ROS_ROOT' not in os.environ: - print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the - location of your ROS install.\n""" - sys.exit(-1) -diff --git a/test/test_rosmaster/test/nodes/testSlave b/test/test_rosmaster/test/nodes/testSlave -index cf70af08b..f8ea7cb47 100755 ---- a/test/test_rosmaster/test/nodes/testSlave -+++ b/test/test_rosmaster/test/nodes/testSlave -@@ -12,7 +12,7 @@ import sys, os - BOOTSTRAP_VERSION = "0.1" - - # Read in ROS_ROOT --if not os.environ.has_key('ROS_ROOT'): -+if 'ROS_ROOT' not in os.environ: - print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the - location of your ROS install.\n""" - sys.exit(-1) diff --git a/dev-ros/test_rosmaster/files/yaml.patch b/dev-ros/test_rosmaster/files/yaml.patch deleted file mode 100644 index 2eb9c086b7e..00000000000 --- a/dev-ros/test_rosmaster/files/yaml.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001 -From: Martijn Buijs <[email protected]> -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_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py -index 63d919c72..8614c045d 100755 ---- a/test/test_rosmaster/test/client_verification/test_slave_api.py -+++ b/test/test_rosmaster/test/client_verification/test_slave_api.py -@@ -106,7 +106,7 @@ def __init__(self, *args, **kwds): - def load_profile(self, filename): - import yaml - with open(filename) as f: -- d = yaml.load(f) -+ d = yaml.safe_load(f) - self.required_pubs = d.get('pubs', {}) - self.required_subs = d.get('subs', {}) - diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild deleted file mode 100644 index d09c050ee2a..00000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild +++ /dev/null @@ -1,34 +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 - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rosmaster" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] ) -" -PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/empty.patch" "${FILESDIR}/py3.patch" ) - -mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" ) - -src_install() { - ros-catkin_src_install - dodir /usr/share/${PN} - cp -a test "${ED}//usr/share/${PN}/" || die -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild deleted file mode 100644 index ea88573de82..00000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild +++ /dev/null @@ -1,33 +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 - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rosmaster" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] ) -" - -mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" ) - -src_install() { - ros-catkin_src_install - dodir /usr/share/${PN} - cp -a test "${ED}//usr/share/${PN}/" || die -}
