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 67B0D138359 for ; Thu, 2 Jul 2020 08:29:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ED09E0899; Thu, 2 Jul 2020 08:29:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 08D46E0899 for ; Thu, 2 Jul 2020 08:29:34 +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 089FA34F049 for ; Thu, 2 Jul 2020 08:29:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B43152CA for ; Thu, 2 Jul 2020 08:29:29 +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: <1593678554.16c2e7ec5b7b6da9dd8f23d3fe86bbe8b32be3f8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/tests/distutils-r1.sh X-VCS-Directories: eclass/tests/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 16c2e7ec5b7b6da9dd8f23d3fe86bbe8b32be3f8 X-VCS-Branch: master Date: Thu, 2 Jul 2020 08:29:29 +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: 9672f0c1-3496-4fef-b3dd-3ec2c8427207 X-Archives-Hash: 6a2843518ff98b9c55ea676cc8d4e7a2 commit: 16c2e7ec5b7b6da9dd8f23d3fe86bbe8b32be3f8 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 2 06:29:07 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 2 08:29:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c2e7ec eclass/tests/distutils-r1.sh: update for EAPI=7 / py3.8 Signed-off-by: Michał Górny gentoo.org> eclass/tests/distutils-r1.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh index 4c8e37b2617..b511e19d9e7 100755 --- a/eclass/tests/distutils-r1.sh +++ b/eclass/tests/distutils-r1.sh @@ -1,9 +1,9 @@ #!/bin/bash -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_8 ) source tests-common.sh test-phase_name_free() { @@ -21,18 +21,18 @@ test-distutils_enable_tests() { local runner=${1} local exp_IUSE=${2} local exp_RESTRICT=${3} - local exp_DEPEND=${4} + local exp_BDEPEND=${4} local IUSE=${IUSE} local RESTRICT=${RESTRICT} - local DEPEND=${DEPEND} + local BDEPEND=${BDEPEND} tbegin "${runner}" distutils_enable_tests "${runner}" local ret var - for var in IUSE RESTRICT DEPEND; do + for var in IUSE RESTRICT BDEPEND; do local exp_var=exp_${var} if [[ ${!var} != "${!exp_var}" ]]; then eindent @@ -62,8 +62,8 @@ tend einfo distutils_enable_tests eindent -BASE_IUSE="python_targets_python2_7" -BASE_DEPS="python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]" +BASE_IUSE="python_targets_python3_8" +BASE_DEPS="python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" TEST_RESTRICT=" !test? ( test )" einfo "empty RDEPEND"