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 5AB2A139345 for ; Sat, 3 Jul 2021 16:06:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39289E0884; Sat, 3 Jul 2021 16:06:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20AE4E0884 for ; Sat, 3 Jul 2021 16:06:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0150335D9F for ; Sat, 3 Jul 2021 16:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22DD7798 for ; Sat, 3 Jul 2021 16:06:46 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1625328397.6c06e84a87074b755f9666849315d841ffa66468.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pbr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pbr/pbr-5.6.0.ebuild X-VCS-Directories: dev-python/pbr/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6c06e84a87074b755f9666849315d841ffa66468 X-VCS-Branch: master Date: Sat, 3 Jul 2021 16:06:46 +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: e3a82915-adb2-40b9-8191-f0d46f2dd1d2 X-Archives-Hash: ed49646379365712c52147293da1ac81 commit: 6c06e84a87074b755f9666849315d841ffa66468 Author: Michał Górny gentoo org> AuthorDate: Sat Jul 3 09:39:30 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 3 16:06:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c06e84a dev-python/pbr: Use unittest instead of stestr Signed-off-by: Michał Górny gentoo.org> dev-python/pbr/pbr-5.6.0.ebuild | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/dev-python/pbr/pbr-5.6.0.ebuild b/dev-python/pbr/pbr-5.6.0.ebuild index a59c1d35b29..7c12cac8e10 100644 --- a/dev-python/pbr/pbr-5.6.0.ebuild +++ b/dev-python/pbr/pbr-5.6.0.ebuild @@ -3,10 +3,8 @@ EAPI=7 -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{8..9} pypy3 ) PYTHON_REQ_USE="threads(+)" - inherit distutils-r1 DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" @@ -16,8 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 @@ -34,11 +30,11 @@ BDEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0[${PYTHON_USEDEP}] dev-vcs/git ' 'python*') )" -PDEPEND="" + +distutils_enable_tests unittest # This normally actually belongs here. python_prepare_all() { @@ -56,16 +52,11 @@ python_prepare_all() { } python_test() { - if [[ ${EPYTHON} == pypy3 ]]; then + if [[ ${EPYTHON} != python* ]]; then einfo "Testing on ${EPYTHON} is not supported at the moment" return fi distutils_install_for_testing - local -x PATH=${TEST_DIR}/scripts:${PATH} - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - stestr init || die "stestr init failed under ${EPYTHON}" - stestr run || die "stestr run failed under ${EPYTHON}" + eunittest -b }