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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5557C158088 for ; Fri, 28 Jan 2022 05:18:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FE1F2BC059; Fri, 28 Jan 2022 05:18:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B39B2BC059 for ; Fri, 28 Jan 2022 05:18:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D06483432C1 for ; Fri, 28 Jan 2022 05:18:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A0A92C3 for ; Fri, 28 Jan 2022 05:18:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643347008.96c23cb9b008aafdd5428c1c979f84fb6000a5e7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ropper/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ropper/ropper-1.13.6.ebuild dev-util/ropper/ropper-9999.ebuild X-VCS-Directories: dev-util/ropper/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 96c23cb9b008aafdd5428c1c979f84fb6000a5e7 X-VCS-Branch: master Date: Fri, 28 Jan 2022 05:18:42 +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: 2bb96cec-038a-4eba-a835-ea96e6727050 X-Archives-Hash: 2e09993c6a1a62b21337c15dc5ab58cd commit: 96c23cb9b008aafdd5428c1c979f84fb6000a5e7 Author: Sam James gentoo org> AuthorDate: Fri Jan 28 05:02:00 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 28 05:16:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c23cb9 dev-util/ropper: convert to PEP517; run tests See: https://github.com/gentoo/gentoo/pull/23806 Signed-off-by: Sam James gentoo.org> dev-util/ropper/ropper-1.13.6.ebuild | 15 +++++++++++---- dev-util/ropper/ropper-9999.ebuild | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dev-util/ropper/ropper-1.13.6.ebuild b/dev-util/ropper/ropper-1.13.6.ebuild index edf020a8ceb0..6bd50c5a169b 100644 --- a/dev-util/ropper/ropper-1.13.6.ebuild +++ b/dev-util/ropper/ropper-1.13.6.ebuild @@ -3,8 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..10} ) inherit distutils-r1 @@ -16,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/sashs/Ropper" else SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Ropper-${PV}" + S="${WORKDIR}"/Ropper-${PV} KEYWORDS="~amd64 ~x86" fi @@ -24,7 +25,6 @@ fi LICENSE="BSD" SLOT="0" IUSE="z3" -RESTRICT="test" RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -36,4 +36,11 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND}" -distutils_enable_tests setup.py +distutils_enable_tests unittest + +src_prepare() { + # Remove test which dies on trying to import itself (stub loader, not a real test) + rm test.py || die + + distutils-r1_src_prepare +} diff --git a/dev-util/ropper/ropper-9999.ebuild b/dev-util/ropper/ropper-9999.ebuild index edf020a8ceb0..6bd50c5a169b 100644 --- a/dev-util/ropper/ropper-9999.ebuild +++ b/dev-util/ropper/ropper-9999.ebuild @@ -3,8 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..10} ) inherit distutils-r1 @@ -16,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/sashs/Ropper" else SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Ropper-${PV}" + S="${WORKDIR}"/Ropper-${PV} KEYWORDS="~amd64 ~x86" fi @@ -24,7 +25,6 @@ fi LICENSE="BSD" SLOT="0" IUSE="z3" -RESTRICT="test" RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -36,4 +36,11 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND}" -distutils_enable_tests setup.py +distutils_enable_tests unittest + +src_prepare() { + # Remove test which dies on trying to import itself (stub loader, not a real test) + rm test.py || die + + distutils-r1_src_prepare +}