diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2020-07-29 14:35:52 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2020-07-29 14:58:33 +0200 |
| commit | 28d382db3659cfce5692a8ae4abb13dd9e0cacc2 (patch) | |
| tree | 7dbb0352ca8e174795d351517866754e5cad18a1 /dev-util/rosinstall_generator | |
| parent | dev-python/sphinxcontrib-doxylink: bump to 1.6.1 (diff) | |
| download | gentoo-28d382db3659cfce5692a8ae4abb13dd9e0cacc2.tar.gz gentoo-28d382db3659cfce5692a8ae4abb13dd9e0cacc2.tar.bz2 gentoo-28d382db3659cfce5692a8ae4abb13dd9e0cacc2.zip | |
dev-util/rosinstall_generator: bump to 0.1.22
add py37/38
fix tests
Closes: https://bugs.gentoo.org/683396
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-util/rosinstall_generator')
4 files changed, 59 insertions, 2 deletions
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest index 10d7e55e31ce..21ee7c23331d 100644 --- a/dev-util/rosinstall_generator/Manifest +++ b/dev-util/rosinstall_generator/Manifest @@ -1,2 +1,3 @@ DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904 +DIST rosinstall_generator-0.1.22.tar.gz 11902 BLAKE2B 6dd41c8b86146a9e50d4a20fd4991ed247de915d29f051c6dc416b6820386497ccf3a9cf6dde16e039932c354d7dfc5b6706bc206c16b068633fbddb69686452 SHA512 c1801ea441d1765090684a12e559a39ce496d08f91021b13d026a4127e5bc16974daa2cb561f0ed6c54a31216f57c1f3e257b4a96aec8255c34b37c5545123c6 diff --git a/dev-util/rosinstall_generator/files/yaml.patch b/dev-util/rosinstall_generator/files/yaml.patch new file mode 100644 index 000000000000..668e1ef58b71 --- /dev/null +++ b/dev-util/rosinstall_generator/files/yaml.patch @@ -0,0 +1,13 @@ +Index: rosinstall_generator-0.1.22/test/test_distro.py +=================================================================== +--- rosinstall_generator-0.1.22.orig/test/test_distro.py ++++ rosinstall_generator-0.1.22/test/test_distro.py +@@ -53,7 +53,7 @@ def _get_test_dist(): + type: distribution + version: 2 + ''' +- return DistributionFile('test', yaml.load(test_dist_yaml)) ++ return DistributionFile('test', yaml.safe_load(test_dist_yaml)) + + + def test_get_package_names(): diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild new file mode 100644 index 000000000000..5f551895c577 --- /dev/null +++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator" +fi + +inherit ${SCM} distutils-r1 + +DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks" +HOMEPAGE="http://wiki.ros.org/rosinstall_generator" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" +else + SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}] + >=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/nose[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" ) + +python_test() { + nosetests --with-coverage || die +} diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild index 2b89625c44ca..5f551895c577 100644 --- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild +++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -PYTHON_COMPAT=( python3_6 pypy3 ) +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -35,6 +35,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}/yaml.patch" ) python_test() { nosetests --with-coverage || die |