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 D945F1392E8 for ; Mon, 5 Jul 2021 08:59:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DDB7E0A6A; Mon, 5 Jul 2021 08:59:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 26D87E0A6A for ; Mon, 5 Jul 2021 08:59:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3950833D5A5 for ; Mon, 5 Jul 2021 08:59:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6B982B for ; Mon, 5 Jul 2021 08:59:26 +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: <1625475563.1bf69820b0ea05e5180d6d5e4da4e0f09dc26cca.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/linecache2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/linecache2/linecache2-1.0.0-r1.ebuild X-VCS-Directories: dev-python/linecache2/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1bf69820b0ea05e5180d6d5e4da4e0f09dc26cca X-VCS-Branch: master Date: Mon, 5 Jul 2021 08:59: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: d78ceef1-3517-46e1-b125-9cb92b4fdbfc X-Archives-Hash: 9cb7ff78ae81ec86897bc90730005c92 commit: 1bf69820b0ea05e5180d6d5e4da4e0f09dc26cca Author: Michał Górny gentoo org> AuthorDate: Mon Jul 5 08:57:36 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jul 5 08:59:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf69820 dev-python/linecache2: Eliminate unittest2 dep Signed-off-by: Michał Górny gentoo.org> dev-python/linecache2/linecache2-1.0.0-r1.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild index 9b0a2e825b1..aab01856e99 100644 --- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild +++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +EAPI=8 +PYTHON_COMPAT=( python3_{8..9} pypy3 ) inherit distutils-r1 DESCRIPTION="Backports of the linecache module" @@ -14,16 +13,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" BDEPEND=" dev-python/pbr[${PYTHON_USEDEP}] test? ( dev-python/fixtures[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] )" -python_test() { - "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}" +distutils_enable_tests unittest + +src_prepare() { + # eliminate unittest2 dep + sed -i -e '/unittest/s:2 as.*::' linecache2/tests/test_linecache.py || die + distutils-r1_src_prepare }