diff options
156 files changed, 1370 insertions, 2145 deletions
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild index d585d58e2726..428fbaafe4df 100644 --- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild +++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild @@ -47,6 +47,7 @@ use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) IUSE+=" ${use_softmmu_targets} ${use_user_targets}" +RESTRICT="!test? ( test )" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. REQUIRED_USE="${PYTHON_REQUIRED_USE} diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild index d0bec4380dbc..e8f34c66cab1 100644 --- a/app-emulation/qemu/qemu-4.1.0.ebuild +++ b/app-emulation/qemu/qemu-4.1.0.ebuild @@ -53,6 +53,7 @@ use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) IUSE+=" ${use_softmmu_targets} ${use_user_targets}" +RESTRICT="!test? ( test )" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. REQUIRED_USE="${PYTHON_REQUIRED_USE} diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index d024b5020691..3bf1f06000f9 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -53,6 +53,7 @@ use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) IUSE+=" ${use_softmmu_targets} ${use_user_targets}" +RESTRICT="!test? ( test )" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. REQUIRED_USE="${PYTHON_REQUIRED_USE} diff --git a/app-office/gnucash/gnucash-3.6.ebuild b/app-office/gnucash/gnucash-3.6.ebuild index ec42d91eaae7..14c67d5d77f7 100644 --- a/app-office/gnucash/gnucash-3.6.ebuild +++ b/app-office/gnucash/gnucash-3.6.ebuild @@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite test" +RESTRICT="!test? ( test )" REQUIRED_USE=" chipcard? ( aqbanking ) python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/app-office/gnucash/gnucash-3.7.ebuild b/app-office/gnucash/gnucash-3.7.ebuild index a78ec12c8fc2..6700f7ef1872 100644 --- a/app-office/gnucash/gnucash-3.7.ebuild +++ b/app-office/gnucash/gnucash-3.7.ebuild @@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 smartcard sqlite test" +RESTRICT="!test? ( test )" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) smartcard? ( aqbanking )" diff --git a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild index 35ceeee6bfbf..4ad56b304bb4 100644 --- a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild @@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) diff --git a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild index c7fc98d14c9f..bfcd63258985 100644 --- a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild @@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild index 9834ebf899b8..7a8ee9560f67 100644 --- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild @@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 7b8edda7c8f9..52c11f8e8ca0 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) diff --git a/dev-java/icedtea/icedtea-3.13.0.ebuild b/dev-java/icedtea/icedtea-3.13.0.ebuild index 175031fa754f..b68d66cb8ce8 100644 --- a/dev-java/icedtea/icedtea-3.13.0.ebuild +++ b/dev-java/icedtea/icedtea-3.13.0.ebuild @@ -73,6 +73,7 @@ IUSE="+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero" +RESTRICT="!test? ( test )" REQUIRED_USE="gtk? ( !headless-awt )" # Ideally the following were optional at build time. diff --git a/dev-java/icedtea/icedtea-3.14.0.ebuild b/dev-java/icedtea/icedtea-3.14.0.ebuild index e61d5a2f6061..c52bf3276540 100644 --- a/dev-java/icedtea/icedtea-3.14.0.ebuild +++ b/dev-java/icedtea/icedtea-3.14.0.ebuild @@ -73,6 +73,7 @@ IUSE="+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero" +RESTRICT="!test? ( test )" REQUIRED_USE="gtk? ( !headless-awt )" # Ideally the following were optional at build time. diff --git a/dev-libs/starpu/starpu-1.2.6.ebuild b/dev-libs/starpu/starpu-1.2.6.ebuild index 5417166bdf11..95988d425023 100644 --- a/dev-libs/starpu/starpu-1.2.6.ebuild +++ b/dev-libs/starpu/starpu-1.2.6.ebuild @@ -18,6 +18,7 @@ IUSE=" blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl spinlock-check static-libs test valgrind " +RESTRICT="!test? ( test )" RDEPEND=" sci-mathematics/glpk:0= diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild index 927b7ae06922..37d318c6243f 100644 --- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild +++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild @@ -8,22 +8,35 @@ PYTHON_COMPAT=( python{3_6,3_7} ) inherit cmake-utils python-r1 ROS_PN="ament_cmake" -DESCRIPTION="The core of the ament buildsystem in CMake" +if [ "${PV#9999}" != "${PV}" ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ament/ament_cmake" + SRC_URI="" + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" + S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" +fi + +DESCRIPTION="Export definitions to downstream packages in the ament buildsystem" HOMEPAGE="https://github.com/ament/ament_cmake" -SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi IUSE="" DEPEND=" dev-ros/ament_cmake_core[${PYTHON_USEDEP}] + ${PYTHON_DEPS} " RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" +BDEPEND="${DEPEND}" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" src_configure() { # This is a build tool that does not install python-related files diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild new file mode 100644 index 000000000000..37d318c6243f --- /dev/null +++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild @@ -0,0 +1,48 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7} ) + +inherit cmake-utils python-r1 + +ROS_PN="ament_cmake" +if [ "${PV#9999}" != "${PV}" ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ament/ament_cmake" + SRC_URI="" + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" + S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" +fi + +DESCRIPTION="Export definitions to downstream packages in the ament buildsystem" +HOMEPAGE="https://github.com/ament/ament_cmake" + +LICENSE="Apache-2.0" +SLOT="0" +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi +IUSE="" + +DEPEND=" + dev-ros/ament_cmake_core[${PYTHON_USEDEP}] + ${PYTHON_DEPS} +" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +src_configure() { + # This is a build tool that does not install python-related files + # ... but we need to propagate the deps and use python3 to build it. + local pyimpl="${PYTHON_COMPAT[0]}" + python_export "${pyimpl}" EPYTHON PYTHON + python_wrapper_setup + cmake-utils_src_configure +} diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild index a7cae097311b..cfd9dde3b963 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild @@ -8,23 +8,36 @@ PYTHON_COMPAT=( python{3_6,3_7} ) inherit cmake-utils python-r1 ROS_PN="ament_cmake" -DESCRIPTION="The core of the ament buildsystem in CMake" +if [ "${PV#9999}" != "${PV}" ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ament/ament_cmake" + SRC_URI="" + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" + S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" +fi + +DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake" HOMEPAGE="https://github.com/ament/ament_cmake" -SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi IUSE="" DEPEND=" dev-ros/ament_cmake_core[${PYTHON_USEDEP}] dev-ros/ament_cmake_libraries[${PYTHON_USEDEP}] + ${PYTHON_DEPS} " RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" +BDEPEND="${DEPEND}" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" src_configure() { # This is a build tool that does not install python-related files diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild new file mode 100644 index 000000000000..cfd9dde3b963 --- /dev/null +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild @@ -0,0 +1,49 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7} ) + +inherit cmake-utils python-r1 + +ROS_PN="ament_cmake" +if [ "${PV#9999}" != "${PV}" ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ament/ament_cmake" + SRC_URI="" + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" + S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" +fi + +DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake" +HOMEPAGE="https://github.com/ament/ament_cmake" + +LICENSE="Apache-2.0" +SLOT="0" +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi +IUSE="" + +DEPEND=" + dev-ros/ament_cmake_core[${PYTHON_USEDEP}] + dev-ros/ament_cmake_libraries[${PYTHON_USEDEP}] + ${PYTHON_DEPS} +" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +src_configure() { + # This is a build tool that does not install python-related files + # ... but we need to propagate the deps and use python3 to build it. + local pyimpl="${PYTHON_COMPAT[0]}" + python_export "${pyimpl}" EPYTHON PYTHON + python_wrapper_setup + cmake-utils_src_configure +} diff --git a/dev-ros/rosbag/files/yaml.patch b/dev-ros/rosbag/files/yaml.patch new file mode 100644 index 000000000000..aea89788c1ea --- /dev/null +++ b/dev-ros/rosbag/files/yaml.patch @@ -0,0 +1,53 @@ +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/rosbag/src/rosbag/bag.py b/tools/rosbag/src/rosbag/bag.py +index 0578aed91..9bdcb693d 100644 +--- a/tools/rosbag/src/rosbag/bag.py ++++ b/tools/rosbag/src/rosbag/bag.py +@@ -1250,7 +1250,7 @@ def __init__(self, d): + else: + setattr(self, a, DictObject(b) if isinstance(b, dict) else b) + +- obj = DictObject(yaml.load(s)) ++ obj = DictObject(yaml.safe_load(s)) + try: + val = eval('obj.' + key) + except Exception as ex: diff --git a/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild index f36222bd8660..85bf4e8aee9a 100644 --- a/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild +++ b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild @@ -28,9 +28,10 @@ RDEPEND=" dev-ros/genpy[${PYTHON_USEDEP}] dev-ros/rospy[${PYTHON_USEDEP}] dev-libs/console_bridge:= - dev-python/pycrypto[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/python-gnupg[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" RDEPEND="${RDEPEND} lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" ) diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild index f36222bd8660..e4ca9d626aae 100644 --- a/dev-ros/rosbag/rosbag-9999.ebuild +++ b/dev-ros/rosbag/rosbag-9999.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-ros/genpy[${PYTHON_USEDEP}] dev-ros/rospy[${PYTHON_USEDEP}] dev-libs/console_bridge:= - dev-python/pycrypto[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/python-gnupg[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/rosgraph/Manifest +++ b/dev-ros/rosgraph/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/rosgraph/files/py3-2.patch b/dev-ros/rosgraph/files/py3-2.patch new file mode 100644 index 000000000000..b83b349576bd --- /dev/null +++ b/dev-ros/rosgraph/files/py3-2.patch @@ -0,0 +1,52 @@ +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/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py +index bbf1d9f49..51c39becd 100644 +--- a/tools/rosgraph/src/rosgraph/roslogging.py ++++ b/tools/rosgraph/src/rosgraph/roslogging.py +@@ -49,7 +49,7 @@ + class LoggingException(Exception): pass + + class RospyLogger(logging.getLoggerClass()): +- def findCaller(self, dummy=False): # Dummy second arg to match Python3 function declaration ++ def findCaller(self, stack_info=False): + """ + Find the stack frame of the caller so that we can note the source + file name, line number, and function name with class name if possible. +diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py +index 4ac4f8291..1c3cb5df5 100644 +--- a/tools/rosgraph/test/test_roslogging_user_logger.py ++++ b/tools/rosgraph/test/test_roslogging_user_logger.py +@@ -51,12 +51,16 @@ + + # set user defined custom logger + class UserCustomLogger(logging.Logger): +- def findCaller(self): ++ def findCaller(self, stack_info=False): + """Returns static caller. + + This method is being overwritten in rosgraph.roslogging. + """ +- return '<filename>', '<lineno>', '<func_name>' ++ if sys.version_info > (3, 2): ++ # Dummy last argument to match Python3 return type ++ return '<filename>', '<lineno>', '<func_name>', None ++ else: ++ return '<filename>', '<lineno>', '<func_name>' + + def _log(self, level, msg, args, exc_info=None, extra=None): + """Write log with ROS_IP. diff --git a/dev-ros/rosgraph/files/py3.patch b/dev-ros/rosgraph/files/py3.patch new file mode 100644 index 000000000000..45798c1d618e --- /dev/null +++ b/dev-ros/rosgraph/files/py3.patch @@ -0,0 +1,47 @@ +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/tools/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py +index f9e618f87..ca38c80e8 100644 +--- a/tools/rosgraph/test/test_roslogging.py ++++ b/tools/rosgraph/test/test_roslogging.py +@@ -32,7 +32,10 @@ + + import logging + import os +-from StringIO import StringIO ++try: ++ from cStringIO import StringIO ++except ImportError: ++ from io import StringIO + import sys + + import re +diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py +index 62051638a..4ac4f8291 100644 +--- a/tools/rosgraph/test/test_roslogging_user_logger.py ++++ b/tools/rosgraph/test/test_roslogging_user_logger.py +@@ -38,7 +38,10 @@ + + import logging + import os +-from StringIO import StringIO ++try: ++ from cStringIO import StringIO ++except ImportError: ++ from io import StringIO + import sys + + from nose.tools import assert_regexp_matches diff --git a/dev-ros/rosgraph/files/yaml.patch b/dev-ros/rosgraph/files/yaml.patch new file mode 100644 index 000000000000..32ea589c8e49 --- /dev/null +++ b/dev-ros/rosgraph/files/yaml.patch @@ -0,0 +1,53 @@ +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/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py +index ffe975dab..bbf1d9f49 100644 +--- a/tools/rosgraph/src/rosgraph/roslogging.py ++++ b/tools/rosgraph/src/rosgraph/roslogging.py +@@ -178,7 +178,7 @@ def configure_logging(logname, level=logging.INFO, filename=None, env=None): + os.environ['ROS_LOG_FILENAME'] = log_filename + if config_file.endswith(('.yaml', '.yml')): + with open(config_file) as f: +- dict_conf = yaml.load(f) ++ dict_conf = yaml.safe_load(f) + dict_conf.setdefault('version', 1) + logging.config.dictConfig(dict_conf) + else: diff --git a/dev-ros/rosgraph/rosgraph-1.13.0.ebuild b/dev-ros/rosgraph/rosgraph-1.13.0.ebuild deleted file mode 100644 index 4922358a7091..000000000000 --- a/dev-ros/rosgraph/rosgraph-1.13.0.ebuild +++ /dev/null @@ -1,22 +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" -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Prints information about the ROS Computation Graph" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosgraph/rosgraph-1.13.1.ebuild b/dev-ros/rosgraph/rosgraph-1.13.1.ebuild deleted file mode 100644 index 4922358a7091..000000000000 --- a/dev-ros/rosgraph/rosgraph-1.13.1.ebuild +++ /dev/null @@ -1,22 +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" -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Prints information about the ROS Computation Graph" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosgraph/rosgraph-1.13.2.ebuild b/dev-ros/rosgraph/rosgraph-1.13.2.ebuild deleted file mode 100644 index 4922358a7091..000000000000 --- a/dev-ros/rosgraph/rosgraph-1.13.2.ebuild +++ /dev/null @@ -1,22 +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" -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Prints information about the ROS Computation Graph" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosgraph/rosgraph-1.13.5.ebuild b/dev-ros/rosgraph/rosgraph-1.13.5.ebuild deleted file mode 100644 index 4922358a7091..000000000000 --- a/dev-ros/rosgraph/rosgraph-1.13.5.ebuild +++ /dev/null @@ -1,22 +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" -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Prints information about the ROS Computation Graph" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosgraph/rosgraph-1.13.6.ebuild b/dev-ros/rosgraph/rosgraph-1.13.6.ebuild deleted file mode 100644 index 4922358a7091..000000000000 --- a/dev-ros/rosgraph/rosgraph-1.13.6.ebuild +++ /dev/null @@ -1,22 +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" -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Prints information about the ROS Computation Graph" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosgraph/rosgraph-1.14.2.ebuild b/dev-ros/rosgraph/rosgraph-1.14.2.ebuild deleted file mode 100644 index 4922358a7091..000000000000 --- a/dev-ros/rosgraph/rosgraph-1.14.2.ebuild +++ /dev/null @@ -1,22 +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" -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Prints information about the ROS Computation Graph" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosgraph/rosgraph-1.13.4.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild index 4922358a7091..4a463741c8fc 100644 --- a/dev-ros/rosgraph/rosgraph-1.13.4.ebuild +++ b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild @@ -20,3 +20,4 @@ RDEPEND=" dev-python/rospkg[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" ) diff --git a/dev-ros/rosgraph/rosgraph-1.14.3.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3.ebuild deleted file mode 100644 index 4922358a7091..000000000000 --- a/dev-ros/rosgraph/rosgraph-1.14.3.ebuild +++ /dev/null @@ -1,22 +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" -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Prints information about the ROS Computation Graph" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/roslaunch/files/py3-2.patch b/dev-ros/roslaunch/files/py3-2.patch new file mode 100644 index 000000000000..d3ae600e4d7e --- /dev/null +++ b/dev-ros/roslaunch/files/py3-2.patch @@ -0,0 +1,29 @@ +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/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py +index ac30189d0..f582ec230 100644 +--- a/tools/roslaunch/test/unit/test_xmlloader.py ++++ b/tools/roslaunch/test/unit/test_xmlloader.py +@@ -218,7 +218,7 @@ def test_params(self): + p = [p for p in mock.params if p.key == '/configfile'][0] + self.assertEquals(contents, p.value, 1) + p = [p for p in mock.params if p.key == '/binaryfile'][0] +- self.assertEquals(Binary(contents), p.value, 1) ++ self.assertEquals(Binary(contents.encode()), p.value, 1) + + f = open(os.path.join(get_example_path(), 'example.launch')) + try: diff --git a/dev-ros/roslaunch/files/py3.patch b/dev-ros/roslaunch/files/py3.patch new file mode 100644 index 000000000000..8fa2c6e2fab2 --- /dev/null +++ b/dev-ros/roslaunch/files/py3.patch @@ -0,0 +1,45 @@ +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/tools/roslaunch/src/roslaunch/depends.py b/tools/roslaunch/src/roslaunch/depends.py +index a3fbf7a41..91ae26998 100644 +--- a/tools/roslaunch/src/roslaunch/depends.py ++++ b/tools/roslaunch/src/roslaunch/depends.py +@@ -86,21 +86,21 @@ def __str__(self): + + def _get_arg_value(tag, context): + name = tag.attributes['name'].value +- if tag.attributes.has_key('value'): ++ if 'value' in tag.attributes.keys(): + return resolve_args(tag.attributes['value'].value, context) + elif name in context['arg']: + return context['arg'][name] +- elif tag.attributes.has_key('default'): ++ elif 'default' in tag.attributes.keys(): + return resolve_args(tag.attributes['default'].value, context) + else: + raise RoslaunchDepsException("No value for arg [%s]"%(name)) + + def _check_ifunless(tag, context): +- if tag.attributes.has_key('if'): ++ if 'if' in tag.attributes.keys(): + val = resolve_args(tag.attributes['if'].value, context) + if not convert_value(val, 'bool'): + return False +- elif tag.attributes.has_key('unless'): ++ elif 'unless' in tag.attributes.keys(): + val = resolve_args(tag.attributes['unless'].value, context) + if convert_value(val, 'bool'): + return False diff --git a/dev-ros/roslaunch/files/roscore.initd b/dev-ros/roslaunch/files/roscore.initd index 3df4be4006b9..d05c3fe98a76 100755..100644 --- a/dev-ros/roslaunch/files/roscore.initd +++ b/dev-ros/roslaunch/files/roscore.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { diff --git a/dev-ros/roslaunch/files/roslaunch.initd b/dev-ros/roslaunch/files/roslaunch.initd index af38d2abbe68..fa0c0ace1c55 100755..100644 --- a/dev-ros/roslaunch/files/roslaunch.initd +++ b/dev-ros/roslaunch/files/roslaunch.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { diff --git a/dev-ros/roslaunch/roslaunch-1.14.3-r1.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild index cc74b7791b52..6f8d65622b86 100644 --- a/dev-ros/roslaunch/roslaunch-1.14.3-r1.ebuild +++ b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild @@ -31,7 +31,7 @@ DEPEND="${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )" -PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" ) +PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" ) src_test() { rosdep update diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/rosmsg/Manifest +++ b/dev-ros/rosmsg/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/rosmsg/files/norm.patch b/dev-ros/rosmsg/files/norm.patch new file mode 100644 index 000000000000..530da65fcd24 --- /dev/null +++ b/dev-ros/rosmsg/files/norm.patch @@ -0,0 +1,31 @@ +From 0648d3019dc2395f61a8a7a3d1bbf790eca98739 Mon Sep 17 00:00:00 2001 +From: James Xu <kejia.xu@microsoft.com> +Date: Wed, 6 Feb 2019 09:47:54 -0800 +Subject: [PATCH] normalize paths before comparison in rosmsg (#1586) + +* normalize paths before comparison in rosmsg + +* remove use of normcase and remove path_in_workspaces temp variable + +* remove duplicated control + +* revert unrelated whitespace changes + +* keep order of operands +--- + tools/rosmsg/src/rosmsg/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py +index 83b629e7e..4ed7aa542 100644 +--- a/tools/rosmsg/src/rosmsg/__init__.py ++++ b/tools/rosmsg/src/rosmsg/__init__.py +@@ -551,7 +551,7 @@ def _get_package_paths(pkgname, rospack): + path = rospack.get_path(pkgname) + paths.append(path) + results = find_in_workspaces(search_dirs=['share'], project=pkgname, first_match_only=True, workspace_to_source_spaces=_catkin_workspace_to_source_spaces, source_path_to_packages=_catkin_source_path_to_packages) +- if results and results[0] != path: ++ if results and results[0].replace(os.path.sep, '/') != path.replace(os.path.sep, '/'): + paths.append(results[0]) + return paths + diff --git a/dev-ros/rosmsg/files/py3.patch b/dev-ros/rosmsg/files/py3.patch new file mode 100644 index 000000000000..4cfcb77d2a26 --- /dev/null +++ b/dev-ros/rosmsg/files/py3.patch @@ -0,0 +1,212 @@ +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/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py +index 4ed7aa542..75f5afcbd 100644 +--- a/tools/rosmsg/src/rosmsg/__init__.py ++++ b/tools/rosmsg/src/rosmsg/__init__.py +@@ -240,7 +240,7 @@ def create_names_filter(names): + """ + returns a function to use as filter that returns all objects slots except those with names in list. + """ +- return lambda obj : filter(lambda slotname : not slotname in names, obj.__slots__) ++ return lambda obj : list(filter(lambda slotname : not slotname in names, obj.__slots__)) + + + def init_rosmsg_proto(): +diff --git a/tools/rosmsg/test/test_rosmsg_command_line.py b/tools/rosmsg/test/test_rosmsg_command_line.py +index 02e31022e..d5515a3ac 100644 +--- a/tools/rosmsg/test/test_rosmsg_command_line.py ++++ b/tools/rosmsg/test/test_rosmsg_command_line.py +@@ -54,24 +54,24 @@ def test_cmd_help(self): + + for cmd in ['rosmsg', 'rossrv']: + glob_cmd=[os.path.join(_SCRIPT_FOLDER, cmd)] +- output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0] ++ output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0].decode() + self.assert_('Commands' in output) +- output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0] ++ output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode() + self.assert_('Commands' in output) + self.assert_('Traceback' not in output) + for c in sub: + self.assert_("%s %s"%(cmd, c) in output, "%s %s"%(cmd, c) + " not in "+ output + " of " + str(glob_cmd)) + + for c in sub: +- output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0] ++ output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode() + self.assert_('Usage' in output) + self.assert_("%s %s"%(cmd, c) in output, output) + + def test_cmd_packages(self): + # - single line +- output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0] ++ output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0].decode() + # - multi-line +- output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0] ++ output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0].decode() + l1 = [x for x in output1.split() if x] + l2 = [x.strip() for x in output2.split('\n') if x.strip()] + self.assertEquals(l1, l2) +@@ -80,8 +80,8 @@ def test_cmd_packages(self): + for p in ['std_srvs', 'rosmsg']: + self.assert_(p not in l1) + +- output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0] +- output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0] ++ output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0].decode() ++ output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0].decode() + l1 = [x for x in output1.split() if x] + l2 = [x.strip() for x in output2.split('\n') if x.strip()] + self.assertEquals(l1, l2) +@@ -92,14 +92,14 @@ def test_cmd_packages(self): + + def test_cmd_list(self): + # - multi-line +- output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0] ++ output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0].decode() + l1 = [x.strip() for x in output1.split('\n') if x.strip()] + for p in ['std_msgs/String', 'test_rosmaster/Floats']: + self.assert_(p in l1) + for p in ['std_srvs/Empty', 'roscpp/Empty']: + self.assert_(p not in l1) + +- output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0] ++ output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0].decode() + l1 = [x.strip() for x in output1.split('\n') if x.strip()] + for p in ['std_srvs/Empty', 'roscpp/Empty']: + self.assert_(p in l1) +@@ -109,9 +109,9 @@ def test_cmd_list(self): + def test_cmd_package(self): + # this test is obviously very brittle, but should stabilize as the tests stabilize + # - single line output +- output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0] ++ output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode() + # - multi-line output +- output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0] ++ output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode() + l = set([x for x in output1.split() if x]) + l2 = set([x.strip() for x in output2.split('\n') if x.strip()]) + self.assertEquals(l, l2) +@@ -121,8 +121,8 @@ def test_cmd_package(self): + 'test_rosmaster/RosmsgC']: + self.assertTrue(m in l, l) + +- output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0] +- output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0] ++ output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode() ++ output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0].decode() + l = set([x for x in output.split() if x]) + l2 = set([x.strip() for x in output2.split('\n') if x.strip()]) + self.assertEquals(l, l2) +@@ -132,14 +132,14 @@ def test_cmd_package(self): + + ## test that the rosmsg/rossrv show command works + def test_cmd_show(self): +- output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0] ++ output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0].decode() + self.assertEquals('string data', output.strip()) + +- output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0] ++ output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode() + self.assertEquals('---', output.strip()) +- output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0] ++ output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode() + self.assertEquals('---', output.strip()) +- output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0] ++ output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0].decode() + self.assertEquals('int64 a\nint64 b\n---\nint64 sum', output.strip()) + + # test against test_rosmsg package +@@ -159,20 +159,20 @@ def test_cmd_show(self): + text = text+'\n' # running command adds one new line + text_raw = text_raw+'\n' + type_ =test_message_package+'/'+t +- output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0] ++ output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode() + self.assertEquals(text, output) +- output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0] ++ output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0].decode() + self.assertEquals(text_raw, output) +- output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0] ++ output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode() + self.assertEquals(text_raw, output) + + # test as search + type_ = t + text = "[test_rosmaster/%s]:\n%s"%(t, text) + text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw) +- output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0] ++ output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode() + self.assertEquals(text, output) + output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate() +- self.assertEquals(text_raw, output[0], "Failed: %s"%(str(output))) +- output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0] ++ self.assertEquals(text_raw, output[0].decode(), "Failed: %s"%(str(output))) ++ output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode() + self.assertEquals(text_raw, output) +diff --git a/tools/rosmsg/test/test_rosmsgproto_command_line.py b/tools/rosmsg/test/test_rosmsgproto_command_line.py +index b5b555e78..b4aa0c5b3 100644 +--- a/tools/rosmsg/test/test_rosmsgproto_command_line.py ++++ b/tools/rosmsg/test/test_rosmsgproto_command_line.py +@@ -67,37 +67,37 @@ def testFail(self): + cmd.extend(["msg", "foo123barxyz"]) + call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ) + (output, erroutput) = call.communicate() +- self.assertEqual('', output) +- self.assertTrue('Unknown message name foo123barxyz' in erroutput) ++ self.assertEqual(b'', output) ++ self.assertTrue('Unknown message name foo123barxyz' in erroutput.decode()) + + def testSilentFail(self): + cmd = copy.copy(ROSMSGPROTO_FN) + cmd.extend(["msg", "-s", "foo123barxyz"]) + call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ) + (output, erroutput) = call.communicate() +- self.assertEqual('', output) +- self.assertEqual('', erroutput) ++ self.assertEqual(b'', output) ++ self.assertEqual(b'', erroutput) + + def testSilentFailCpp(self): + cmd = copy.copy(ROSMSGPROTO_FN) + cmd.extend(["msg", "-s", "foo123barxyz::bar"]) + call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ) + (output, erroutput) = call.communicate() +- self.assertEqual('', output) +- self.assertEqual('', erroutput) ++ self.assertEqual(b'', output) ++ self.assertEqual(b'', erroutput) + + def testSilentFailDot(self): + cmd = copy.copy(ROSMSGPROTO_FN) + cmd.extend(["msg", "-s", "foo123barxyz.bar"]) + call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ) + (output, erroutput) = call.communicate() +- self.assertEqual('', output) +- self.assertEqual('', erroutput) ++ self.assertEqual(b'', output) ++ self.assertEqual(b'', erroutput) + + def testSilentFailMode(self): + cmd = copy.copy(ROSMSGPROTO_FN) + cmd.extend(["msgfoobar", "-s", "foo123barxyz.bar"]) + call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ) + (output, erroutput) = call.communicate() +- self.assertEqual('', output) +- self.assertEqual('', erroutput) ++ self.assertEqual(b'', output) ++ self.assertEqual(b'', erroutput) diff --git a/dev-ros/rosmsg/files/tests.patch b/dev-ros/rosmsg/files/tests.patch new file mode 100644 index 000000000000..f8b514b4e127 --- /dev/null +++ b/dev-ros/rosmsg/files/tests.patch @@ -0,0 +1,15 @@ +Index: rosmsg/test/test_rosmsg_command_line.py +=================================================================== +--- rosmsg.orig/test/test_rosmsg_command_line.py ++++ rosmsg/test/test_rosmsg_command_line.py +@@ -168,8 +168,8 @@ class TestRosmsg(unittest.TestCase): + + # test as search + type_ = t +- text = "[test_rosmaster/%s]:\n%s"%(t, text) +- text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw) ++ text = ("[test_rosmaster/%s]:\n%s"%(t, text))*2 ++ text_raw = ("[test_rosmaster/%s]:\n%s"%(t, text_raw))*2 + output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode() + self.assertEquals(text, output) + output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate() diff --git a/dev-ros/rosmsg/rosmsg-1.13.1.ebuild b/dev-ros/rosmsg/rosmsg-1.13.1.ebuild deleted file mode 100644 index 8087d80c4e41..000000000000 --- a/dev-ros/rosmsg/rosmsg-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 tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosbag[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/rosmsg/rosmsg-1.13.2.ebuild b/dev-ros/rosmsg/rosmsg-1.13.2.ebuild deleted file mode 100644 index 8087d80c4e41..000000000000 --- a/dev-ros/rosmsg/rosmsg-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 tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosbag[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/rosmsg/rosmsg-1.13.4.ebuild b/dev-ros/rosmsg/rosmsg-1.13.4.ebuild deleted file mode 100644 index 8087d80c4e41..000000000000 --- a/dev-ros/rosmsg/rosmsg-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 tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosbag[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/rosmsg/rosmsg-1.13.5.ebuild b/dev-ros/rosmsg/rosmsg-1.13.5.ebuild deleted file mode 100644 index 8087d80c4e41..000000000000 --- a/dev-ros/rosmsg/rosmsg-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 tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosbag[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/rosmsg/rosmsg-1.13.6.ebuild b/dev-ros/rosmsg/rosmsg-1.13.6.ebuild deleted file mode 100644 index 8087d80c4e41..000000000000 --- a/dev-ros/rosmsg/rosmsg-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 tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosbag[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/rosmsg/rosmsg-1.14.2.ebuild b/dev-ros/rosmsg/rosmsg-1.14.2.ebuild deleted file mode 100644 index 8087d80c4e41..000000000000 --- a/dev-ros/rosmsg/rosmsg-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 tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosbag[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/rosmsg/rosmsg-1.13.0.ebuild b/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild index 8087d80c4e41..116c190ae75e 100644 --- a/dev-ros/rosmsg/rosmsg-1.13.0.ebuild +++ b/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild @@ -21,4 +21,7 @@ RDEPEND=" dev-ros/roslib[${PYTHON_USEDEP}] dev-ros/rosbag[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] ) +" +PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/norm.patch" "${FILESDIR}/tests.patch" ) diff --git a/dev-ros/rosmsg/rosmsg-1.14.3.ebuild b/dev-ros/rosmsg/rosmsg-1.14.3.ebuild deleted file mode 100644 index 8087d80c4e41..000000000000 --- a/dev-ros/rosmsg/rosmsg-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 tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosbag[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild index 8087d80c4e41..05019766a002 100644 --- a/dev-ros/rosmsg/rosmsg-9999.ebuild +++ b/dev-ros/rosmsg/rosmsg-9999.ebuild @@ -21,4 +21,6 @@ RDEPEND=" dev-ros/roslib[${PYTHON_USEDEP}] dev-ros/rosbag[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] ) +" diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/rospy/Manifest +++ b/dev-ros/rospy/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/rospy/files/yaml.patch b/dev-ros/rospy/files/yaml.patch new file mode 100644 index 000000000000..e9e9aa8202a9 --- /dev/null +++ b/dev-ros/rospy/files/yaml.patch @@ -0,0 +1,53 @@ +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/clients/rospy/src/rospy/client.py b/clients/rospy/src/rospy/client.py +index d543c53ac..c72d6d6f0 100644 +--- a/clients/rospy/src/rospy/client.py ++++ b/clients/rospy/src/rospy/client.py +@@ -101,7 +101,7 @@ def load_command_line_node_params(argv): + src, dst = [x.strip() for x in arg.split(rosgraph.names.REMAP)] + if src and dst: + if len(src) > 1 and src[0] == '_' and src[1] != '_': +- mappings[src[1:]] = yaml.load(dst) ++ mappings[src[1:]] = yaml.safe_load(dst) + return mappings + except Exception as e: + raise rospy.exceptions.ROSInitException("invalid command-line parameters: %s"%(str(e))) diff --git a/dev-ros/rospy/rospy-1.13.1.ebuild b/dev-ros/rospy/rospy-1.13.1.ebuild deleted file mode 100644 index 86a76ec40b17..000000000000 --- a/dev-ros/rospy/rospy-1.13.1.ebuild +++ /dev/null @@ -1,33 +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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="Python client library for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roscpp[${PYTHON_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_install() { - ros-catkin_src_install - # Other tests need these nodes - exeinto /usr/share/${PN} - doexe test_nodes/* -} diff --git a/dev-ros/rospy/rospy-1.13.2.ebuild b/dev-ros/rospy/rospy-1.13.2.ebuild deleted file mode 100644 index 86a76ec40b17..000000000000 --- a/dev-ros/rospy/rospy-1.13.2.ebuild +++ /dev/null @@ -1,33 +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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="Python client library for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roscpp[${PYTHON_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_install() { - ros-catkin_src_install - # Other tests need these nodes - exeinto /usr/share/${PN} - doexe test_nodes/* -} diff --git a/dev-ros/rospy/rospy-1.13.4.ebuild b/dev-ros/rospy/rospy-1.13.4.ebuild deleted file mode 100644 index 86a76ec40b17..000000000000 --- a/dev-ros/rospy/rospy-1.13.4.ebuild +++ /dev/null @@ -1,33 +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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="Python client library for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roscpp[${PYTHON_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_install() { - ros-catkin_src_install - # Other tests need these nodes - exeinto /usr/share/${PN} - doexe test_nodes/* -} diff --git a/dev-ros/rospy/rospy-1.13.5.ebuild b/dev-ros/rospy/rospy-1.13.5.ebuild deleted file mode 100644 index 86a76ec40b17..000000000000 --- a/dev-ros/rospy/rospy-1.13.5.ebuild +++ /dev/null @@ -1,33 +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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="Python client library for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roscpp[${PYTHON_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_install() { - ros-catkin_src_install - # Other tests need these nodes - exeinto /usr/share/${PN} - doexe test_nodes/* -} diff --git a/dev-ros/rospy/rospy-1.13.6.ebuild b/dev-ros/rospy/rospy-1.13.6.ebuild deleted file mode 100644 index 86a76ec40b17..000000000000 --- a/dev-ros/rospy/rospy-1.13.6.ebuild +++ /dev/null @@ -1,33 +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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="Python client library for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roscpp[${PYTHON_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_install() { - ros-catkin_src_install - # Other tests need these nodes - exeinto /usr/share/${PN} - doexe test_nodes/* -} diff --git a/dev-ros/rospy/rospy-1.14.2.ebuild b/dev-ros/rospy/rospy-1.14.2.ebuild deleted file mode 100644 index 86a76ec40b17..000000000000 --- a/dev-ros/rospy/rospy-1.14.2.ebuild +++ /dev/null @@ -1,33 +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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="Python client library for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roscpp[${PYTHON_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_install() { - ros-catkin_src_install - # Other tests need these nodes - exeinto /usr/share/${PN} - doexe test_nodes/* -} diff --git a/dev-ros/rospy/rospy-1.13.0.ebuild b/dev-ros/rospy/rospy-1.14.3-r1.ebuild index 86a76ec40b17..b82942391322 100644 --- a/dev-ros/rospy/rospy-1.13.0.ebuild +++ b/dev-ros/rospy/rospy-1.14.3-r1.ebuild @@ -24,6 +24,7 @@ RDEPEND=" dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/yaml.patch" ) src_install() { ros-catkin_src_install diff --git a/dev-ros/rospy/rospy-1.14.3.ebuild b/dev-ros/rospy/rospy-1.14.3.ebuild deleted file mode 100644 index 86a76ec40b17..000000000000 --- a/dev-ros/rospy/rospy-1.14.3.ebuild +++ /dev/null @@ -1,33 +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" -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) -ROS_SUBDIR=clients/${PN} - -inherit ros-catkin - -DESCRIPTION="Python client library for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-ros/roscpp[${PYTHON_USEDEP}] - dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_install() { - ros-catkin_src_install - # Other tests need these nodes - exeinto /usr/share/${PN} - doexe test_nodes/* -} diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/rosservice/Manifest +++ b/dev-ros/rosservice/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 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}" diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/rostopic/Manifest +++ b/dev-ros/rostopic/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/rostopic/files/py3.patch b/dev-ros/rostopic/files/py3.patch new file mode 100644 index 000000000000..51f5da5aa778 --- /dev/null +++ b/dev-ros/rostopic/files/py3.patch @@ -0,0 +1,89 @@ +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/tools/rostopic/test/test_rostopic_command_line_offline.py b/tools/rostopic/test/test_rostopic_command_line_offline.py +index 5dab1ad16..37a81faaa 100644 +--- a/tools/rostopic/test/test_rostopic_command_line_offline.py ++++ b/tools/rostopic/test/test_rostopic_command_line_offline.py +@@ -48,9 +48,9 @@ def test_cmd_help(self): + cmd = 'rostopic' + + sub = ['bw', 'echo', 'hz', 'delay', 'info', 'list', 'pub', 'type','find'] +- output = Popen([cmd], stdout=PIPE).communicate()[0] ++ output = Popen([cmd], stdout=PIPE).communicate()[0].decode() + self.assert_('Commands' in output) +- output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0] ++ output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0].decode() + self.assert_('Commands' in output) + # make sure all the commands are in the usage + for c in sub: +@@ -59,16 +59,16 @@ def test_cmd_help(self): + + for c in sub: + output = Popen([cmd, c, '-h'], stdout=PIPE, stderr=PIPE).communicate() +- self.assert_("usage:" in output[0].lower(), output) ++ self.assert_("usage:" in output[0].decode().lower(), output) + # make sure usage refers to the command +- self.assert_("%s %s"%(cmd, c) in output[0], output) ++ self.assert_("%s %s"%(cmd, c) in output[0].decode(), output) + + # test no args on commands that require args + for c in ['bw', 'echo', 'hz', 'delay', 'info', 'pub', 'type', 'find']: + output = Popen([cmd, c], stdout=PIPE, stderr=PIPE).communicate() +- self.assert_("usage:" in output[0].lower() or "usage:" in output[1].lower(), output) ++ self.assert_("usage:" in output[0].decode().lower() or "usage:" in output[1].decode().lower(), output) + # make sure usage refers to the command +- self.assert_("%s %s"%(cmd, c) in output[1], output) ++ self.assert_("%s %s"%(cmd, c) in output[1].decode(), output) + + def test_offline(self): + cmd = 'rostopic' +@@ -80,19 +80,19 @@ def test_offline(self): + + msg = "ERROR: Unable to communicate with master!\n" + +- output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) +- output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) +- output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) +- output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) +- output = Popen([cmd, 'list'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) +- output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) +- output = Popen([cmd, 'type', 'chatter'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) +- output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate() +- self.assert_(output[1].endswith(msg)) ++ output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) ++ output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) ++ output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) ++ output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) ++ output = Popen([cmd, 'list'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) ++ output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) ++ output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) ++ output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()[1].decode() ++ self.assert_(output.endswith(msg)) diff --git a/dev-ros/rostopic/files/yaml.patch b/dev-ros/rostopic/files/yaml.patch new file mode 100644 index 000000000000..e96337b50546 --- /dev/null +++ b/dev-ros/rostopic/files/yaml.patch @@ -0,0 +1,71 @@ +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/rostopic/src/rostopic/__init__.py b/tools/rostopic/src/rostopic/__init__.py +index ad244b0f0..41138562e 100644 +--- a/tools/rostopic/src/rostopic/__init__.py ++++ b/tools/rostopic/src/rostopic/__init__.py +@@ -1779,7 +1779,7 @@ def _rostopic_cmd_pub(argv): + try: + pub_args = [] + for arg in args[2:]: +- pub_args.append(yaml.load(arg)) ++ pub_args.append(yaml.safe_load(arg)) + except Exception as e: + parser.error("Argument error: "+str(e)) + +@@ -1822,7 +1822,7 @@ def bagy_iter(): + try: + with open(filename, 'r') as f: + # load all documents +- data = yaml.load_all(f) ++ data = yaml.safe_load_all(f) + for d in data: + yield [d] + except yaml.YAMLError as e: +@@ -2014,7 +2014,7 @@ def stdin_yaml_arg(): + + if arg.strip() == '---': # End of document + try: +- loaded = yaml.load(buff.rstrip()) ++ loaded = yaml.safe_load(buff.rstrip()) + except Exception as e: + sys.stderr.write("Invalid YAML: %s\n"%str(e)) + if loaded is not None: diff --git a/dev-ros/rostopic/rostopic-1.13.1.ebuild b/dev-ros/rostopic/rostopic-1.13.1.ebuild deleted file mode 100644 index bc869fd3fbe8..000000000000 --- a/dev-ros/rostopic/rostopic-1.13.1.ebuild +++ /dev/null @@ -1,27 +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 displaying debug information about ROS Topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" diff --git a/dev-ros/rostopic/rostopic-1.13.2.ebuild b/dev-ros/rostopic/rostopic-1.13.2.ebuild deleted file mode 100644 index bc869fd3fbe8..000000000000 --- a/dev-ros/rostopic/rostopic-1.13.2.ebuild +++ /dev/null @@ -1,27 +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 displaying debug information about ROS Topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" diff --git a/dev-ros/rostopic/rostopic-1.13.4.ebuild b/dev-ros/rostopic/rostopic-1.13.4.ebuild deleted file mode 100644 index bc869fd3fbe8..000000000000 --- a/dev-ros/rostopic/rostopic-1.13.4.ebuild +++ /dev/null @@ -1,27 +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 displaying debug information about ROS Topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" diff --git a/dev-ros/rostopic/rostopic-1.13.5.ebuild b/dev-ros/rostopic/rostopic-1.13.5.ebuild deleted file mode 100644 index bc869fd3fbe8..000000000000 --- a/dev-ros/rostopic/rostopic-1.13.5.ebuild +++ /dev/null @@ -1,27 +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 displaying debug information about ROS Topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" diff --git a/dev-ros/rostopic/rostopic-1.13.6.ebuild b/dev-ros/rostopic/rostopic-1.13.6.ebuild deleted file mode 100644 index bc869fd3fbe8..000000000000 --- a/dev-ros/rostopic/rostopic-1.13.6.ebuild +++ /dev/null @@ -1,27 +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 displaying debug information about ROS Topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" diff --git a/dev-ros/rostopic/rostopic-1.14.2.ebuild b/dev-ros/rostopic/rostopic-1.14.2.ebuild deleted file mode 100644 index bc869fd3fbe8..000000000000 --- a/dev-ros/rostopic/rostopic-1.14.2.ebuild +++ /dev/null @@ -1,27 +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 displaying debug information about ROS Topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" diff --git a/dev-ros/rostopic/rostopic-1.13.0.ebuild b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild index bc869fd3fbe8..db7295a22db1 100644 --- a/dev-ros/rostopic/rostopic-1.13.0.ebuild +++ b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild @@ -25,3 +25,4 @@ DEPEND="${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] ) " +PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" ) diff --git a/dev-ros/rostopic/rostopic-1.14.3.ebuild b/dev-ros/rostopic/rostopic-1.14.3.ebuild deleted file mode 100644 index bc869fd3fbe8..000000000000 --- a/dev-ros/rostopic/rostopic-1.14.3.ebuild +++ /dev/null @@ -1,27 +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 displaying debug information about ROS Topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/test_roslib_comm/Manifest +++ b/dev-ros/test_roslib_comm/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/test_roslib_comm/files/yaml.patch b/dev-ros/test_roslib_comm/files/yaml.patch new file mode 100644 index 000000000000..a72173c32b8a --- /dev/null +++ b/dev-ros/test_roslib_comm/files/yaml.patch @@ -0,0 +1,53 @@ +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/test/test_roslib_comm/test/test_roslib_message.py b/test/test_roslib_comm/test/test_roslib_message.py +index 3d4e7a6fa..288cc375b 100644 +--- a/test/test_roslib_comm/test/test_roslib_message.py ++++ b/test/test_roslib_comm/test/test_roslib_message.py +@@ -61,7 +61,7 @@ def test_strify_message(self): + def roundtrip(m): + yaml_text = strify_message(m) + print(yaml_text) +- loaded = yaml.load(yaml_text) ++ loaded = yaml.safe_load(yaml_text) + print("loaded", loaded) + new_inst = m.__class__() + if loaded is not None: diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.1.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.1.ebuild deleted file mode 100644 index cc727786c8e9..000000000000 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.1.ebuild +++ /dev/null @@ -1,24 +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/rosgraph_msgs dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for roslib" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) -" diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.2.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.2.ebuild deleted file mode 100644 index cc727786c8e9..000000000000 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.2.ebuild +++ /dev/null @@ -1,24 +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/rosgraph_msgs dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for roslib" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) -" diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.4.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.4.ebuild deleted file mode 100644 index cc727786c8e9..000000000000 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.4.ebuild +++ /dev/null @@ -1,24 +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/rosgraph_msgs dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for roslib" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) -" diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.5.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.5.ebuild deleted file mode 100644 index cc727786c8e9..000000000000 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.5.ebuild +++ /dev/null @@ -1,24 +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/rosgraph_msgs dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for roslib" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) -" diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild deleted file mode 100644 index 25cb9086d149..000000000000 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild +++ /dev/null @@ -1,24 +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/rosgraph_msgs dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for roslib" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) -" diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.2.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.2.ebuild deleted file mode 100644 index 25cb9086d149..000000000000 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.2.ebuild +++ /dev/null @@ -1,24 +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/rosgraph_msgs dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for roslib" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) -" diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.0.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild index cc727786c8e9..4790aa7d9cba 100644 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.0.ebuild +++ b/dev-ros/test_roslib_comm/test_roslib_comm-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 @@ -22,3 +22,4 @@ RDEPEND="" DEPEND="${RDEPEND} test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) " +PATCHES=( "${FILESDIR}/yaml.patch" ) diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild deleted file mode 100644 index 25cb9086d149..000000000000 --- a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild +++ /dev/null @@ -1,24 +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/rosgraph_msgs dev-ros/std_msgs" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for roslib" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) -" diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest index 46b6ab37d10c..3d0a1ebaa18a 100644 --- a/dev-ros/test_rosmaster/Manifest +++ b/dev-ros/test_rosmaster/Manifest @@ -1,9 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/test_rosmaster/files/empty.patch b/dev-ros/test_rosmaster/files/empty.patch new file mode 100644 index 000000000000..8ec371c917c0 --- /dev/null +++ b/dev-ros/test_rosmaster/files/empty.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..579d24f9f0b5 --- /dev/null +++ b/dev-ros/test_rosmaster/files/py3.patch @@ -0,0 +1,54 @@ +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_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 new file mode 100644 index 000000000000..2eb9c086b7e4 --- /dev/null +++ b/dev-ros/test_rosmaster/files/yaml.patch @@ -0,0 +1,53 @@ +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/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.13.0.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild deleted file mode 100644 index 69bbd047e7b9..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild deleted file mode 100644 index 69bbd047e7b9..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild deleted file mode 100644 index 69bbd047e7b9..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild deleted file mode 100644 index 69bbd047e7b9..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild deleted file mode 100644 index 69bbd047e7b9..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild deleted file mode 100644 index f9547e8381b1..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild deleted file mode 100644 index f9547e8381b1..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.12.7.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild index 69bbd047e7b9..d09c050ee2a7 100644 --- a/dev-ros/test_rosmaster/test_rosmaster-1.12.7.ebuild +++ b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.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 @@ -23,6 +23,7 @@ RDEPEND="dev-ros/rosgraph[${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" ) diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild deleted file mode 100644 index f9547e8381b1..000000000000 --- a/dev-ros/test_rosmaster/test_rosmaster-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 - -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 -} diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest index 46b6ab37d10c..3d0a1ebaa18a 100644 --- a/dev-ros/test_rospy/Manifest +++ b/dev-ros/test_rospy/Manifest @@ -1,9 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 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}] - )" diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/test_rosservice/Manifest +++ b/dev-ros/test_rosservice/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/test_rosservice/files/yaml.patch b/dev-ros/test_rosservice/files/yaml.patch new file mode 100644 index 000000000000..e8d089cbfd09 --- /dev/null +++ b/dev-ros/test_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/test/test_rosservice/test/check_rosservice_command_line_online.py b/test/test_rosservice/test/check_rosservice_command_line_online.py +index dc696adba..c75a52c15 100755 +--- a/test/test_rosservice/test/check_rosservice_command_line_online.py ++++ b/test/test_rosservice/test/check_rosservice_command_line_online.py +@@ -122,7 +122,7 @@ def test_rosservice(self): + output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0] + output = output.strip() + self.assert_(output, output) +- val = yaml.load(output)['header'] ++ val = yaml.safe_load(output)['header'] + self.assertEquals('', val['frame_id']) + self.assert_(val['seq'] >= 0) + self.assertEquals(0, val['stamp']['secs']) +@@ -131,7 +131,7 @@ def test_rosservice(self): + # test with auto headers + for v in ['{header: auto}', '{header: {stamp: now}}']: + output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0] +- val = yaml.load(output.strip())['header'] ++ val = yaml.safe_load(output.strip())['header'] + self.assertEquals('', val['frame_id']) + self.assert_(val['seq'] >= 0) + self.assert_(val['stamp']['secs'] >= int(t)) diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild +++ /dev/null @@ -1,30 +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" - -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[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild +++ /dev/null @@ -1,30 +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" - -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[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild +++ /dev/null @@ -1,30 +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" - -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[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild deleted file mode 100644 index 36347c5c5286..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild +++ /dev/null @@ -1,30 +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" - -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[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild deleted file mode 100644 index e129fbdc99eb..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild +++ /dev/null @@ -1,30 +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" - -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[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild deleted file mode 100644 index e129fbdc99eb..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild +++ /dev/null @@ -1,30 +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" - -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[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.0.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild index 36347c5c5286..eb480554239e 100644 --- a/dev-ros/test_rosservice/test_rosservice-1.13.0.ebuild +++ b/dev-ros/test_rosservice/test_rosservice-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 @@ -28,3 +28,4 @@ DEPEND="${RDEPEND} dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" ) diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild deleted file mode 100644 index e129fbdc99eb..000000000000 --- a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild +++ /dev/null @@ -1,30 +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" - -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[${CATKIN_MESSAGES_PYTHON_USEDEP}] - test? ( - dev-ros/test_rosmaster[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rostest[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest index ccd939b01402..3d0a1ebaa18a 100644 --- a/dev-ros/topic_tools/Manifest +++ b/dev-ros/topic_tools/Manifest @@ -1,8 +1 @@ -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 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3 diff --git a/dev-ros/topic_tools/files/yaml.patch b/dev-ros/topic_tools/files/yaml.patch new file mode 100644 index 000000000000..e783e321b7fb --- /dev/null +++ b/dev-ros/topic_tools/files/yaml.patch @@ -0,0 +1,53 @@ +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/topic_tools/scripts/relay_field b/tools/topic_tools/scripts/relay_field +index 6630b685d..cc73ac443 100755 +--- a/tools/topic_tools/scripts/relay_field ++++ b/tools/topic_tools/scripts/relay_field +@@ -98,7 +98,7 @@ class RelayField(object): + if self.input_fn is not None: + m = self.input_fn(m) + +- msg_generation = yaml.load(self.expression) ++ msg_generation = yaml.safe_load(self.expression) + pub_args = _eval_in_dict_impl(msg_generation, None, {'m': m}) + + now = rospy.get_rostime() diff --git a/dev-ros/topic_tools/topic_tools-1.13.1.ebuild b/dev-ros/topic_tools/topic_tools-1.13.1.ebuild deleted file mode 100644 index 22160468f6ca..000000000000 --- a/dev-ros/topic_tools/topic_tools-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" -CATKIN_HAS_MESSAGES=yes -ROS_SUBDIR=tools/${PN} -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Tools for directing, throttling and selecting ROS topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/rostime - dev-ros/xmlrpcpp -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-cpp/gtest - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/topic_tools/topic_tools-1.13.2.ebuild b/dev-ros/topic_tools/topic_tools-1.13.2.ebuild deleted file mode 100644 index 22160468f6ca..000000000000 --- a/dev-ros/topic_tools/topic_tools-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" -CATKIN_HAS_MESSAGES=yes -ROS_SUBDIR=tools/${PN} -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Tools for directing, throttling and selecting ROS topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/rostime - dev-ros/xmlrpcpp -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-cpp/gtest - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/topic_tools/topic_tools-1.13.4.ebuild b/dev-ros/topic_tools/topic_tools-1.13.4.ebuild deleted file mode 100644 index 22160468f6ca..000000000000 --- a/dev-ros/topic_tools/topic_tools-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" -CATKIN_HAS_MESSAGES=yes -ROS_SUBDIR=tools/${PN} -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Tools for directing, throttling and selecting ROS topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/rostime - dev-ros/xmlrpcpp -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-cpp/gtest - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/topic_tools/topic_tools-1.13.5.ebuild b/dev-ros/topic_tools/topic_tools-1.13.5.ebuild deleted file mode 100644 index 22160468f6ca..000000000000 --- a/dev-ros/topic_tools/topic_tools-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" -CATKIN_HAS_MESSAGES=yes -ROS_SUBDIR=tools/${PN} -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Tools for directing, throttling and selecting ROS topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/rostime - dev-ros/xmlrpcpp -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-cpp/gtest - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/topic_tools/topic_tools-1.13.6.ebuild b/dev-ros/topic_tools/topic_tools-1.13.6.ebuild deleted file mode 100644 index 227b9521dac4..000000000000 --- a/dev-ros/topic_tools/topic_tools-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" -CATKIN_HAS_MESSAGES=yes -ROS_SUBDIR=tools/${PN} -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Tools for directing, throttling and selecting ROS topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/rostime - dev-ros/xmlrpcpp -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-cpp/gtest - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/topic_tools/topic_tools-1.14.2.ebuild b/dev-ros/topic_tools/topic_tools-1.14.2.ebuild deleted file mode 100644 index 227b9521dac4..000000000000 --- a/dev-ros/topic_tools/topic_tools-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" -CATKIN_HAS_MESSAGES=yes -ROS_SUBDIR=tools/${PN} -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Tools for directing, throttling and selecting ROS topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/rostime - dev-ros/xmlrpcpp -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-cpp/gtest - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/topic_tools/topic_tools-1.13.0.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild index 22160468f6ca..ecddea9d6441 100644 --- a/dev-ros/topic_tools/topic_tools-1.13.0.ebuild +++ b/dev-ros/topic_tools/topic_tools-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-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" ) diff --git a/dev-ros/topic_tools/topic_tools-1.14.3.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3.ebuild deleted file mode 100644 index 227b9521dac4..000000000000 --- a/dev-ros/topic_tools/topic_tools-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" -CATKIN_HAS_MESSAGES=yes -ROS_SUBDIR=tools/${PN} -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Tools for directing, throttling and selecting ROS topics" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/cpp_common - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/rostime - dev-ros/xmlrpcpp -" -DEPEND="${RDEPEND} - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - dev-cpp/gtest - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild index 971c8789bb6b..e74122e5af50 100644 --- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild @@ -19,6 +19,7 @@ IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl +speex static-libs test theora upnp v4l video x264 X" +RESTRICT="!test? ( test )" REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio ) opengl? ( video ) theora? ( video ) diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild index e9a6f5f90cf3..d7a884894e3c 100644 --- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild +++ b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,6 +15,7 @@ SLOT="1" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss python ruby sndfile static-libs test" +RESTRICT="!test? ( test )" REQUIRED_USE="test? ( lv2 ) python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild index c4c92bb67f48..10ddfaa15a63 100644 --- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild +++ b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild @@ -23,6 +23,7 @@ IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gco ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf" +RESTRICT="!test? ( test )" # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac REQUIRED_USE=" ?? ( elogind systemd ) diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild index 990985e38c2e..d4986cdfa889 100644 --- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild +++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild @@ -23,6 +23,7 @@ IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gco ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf" +RESTRICT="!test? ( test )" # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac REQUIRED_USE=" ?? ( elogind systemd ) diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild index e9813d3a4464..471f5342c275 100644 --- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild +++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild @@ -23,6 +23,7 @@ IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gco ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf" +RESTRICT="!test? ( test )" # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac REQUIRED_USE=" ?? ( elogind systemd ) diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild index 5491a6115339..cf77737da1a3 100644 --- a/net-libs/onion/onion-0.8.ebuild +++ b/net-libs/onion/onion-0.8.ebuild @@ -29,6 +29,7 @@ IUSE=" test examples cxx -libev -libevent redis " +RESTRICT="!test? ( test )" RDEPEND=" gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild index de8dbb95ca03..88e7246cecfe 100644 --- a/net-libs/onion/onion-9999.ebuild +++ b/net-libs/onion/onion-9999.ebuild @@ -29,6 +29,7 @@ IUSE=" test examples cxx -libev -libevent redis " +RESTRICT="!test? ( test )" RDEPEND=" gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild index b2ba1c3eae19..855c2e53448b 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild @@ -14,6 +14,7 @@ KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \ mysql nntp pam perl postgres replication +server sieve snmp \ sqlite ssl static-libs tcpd test xapian" +RESTRICT="!test? ( test )" CDEPEND=" sys-libs/zlib:0= diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild index 4fe6676ef6dc..5f70b01ab23e 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild @@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \ mysql nntp pam perl postgres replication +server sieve snmp \ sqlite ssl static-libs tcpd test xapian" +RESTRICT="!test? ( test )" CDEPEND=" sys-libs/zlib:0= diff --git a/net-misc/eventd/eventd-0.27.0.ebuild b/net-misc/eventd/eventd-0.27.0.ebuild index f4197d8b68a3..3ddb82d0f980 100644 --- a/net-misc/eventd/eventd-0.27.0.ebuild +++ b/net-misc/eventd/eventd-0.27.0.ebuild @@ -16,6 +16,7 @@ IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification pulseaudio purple speech systemd test upnp wayland webhook websocket +X zeroconf" +RESTRICT="!test? ( test )" REQUIRED_USE=" X? ( notification ) fbcon? ( notification ) diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild index df8005f63804..0951ecf8cc02 100644 --- a/net-misc/lldpd/lldpd-1.0.3.ebuild +++ b/net-misc/lldpd/lldpd-1.0.3.ebuild @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion" +RESTRICT="!test? ( test )" RDEPEND="dev-libs/libbsd >=dev-libs/libevent-2.0.5:= diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild index 04dd3d66540b..b3e6c9c49fbb 100644 --- a/net-misc/lldpd/lldpd-1.0.4.ebuild +++ b/net-misc/lldpd/lldpd-1.0.4.ebuild @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion" +RESTRICT="!test? ( test )" RDEPEND="dev-libs/libbsd >=dev-libs/libevent-2.0.5:= diff --git a/sci-electronics/pcb/pcb-0_p20140316.ebuild b/sci-electronics/pcb/pcb-0_p20140316.ebuild index baeb85fd51e5..24b400cffc4b 100644 --- a/sci-electronics/pcb/pcb-0_p20140316.ebuild +++ b/sci-electronics/pcb/pcb-0_p20140316.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -15,6 +15,7 @@ KEYWORDS="amd64 ppc x86 ~x86-macos" IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png test tk toporouter xrender" # toporouter-output USE flag removed, there seems to be no result +RESTRICT="!test? ( test )" CDEPEND="dev-libs/glib:2 gif? ( >=media-libs/gd-2.0.23 ) diff --git a/sci-electronics/pcb/pcb-4.0.2.ebuild b/sci-electronics/pcb/pcb-4.0.2.ebuild index bf927c4ad92e..fbed2457df40 100644 --- a/sci-electronics/pcb/pcb-4.0.2.ebuild +++ b/sci-electronics/pcb/pcb-4.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos" IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png test tk toporouter xrender" # toporouter-output USE flag removed, there seems to be no result +RESTRICT="!test? ( test )" CDEPEND="dev-libs/glib:2 gif? ( media-libs/gd ) diff --git a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild index 84b5d41cf3b9..005b645b21cd 100644 --- a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild +++ b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild @@ -17,6 +17,7 @@ IUSE=" opencv png test tutorials usb v4l X xml +zbar zlib cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 " +RESTRICT="!test? ( test )" RDEPEND=" coin? ( >=media-libs/coin-4 virtual/opengl ) diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild index c6116343a93b..8e755d5722ee 100644 --- a/sci-libs/dlib/dlib-19.4.ebuild +++ b/sci-libs/dlib/dlib-19.4.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=6 @@ -14,6 +14,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="cblas debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X" +RESTRICT="!test? ( test )" # doc needs a bunch of deps not in portage diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild index 9a28b0fd7fbd..757633340138 100644 --- a/sci-physics/root/root-6.12.06-r11.ebuild +++ b/sci-physics/root/root-6.12.06-r11.ebuild @@ -20,6 +20,7 @@ IUSE="+X aqua +asimage +davix debug emacs +examples fits fftw fortran +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf" +RESTRICT="!test? ( test )" SLOT="$(ver_cut 1-2)/$(ver_cut 3)" LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild index e3ab9e14f94b..e49344b7ac00 100644 --- a/sci-physics/root/root-6.14.08-r4.ebuild +++ b/sci-physics/root/root-6.14.08-r4.ebuild @@ -21,6 +21,7 @@ IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf" +RESTRICT="!test? ( test )" SLOT="$(ver_cut 1-2)/$(ver_cut 3)" LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild index ba820931192f..e7826c4120ea 100644 --- a/sci-physics/root/root-6.16.00-r4.ebuild +++ b/sci-physics/root/root-6.16.00-r4.ebuild @@ -21,6 +21,7 @@ IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf" +RESTRICT="!test? ( test )" SLOT="$(ver_cut 1-2)/$(ver_cut 3)" LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04.ebuild index b39d88496bea..15388d192284 100644 --- a/sci-physics/root/root-6.18.04.ebuild +++ b/sci-physics/root/root-6.18.04.ebuild @@ -20,6 +20,7 @@ IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd" +RESTRICT="!test? ( test )" SLOT="$(ver_cut 1-2)/$(ver_cut 3)" LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index d35e726eab33..76552a477130 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -19,6 +19,7 @@ IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd" +RESTRICT="!test? ( test )" if [[ ${PV} =~ "9999" ]] ; then inherit git-r3 |