Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/
Date: Thu, 02 Jul 2020 08:29:36
Message-Id: 1593678554.16c2e7ec5b7b6da9dd8f23d3fe86bbe8b32be3f8.mgorny@gentoo
1 commit: 16c2e7ec5b7b6da9dd8f23d3fe86bbe8b32be3f8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 2 06:29:07 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 2 08:29:14 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c2e7ec
7
8 eclass/tests/distutils-r1.sh: update for EAPI=7 / py3.8
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/tests/distutils-r1.sh | 16 ++++++++--------
13 1 file changed, 8 insertions(+), 8 deletions(-)
14
15 diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh
16 index 4c8e37b2617..b511e19d9e7 100755
17 --- a/eclass/tests/distutils-r1.sh
18 +++ b/eclass/tests/distutils-r1.sh
19 @@ -1,9 +1,9 @@
20 #!/bin/bash
21 -# Copyright 1999-2015 Gentoo Foundation
22 +# Copyright 1999-2020 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=5
26 -PYTHON_COMPAT=( python2_7 )
27 +EAPI=7
28 +PYTHON_COMPAT=( python3_8 )
29 source tests-common.sh
30
31 test-phase_name_free() {
32 @@ -21,18 +21,18 @@ test-distutils_enable_tests() {
33 local runner=${1}
34 local exp_IUSE=${2}
35 local exp_RESTRICT=${3}
36 - local exp_DEPEND=${4}
37 + local exp_BDEPEND=${4}
38
39 local IUSE=${IUSE}
40 local RESTRICT=${RESTRICT}
41 - local DEPEND=${DEPEND}
42 + local BDEPEND=${BDEPEND}
43
44 tbegin "${runner}"
45
46 distutils_enable_tests "${runner}"
47
48 local ret var
49 - for var in IUSE RESTRICT DEPEND; do
50 + for var in IUSE RESTRICT BDEPEND; do
51 local exp_var=exp_${var}
52 if [[ ${!var} != "${!exp_var}" ]]; then
53 eindent
54 @@ -62,8 +62,8 @@ tend
55
56 einfo distutils_enable_tests
57 eindent
58 -BASE_IUSE="python_targets_python2_7"
59 -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(-)]"
60 +BASE_IUSE="python_targets_python3_8"
61 +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(-)]"
62 TEST_RESTRICT=" !test? ( test )"
63
64 einfo "empty RDEPEND"