From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-python/rospkg/Manifest | 9 ++++-- dev-python/rospkg/files/yaml_load.patch | 52 +++++++++++++++++++++++++++++++++ dev-python/rospkg/rospkg-1.1.10.ebuild | 1 + dev-python/rospkg/rospkg-1.1.9.ebuild | 1 + dev-python/rospkg/rospkg-1.2.0.ebuild | 50 +++++++++++++++++++++++++++++++ dev-python/rospkg/rospkg-9999.ebuild | 8 +++-- 6 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 dev-python/rospkg/files/yaml_load.patch create mode 100644 dev-python/rospkg/rospkg-1.2.0.ebuild (limited to 'dev-python/rospkg') diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest index c4214a141ca9..a8cb0768e822 100644 --- a/dev-python/rospkg/Manifest +++ b/dev-python/rospkg/Manifest @@ -1,7 +1,10 @@ AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153 +AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8 DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6 -EBUILD rospkg-1.1.10.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f -EBUILD rospkg-1.1.9.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f -EBUILD rospkg-9999.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f +DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db +EBUILD rospkg-1.1.10.ebuild 1137 BLAKE2B e9b5927662118402785ac65a039ac9236066697d56b58790a5399107b84c01ab9fbc65564d5d8b5f6aa585271546621c736a28eebf14f757407de4f35f9c474e SHA512 003019a978f33f108cae8eb9f992655a8b98361c5756c70a87785ee54c4064d0496c02ff8f6667e5fc7fa8d42f765af6c01ee3609b1169085e9e436ae5bf348d +EBUILD rospkg-1.1.9.ebuild 1137 BLAKE2B e9b5927662118402785ac65a039ac9236066697d56b58790a5399107b84c01ab9fbc65564d5d8b5f6aa585271546621c736a28eebf14f757407de4f35f9c474e SHA512 003019a978f33f108cae8eb9f992655a8b98361c5756c70a87785ee54c4064d0496c02ff8f6667e5fc7fa8d42f765af6c01ee3609b1169085e9e436ae5bf348d +EBUILD rospkg-1.2.0.ebuild 1212 BLAKE2B c2d19b5e4edce654b1110fff01cf2ff2f660b9e2886804f003a0f5576f05424ff8846a7a63c35d5895a0e5f4799b65c2f87091a80465b05330def5c70e984308 SHA512 797d7f67d46d09bbe1e974fac303b73e762adda097ec0bdce3511a48b507b98a38f43c5544518e1b2a5d2cfcfc462edffadf08368a03ce1fd47aef3e17d17e8a +EBUILD rospkg-9999.ebuild 1212 BLAKE2B c2d19b5e4edce654b1110fff01cf2ff2f660b9e2886804f003a0f5576f05424ff8846a7a63c35d5895a0e5f4799b65c2f87091a80465b05330def5c70e984308 SHA512 797d7f67d46d09bbe1e974fac303b73e762adda097ec0bdce3511a48b507b98a38f43c5544518e1b2a5d2cfcfc462edffadf08368a03ce1fd47aef3e17d17e8a MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7 diff --git a/dev-python/rospkg/files/yaml_load.patch b/dev-python/rospkg/files/yaml_load.patch new file mode 100644 index 000000000000..f56b6db59ad8 --- /dev/null +++ b/dev-python/rospkg/files/yaml_load.patch @@ -0,0 +1,52 @@ +Index: rospkg-1.2.0/src/rospkg/distro.py +=================================================================== +--- rospkg-1.2.0.orig/src/rospkg/distro.py ++++ rospkg-1.2.0/src/rospkg/distro.py +@@ -192,14 +192,14 @@ def load_distro(source_uri): + if os.path.isfile(source_uri): + # load rosdistro file + with open(source_uri) as f: +- raw_data = yaml.load(f.read()) ++ raw_data = yaml.safe_load(f.read()) + else: + try: + request = urlopen(source_uri) + except Exception as e: + raise ResourceNotFound('%s (%s)' % (str(e), source_uri)) + try: +- raw_data = yaml.load(request) ++ raw_data = yaml.safe_load(request) + except ValueError: + raise ResourceNotFound(source_uri) + if not type(raw_data) == dict: +Index: rospkg-1.2.0/test/test_rospkg_distro.py +=================================================================== +--- rospkg-1.2.0.orig/test/test_rospkg_distro.py ++++ rospkg-1.2.0/test/test_rospkg_distro.py +@@ -315,7 +315,7 @@ def test_load_distro_simple(): + + assert distro.release_name == 'simple', distro.release_name + assert distro.version == '1', distro.version +- assert yaml.load(open(p)) == distro.raw_data, distro.raw_data ++ assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data + assert set(distro.variants.keys()) == set(['base']) + assert set(distro.stacks.keys()) == set(['stack1']) + +@@ -334,7 +334,7 @@ def test_load_distro_diamondback(): + + assert distro.release_name == 'diamondback', distro.release_name + assert distro.version == 'r8596', distro.version +- assert yaml.load(open(p)) == distro.raw_data, distro.raw_data ++ assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data + assert set(distro.variants.keys()) == set(diamondback_variants) + assert set(distro.stacks.keys()) == set(diamondback_stacks), set(distro.stacks.keys()) ^ set(diamondback_stacks) + +@@ -350,7 +350,7 @@ def test_load_distro_diamondback(): + + def test__load_variants(): + from rospkg.distro import _load_variants +- raw_data = yaml.load("""variants: ++ raw_data = yaml.safe_load("""variants: + - ros-base: + stacks: [ros, ros_comm] + - ros-full: diff --git a/dev-python/rospkg/rospkg-1.1.10.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild index 0e81f9b79bb0..4043929c6edf 100644 --- a/dev-python/rospkg/rospkg-1.1.10.ebuild +++ b/dev-python/rospkg/rospkg-1.1.10.ebuild @@ -28,6 +28,7 @@ fi LICENSE="BSD" SLOT="0" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" BDEPEND=" diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild index 0e81f9b79bb0..4043929c6edf 100644 --- a/dev-python/rospkg/rospkg-1.1.9.ebuild +++ b/dev-python/rospkg/rospkg-1.1.9.ebuild @@ -28,6 +28,7 @@ fi LICENSE="BSD" SLOT="0" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" BDEPEND=" diff --git a/dev-python/rospkg/rospkg-1.2.0.ebuild b/dev-python/rospkg/rospkg-1.2.0.ebuild new file mode 100644 index 000000000000..d798eb107040 --- /dev/null +++ b/dev-python/rospkg/rospkg-1.2.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} ) + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg" +fi + +inherit ${SCM} distutils-r1 + +DESCRIPTION="Standalone Python library for the ROS package system" +HOMEPAGE="http://wiki.ros.org/rospkg" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" + # Needed for tests + S="${WORKDIR}/${PN}" + EGIT_CHECKOUT_DIR="${S}" +else + SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/catkin_pkg[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} ${BDEPEND} + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" ) + +python_test() { + nosetests --with-coverage --cover-package=rospkg --with-xunit test || die +} diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild index 0e81f9b79bb0..d798eb107040 100644 --- a/dev-python/rospkg/rospkg-9999.ebuild +++ b/dev-python/rospkg/rospkg-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} ) SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -28,8 +28,10 @@ fi LICENSE="BSD" SLOT="0" IUSE="test" +RESTRICT="!test? ( test )" -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" +RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/catkin_pkg[${PYTHON_USEDEP}]" BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( @@ -41,7 +43,7 @@ DEPEND="${RDEPEND} ${BDEPEND} dev-python/mock[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/gentoo.patch" ) +PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" ) python_test() { nosetests --with-coverage --cover-package=rospkg --with-xunit test || die -- cgit v1.2.3