From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48CC2158013 for ; Sun, 26 Sep 2021 17:45:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D2B1E0A07; Sun, 26 Sep 2021 17:45:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 461B6E0A07 for ; Sun, 26 Sep 2021 17:45:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B8AE342B78 for ; Sun, 26 Sep 2021 17:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3EE7105 for ; Sun, 26 Sep 2021 17:45:26 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1632678311.6851dd2506a943e2a3a7ebae29b441655f657f92.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/vcstools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/vcstools/vcstools-0.1.42.ebuild X-VCS-Directories: dev-python/vcstools/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 6851dd2506a943e2a3a7ebae29b441655f657f92 X-VCS-Branch: master Date: Sun, 26 Sep 2021 17:45:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b4f7a29-f952-4b4c-aed8-900c4e4b6ba2 X-Archives-Hash: 6a8819bf8debb77080868f4866b96677 commit: 6851dd2506a943e2a3a7ebae29b441655f657f92 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Sep 26 17:39:30 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sun Sep 26 17:45:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6851dd25 dev-python/vcstools: enable py3.9, enable py3.10 Signed-off-by: Arthur Zamarin gentoo.org> dev-python/vcstools/vcstools-0.1.42.ebuild | 56 ++++++++++++++---------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild index 08041294117..beea876d550 100644 --- a/dev-python/vcstools/vcstools-0.1.42.ebuild +++ b/dev-python/vcstools/vcstools-0.1.42.ebuild @@ -2,58 +2,56 @@ # 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/vcstools" -fi +PYTHON_COMPAT=( python3_{8..10} ) -inherit ${SCM} distutils-r1 +inherit distutils-r1 DESCRIPTION="Python library for interacting with various VCS systems" HOMEPAGE="https://wiki.ros.org/vcstools" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi +SRC_URI=" + http://download.ros.org/downloads/${PN}/${P}.tar.gz + https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz +" LICENSE="BSD" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" +KEYWORDS="~amd64 ~arm" RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" BDEPEND="test? ( - dev-python/nose[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] dev-vcs/git - dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) " + PATCHES=( "${FILESDIR}/yaml.patch" ) -python_test() { +distutils_enable_tests nose + +src_prepare() { + # Those fail because of broken upstream testing + rm test/test_bzr.py || die + sed -e 's/test_checkout_timeout/_&/' -i test/test_git.py || die + + distutils-r1_src_prepare +} + +src_test() { # From travis.yml # Set git config to silence some stuff in the tests - git config --global user.email "foo@example.com" - git config --global user.name "Foo Bar" + git config --global user.email "foo@example.com" || die + git config --global user.name "Foo Bar" || die # Set the hg user - echo -e "[ui]\nusername = Your Name " >> ~/.hgrc - # Set the bzr user - bzr whoami "Your Name " - #git config --global user.email "you@example.com" - #git config --global user.name "Your Name" + cat > ~/.hgrc <<- EOF || die + [ui] + username = Your Name + EOF - nosetests --with-coverage --cover-package vcstools || die + distutils-r1_src_test }