commit: 29671e13c2b2a8c498e8062da02383f69e2ffe78 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 29 06:24:11 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat Jan 29 06:30:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29671e13
dev-util/wstool: enable py3.9, py3.10, cleanup Closes: https://bugs.gentoo.org/832247 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-util/wstool/wstool-0.1.18.ebuild | 43 ++++++++++++++---------------------- dev-util/wstool/wstool-9999.ebuild | 43 ++++++++++++++---------------------- 2 files changed, 34 insertions(+), 52 deletions(-) diff --git a/dev-util/wstool/wstool-0.1.18.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild index 48cc34f6d138..643dad95a575 100644 --- a/dev-util/wstool/wstool-0.1.18.ebuild +++ b/dev-util/wstool/wstool-0.1.18.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8} ) -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/vcstools/wstool"; -fi - -inherit ${SCM} distutils-r1 +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_IN_SOURCE_BUILD="yes" +inherit distutils-r1 DESCRIPTION="Commands to manage several local SCM repositories for ROS" HOMEPAGE="https://wiki.ros.org/wstool"; -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vcstools/wstool"; else SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -25,38 +22,32 @@ fi LICENSE="BSD" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND} +BDEPEND="${RDEPEND} + dev-python/sphinx test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) " -BDEPEND=" - dev-python/sphinx -" -DISTUTILS_IN_SOURCE_BUILD="yes" +distutils_enable_tests nose -python_test() { +src_test() { # From travis.yml # Set git config to silence some stuff in the tests - git config --global user.email "[email protected]" - git config --global user.name "Foo Bar" + git config --global user.email "[email protected]" || die + git config --global user.name "Foo Bar" || die # Set the hg user - echo -e "[ui]\nusername = Your Name <[email protected]>" >> ~/.hgrc + echo -e "[ui]\nusername = Your Name <[email protected]>" >> ~/.hgrc || die # Set the bzr user - bzr whoami "Your Name <[email protected]>" + bzr whoami "Your Name <[email protected]>" || die # command to run tests - nosetests --with-coverage --cover-package=wstool || die + distutils-r1_src_test } diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild index 48cc34f6d138..643dad95a575 100644 --- a/dev-util/wstool/wstool-9999.ebuild +++ b/dev-util/wstool/wstool-9999.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8} ) -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/vcstools/wstool"; -fi - -inherit ${SCM} distutils-r1 +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_IN_SOURCE_BUILD="yes" +inherit distutils-r1 DESCRIPTION="Commands to manage several local SCM repositories for ROS" HOMEPAGE="https://wiki.ros.org/wstool"; -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vcstools/wstool"; else SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -25,38 +22,32 @@ fi LICENSE="BSD" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND} +BDEPEND="${RDEPEND} + dev-python/sphinx test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) " -BDEPEND=" - dev-python/sphinx -" -DISTUTILS_IN_SOURCE_BUILD="yes" +distutils_enable_tests nose -python_test() { +src_test() { # From travis.yml # Set git config to silence some stuff in the tests - git config --global user.email "[email protected]" - git config --global user.name "Foo Bar" + git config --global user.email "[email protected]" || die + git config --global user.name "Foo Bar" || die # Set the hg user - echo -e "[ui]\nusername = Your Name <[email protected]>" >> ~/.hgrc + echo -e "[ui]\nusername = Your Name <[email protected]>" >> ~/.hgrc || die # Set the bzr user - bzr whoami "Your Name <[email protected]>" + bzr whoami "Your Name <[email protected]>" || die # command to run tests - nosetests --with-coverage --cover-package=wstool || die + distutils-r1_src_test }
