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 A75061580B9 for ; Sun, 22 Aug 2021 23:02:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A850BE0867; Sun, 22 Aug 2021 23:02:00 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DE945E0867 for ; Sun, 22 Aug 2021 23:01:59 +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 A98473409D8 for ; Sun, 22 Aug 2021 23:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F20ED7F3 for ; Sun, 22 Aug 2021 23:01:56 +0000 (UTC) From: "Louis Sautier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Louis Sautier" Message-ID: <1629673210.a7a79b82d38c779754a945e63f1b032c120a7d87.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker-compose/docker-compose-1.29.2.ebuild X-VCS-Directories: app-emulation/docker-compose/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: a7a79b82d38c779754a945e63f1b032c120a7d87 X-VCS-Branch: master Date: Sun, 22 Aug 2021 23:01:56 +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: 76ab7a81-864c-4286-8430-6b4f12c26621 X-Archives-Hash: 7cfa2caea41a5d8ca9bb900bf687abf5 commit: a7a79b82d38c779754a945e63f1b032c120a7d87 Author: Louis Sautier gentoo org> AuthorDate: Sat Aug 7 11:30:19 2021 +0000 Commit: Louis Sautier gentoo org> CommitDate: Sun Aug 22 23:00:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a79b82 app-emulation/docker-compose: enable py3.10, use epytest Also rely on distutils_enable_tests to set RESTRICT and IUSE. Closes: https://github.com/gentoo/gentoo/pull/21905 Signed-off-by: Louis Sautier gentoo.org> app-emulation/docker-compose/docker-compose-1.29.2.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild index cec99a23828..f61fc3f500a 100644 --- a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit bash-completion-r1 distutils-r1 @@ -16,10 +16,8 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 arm64" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +RDEPEND=" >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] >=dev-python/docker-py-5[${PYTHON_USEDEP}] @@ -43,6 +41,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/compose-${MY_PV}" +distutils_enable_tests pytest + PATCHES=( # Bug #679968 -- https://bugs.gentoo.org/679968 # Bug #681002 -- https://bugs.gentoo.org/681002 @@ -60,7 +60,7 @@ src_prepare() { python_test() { distutils_install_for_testing - ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" + epytest tests/unit/ } python_install_all() {