From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-ros/test_rospy/Manifest | 10 ++----- dev-ros/test_rospy/files/py3-2.patch | 40 -------------------------- dev-ros/test_rospy/files/py3.patch | 34 ---------------------- dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild | 34 ---------------------- dev-ros/test_rospy/test_rospy-1.15.4.ebuild | 33 --------------------- dev-ros/test_rospy/test_rospy-1.15.8.ebuild | 33 +++++++++++++++++++++ dev-ros/test_rospy/test_rospy-9999.ebuild | 24 ++++++++-------- 7 files changed, 48 insertions(+), 160 deletions(-) delete mode 100644 dev-ros/test_rospy/files/py3-2.patch delete mode 100644 dev-ros/test_rospy/files/py3.patch delete mode 100644 dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild delete mode 100644 dev-ros/test_rospy/test_rospy-1.15.4.ebuild create mode 100644 dev-ros/test_rospy/test_rospy-1.15.8.ebuild (limited to 'dev-ros/test_rospy') diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest index bef3d7bf4c91..906344117124 100644 --- a/dev-ros/test_rospy/Manifest +++ b/dev-ros/test_rospy/Manifest @@ -1,8 +1,4 @@ -AUX py3-2.patch 2077 BLAKE2B 76b3289eb5a54e085d8ed2b687b70f53c047625a9b4216f4972f62702604192996b89d0469a5d927515c510f00a032919b40b9cd76db8e9e011c61fc37c50e28 SHA512 8b554bbc2a38e3d64a88e05921a8e0ed8271126e86f85f04bf0903224304a25df07530614435247a861b193c0a02a2fd0280488696f9196e6f3bf88b8e89da9e -AUX py3.patch 1169 BLAKE2B e73fa2afdde33f8fc921118b4bc1189b5f976a2dcc56f498890e1925c698b975c38dec6c6be24f7269e0dce83d2630eaba89b9aa925c249037720d15928d7a9d SHA512 8b5475d81200b724701e3f7312646105295f99d084e324f8990cc494609166d77b834309e19f36452133379682f33174d923d8fbb05f95a75306147c3bac154d -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_rospy-1.14.3-r1.ebuild 902 BLAKE2B cc2d72203d6026d6c2fc9694bbbfe92f8af379ec3e0284b67684d30e432757834869710db15e0f546a8c817ccdd6f1cf6e145e68a4a2700ad694c6ca2a6d53bd SHA512 38ecb314607a3db7c111a889f885238a383208f89a8ee952356f44ece4669540f353e81be2d3c45fb3e5aef0c5b3a20c62f9c2db4316e91352caf601560998cb -EBUILD test_rospy-1.15.4.ebuild 840 BLAKE2B a2b7bd4ee2342d2c780d470d94291bd7557e5ed974d869cffd65c0b06c3bf8be0dbf0621c5866972893c987acaf8e57da71ec05c7a5cc51e8cec9267a82626f6 SHA512 807a14b5886ae3b3e1e1bb230e47db02f9023ccb4c0f47cc4685a39d8e21576dbc1870fa441a33fbf5f84b82aaa4b77833f3eb1c6f488061dad8915d68b6b36c -EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0 +DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9 +EBUILD test_rospy-1.15.8.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2 +EBUILD test_rospy-9999.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45 diff --git a/dev-ros/test_rospy/files/py3-2.patch b/dev-ros/test_rospy/files/py3-2.patch deleted file mode 100644 index 18ac23d16866..000000000000 --- a/dev-ros/test_rospy/files/py3-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001 -From: Dirk Thomas -Date: Tue, 6 Aug 2019 16:06:51 -0700 -Subject: [PATCH] more Python 3 compatibility (#1783) - ---- - test/test_rospy/test/unit/test_genmsg_py.py | 6 +-- - tools/rosgraph/src/rosgraph/roslogging.py | 2 +- - .../test/test_roslogging_user_logger.py | 8 +++- - tools/roslaunch/test/unit/test_xmlloader.py | 2 +- - tools/rosmsg/src/rosmsg/__init__.py | 2 +- - tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++---------- - .../test/test_rosmsgproto_command_line.py | 20 ++++---- - .../test_rostopic_command_line_offline.py | 44 +++++++++--------- - 8 files changed, 67 insertions(+), 63 deletions(-) - -diff --git a/test/test_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py -index 397b35cee..38be1648e 100644 ---- a/test/test_rospy/test/unit/test_genmsg_py.py -+++ b/test/test_rospy/test/unit/test_genmsg_py.py -@@ -95,8 +95,8 @@ def test_test_rospy_TestFixedArray(self): - self.assertEquals([0., 0., 0.], m.f64_3) - self.assertEquals([0], m.i8_1) - self.assertEquals([0, 0, 0], m.i8_3) -- self.assertEquals(chr(0), m.u8_1) -- self.assertEquals(chr(0)*3, m.u8_3) -+ self.assertEquals(chr(0).encode(), m.u8_1) -+ self.assertEquals((chr(0)*3).encode(), m.u8_3) - self.assertEquals([0], m.i32_1) - self.assertEquals([0, 0, 0], m.i32_3) - self.assertEquals([0], m.u32_1) -@@ -358,7 +358,7 @@ def test_std_msgs_MultiArray(self): - # test. the buff was with the uint8[] type consistency - buff = StringIO() - self.assertEquals(UInt8MultiArray(),UInt8MultiArray()) -- self.assertEquals('',UInt8MultiArray().data) -+ self.assertEquals(b'', UInt8MultiArray().data) - UInt8MultiArray().serialize(buff) - self.assertEquals(UInt8MultiArray(layout=MultiArrayLayout()),UInt8MultiArray()) - UInt8MultiArray(layout=MultiArrayLayout()).serialize(buff) diff --git a/dev-ros/test_rospy/files/py3.patch b/dev-ros/test_rospy/files/py3.patch deleted file mode 100644 index d7ed0f9c9606..000000000000 --- a/dev-ros/test_rospy/files/py3.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001 -From: Dirk Thomas -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_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py -index aebf95b22..397b35cee 100644 ---- a/test/test_rospy/test/unit/test_genmsg_py.py -+++ b/test/test_rospy/test/unit/test_genmsg_py.py -@@ -44,7 +44,13 @@ - import math - - from roslib.message import SerializationError -- -+ -+try: -+ long -+except NameError: -+ long = int -+ -+ - class TestGenmsgPy(unittest.TestCase): - - def test_PythonKeyword(self): diff --git a/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild deleted file mode 100644 index 2cf6f2717553..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.14.3-r1.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 -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -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[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" -PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" ) diff --git a/dev-ros/test_rospy/test_rospy-1.15.4.ebuild b/dev-ros/test_rospy/test_rospy-1.15.4.ebuild deleted file mode 100644 index a60ab86abc52..000000000000 --- a/dev-ros/test_rospy/test_rospy-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 -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -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[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.15.8.ebuild b/dev-ros/test_rospy/test_rospy-1.15.8.ebuild new file mode 100644 index 000000000000..5b429c7f5335 --- /dev/null +++ b/dev-ros/test_rospy/test_rospy-1.15.8.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 dev-ros/test_rosmaster" + +inherit ros-catkin + +DESCRIPTION="Unit tests for rospy" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] + test? ( + $(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]") + dev-ros/rosbuild + dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] + dev-ros/rospy[${PYTHON_SINGLE_USEDEP}] + dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]") + )" diff --git a/dev-ros/test_rospy/test_rospy-9999.ebuild b/dev-ros/test_rospy/test_rospy-9999.ebuild index a87a452ada24..5b429c7f5335 100644 --- a/dev-ros/test_rospy/test_rospy-9999.ebuild +++ b/dev-ros/test_rospy/test_rospy-9999.ebuild @@ -1,7 +1,7 @@ -# 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" @@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN} CATKIN_HAS_MESSAGES=yes CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" -PYTHON_COMPAT=( python2_7 ) - inherit ros-catkin DESCRIPTION="Unit tests for rospy" @@ -20,14 +18,16 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] test? ( - dev-python/numpy[${PYTHON_USEDEP}] + $(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]") dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] + dev-ros/rospy[${PYTHON_SINGLE_USEDEP}] + dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]") )" -- cgit v1.2.3