1 |
commit: 2faf25df671629e393ccae66c98683bd3521cbb2 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 31 09:04:58 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 31 09:04:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2faf25df |
7 |
|
8 |
eclass/tests: Update expected deps in distutils-r1 tests |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
eclass/tests/distutils-r1.sh | 6 +++--- |
13 |
eclass/tests/distutils-r1_single.sh | 2 +- |
14 |
2 files changed, 4 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh |
17 |
index 163a509b3068..1ccb1dfbc523 100755 |
18 |
--- a/eclass/tests/distutils-r1.sh |
19 |
+++ b/eclass/tests/distutils-r1.sh |
20 |
@@ -97,7 +97,7 @@ tend |
21 |
einfo distutils_enable_tests |
22 |
eindent |
23 |
BASE_IUSE="python_targets_python3_8" |
24 |
-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(-)]" |
25 |
+BASE_DEPS="python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]" |
26 |
TEST_RESTRICT="!test? ( test )" |
27 |
|
28 |
einfo "empty RDEPEND" |
29 |
@@ -131,11 +131,11 @@ eoutdent |
30 |
|
31 |
einfo DISTUTILS_USE_SETUPTOOLS |
32 |
eindent |
33 |
-SETUPTOOLS_DEP=">=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" |
34 |
+SETUPTOOLS_DEP=">=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]" |
35 |
test-DISTUTILS_USE_SETUPTOOLS no "${BASE_DEPS}" "${BASE_DEPS}" |
36 |
test-DISTUTILS_USE_SETUPTOOLS bdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS}" |
37 |
test-DISTUTILS_USE_SETUPTOOLS rdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS} ${SETUPTOOLS_DEP}" |
38 |
-test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} dev-python/pyproject2setuppy[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" "${BASE_DEPS}" |
39 |
+test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?]" "${BASE_DEPS}" |
40 |
test-DISTUTILS_USE_SETUPTOOLS manual "${BASE_DEPS}" "${BASE_DEPS}" |
41 |
eoutdent |
42 |
|
43 |
|
44 |
diff --git a/eclass/tests/distutils-r1_single.sh b/eclass/tests/distutils-r1_single.sh |
45 |
index fb177261d0a0..56b62ca0e90f 100755 |
46 |
--- a/eclass/tests/distutils-r1_single.sh |
47 |
+++ b/eclass/tests/distutils-r1_single.sh |
48 |
@@ -115,7 +115,7 @@ SETUPTOOLS_DEP="python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2 |
49 |
test-DISTUTILS_USE_SETUPTOOLS no "${BASE_DEPS}" "${BASE_DEPS}" |
50 |
test-DISTUTILS_USE_SETUPTOOLS bdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS}" |
51 |
test-DISTUTILS_USE_SETUPTOOLS rdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS} ${SETUPTOOLS_DEP}" |
52 |
-test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} python_single_target_python3_8? ( dev-python/pyproject2setuppy[python_targets_python3_8(-)] )" "${BASE_DEPS}" |
53 |
+test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)] )" "${BASE_DEPS}" |
54 |
test-DISTUTILS_USE_SETUPTOOLS manual "${BASE_DEPS}" "${BASE_DEPS}" |
55 |
eoutdent |