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 2FE53138350 for ; Thu, 6 Feb 2020 22:57:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FFF0E08FC; Thu, 6 Feb 2020 22:57:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 49F9CE08FC for ; Thu, 6 Feb 2020 22:57:21 +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 1966434E82B for ; Thu, 6 Feb 2020 22:57:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A95C8EE for ; Thu, 6 Feb 2020 22:57:17 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1581029831.897be22576a166416a7f2b15e757b6690d024d9b.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/certbot/certbot-1.2.0-r1.ebuild app-crypt/certbot/certbot-1.2.0.ebuild app-crypt/certbot/certbot-9999.ebuild X-VCS-Directories: app-crypt/certbot/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 897be22576a166416a7f2b15e757b6690d024d9b X-VCS-Branch: master Date: Thu, 6 Feb 2020 22:57:17 +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: 9ae98fb9-b979-49ce-9714-df09c875e626 X-Archives-Hash: f74b372bda66b2b79972048778199199 commit: 897be22576a166416a7f2b15e757b6690d024d9b Author: Matthew Thode gentoo org> AuthorDate: Thu Feb 6 22:56:10 2020 +0000 Commit: Matthew Thode gentoo org> CommitDate: Thu Feb 6 22:57:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897be225 app-crypt/certbot: fix testing, again Closes: https://bugs.gentoo.org/708506 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Matthew Thode gentoo.org> .../{certbot-1.2.0.ebuild => certbot-1.2.0-r1.ebuild} | 18 ++++++++---------- app-crypt/certbot/certbot-9999.ebuild | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app-crypt/certbot/certbot-1.2.0.ebuild b/app-crypt/certbot/certbot-1.2.0-r1.ebuild similarity index 84% rename from app-crypt/certbot/certbot-1.2.0.ebuild rename to app-crypt/certbot/certbot-1.2.0-r1.ebuild index ec673774775..c81039179f5 100644 --- a/app-crypt/certbot/certbot-1.2.0.ebuild +++ b/app-crypt/certbot/certbot-1.2.0-r1.ebuild @@ -38,14 +38,12 @@ RDEPEND=" dev-python/pytz[${PYTHON_USEDEP}] dev-python/zope-component[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - # acme is not installed, removing it here is fine, the dir just confuses tests - rm -R ../acme - pytest -vv ${PN} || die +DEPEND="${CDEPEND}" + +distutils_enable_tests pytest + +python_prepare_all() { + # required as deps of deps can trigger this too... + echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini + distutils-r1_python_prepare_all } diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index ec673774775..c81039179f5 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.ebuild @@ -38,14 +38,12 @@ RDEPEND=" dev-python/pytz[${PYTHON_USEDEP}] dev-python/zope-component[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - # acme is not installed, removing it here is fine, the dir just confuses tests - rm -R ../acme - pytest -vv ${PN} || die +DEPEND="${CDEPEND}" + +distutils_enable_tests pytest + +python_prepare_all() { + # required as deps of deps can trigger this too... + echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini + distutils-r1_python_prepare_all }