summaryrefslogtreecommitdiff
path: root/dev-ros/test_rospy
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros/test_rospy
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/test_rospy')
-rw-r--r--dev-ros/test_rospy/Manifest20
-rw-r--r--dev-ros/test_rospy/files/py3-2.patch40
-rw-r--r--dev-ros/test_rospy/files/py3.patch34
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.0.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.1.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.2.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.4.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.5.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.6.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.14.2.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild (renamed from dev-ros/test_rospy/test_rospy-1.12.7.ebuild)3
-rw-r--r--dev-ros/test_rospy/test_rospy-1.14.3.ebuild33
12 files changed, 79 insertions, 282 deletions
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index a7ab34d2dc1a..e2f5304a2be0 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,20 +1,6 @@
-DIST ros_comm-1.12.7.tar.gz 974568 BLAKE2B 8c3ece3a200de84fc9557468de87dddad145f3412655fe082a4efa3a0701c98646d098c72f3da0cf5cbbd901c52e70d0dc19c19485f11f564eeb2c089615a949 SHA512 7cfc5bf231e8e388102f192d46bd902a2b92d4620938379b362efd250c48f317f5ba6e0aee7398c841392f56c2b79f933ad5ec60eb69492add90fa2ca86a3a8f
-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 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
-EBUILD test_rospy-1.12.7.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.0.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.1.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.2.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.4.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.5.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.6.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
-EBUILD test_rospy-1.14.2.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
-EBUILD test_rospy-1.14.3.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
+EBUILD test_rospy-1.14.3-r1.ebuild 902 BLAKE2B cc2d72203d6026d6c2fc9694bbbfe92f8af379ec3e0284b67684d30e432757834869710db15e0f546a8c817ccdd6f1cf6e145e68a4a2700ad694c6ca2a6d53bd SHA512 38ecb314607a3db7c111a889f885238a383208f89a8ee952356f44ece4669540f353e81be2d3c45fb3e5aef0c5b3a20c62f9c2db4316e91352caf601560998cb
EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0
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
new file mode 100644
index 000000000000..18ac23d16866
--- /dev/null
+++ b/dev-ros/test_rospy/files/py3-2.patch
@@ -0,0 +1,40 @@
+From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+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
new file mode 100644
index 000000000000..d7ed0f9c9606
--- /dev/null
+++ b/dev-ros/test_rospy/files/py3.patch
@@ -0,0 +1,34 @@
+From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+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.13.0.ebuild b/dev-ros/test_rospy/test_rospy-1.13.0.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.13.1.ebuild b/dev-ros/test_rospy/test_rospy-1.13.1.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.13.2.ebuild b/dev-ros/test_rospy/test_rospy-1.13.2.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.13.4.ebuild b/dev-ros/test_rospy/test_rospy-1.13.4.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.13.5.ebuild b/dev-ros/test_rospy/test_rospy-1.13.5.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.13.6.ebuild b/dev-ros/test_rospy/test_rospy-1.13.6.ebuild
deleted file mode 100644
index c681d244b919..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.14.2.ebuild b/dev-ros/test_rospy/test_rospy-1.14.2.ebuild
deleted file mode 100644
index c681d244b919..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.12.7.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
index 2c8306c903de..2cf6f2717553 100644
--- a/dev-ros/test_rospy/test_rospy-1.12.7.ebuild
+++ b/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -31,3 +31,4 @@ DEPEND="${RDEPEND}
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.14.3.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3.ebuild
deleted file mode 100644
index c681d244b919..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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}]
- )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 04:33:03 +0000