From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/
Date: Fri, 31 Dec 2021 09:10:11 +0000 (UTC) [thread overview]
Message-ID: <1640941498.2faf25df671629e393ccae66c98683bd3521cbb2.mgorny@gentoo> (raw)
commit: 2faf25df671629e393ccae66c98683bd3521cbb2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 09:04:58 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 09:04:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2faf25df
eclass/tests: Update expected deps in distutils-r1 tests
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
eclass/tests/distutils-r1.sh | 6 +++---
eclass/tests/distutils-r1_single.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh
index 163a509b3068..1ccb1dfbc523 100755
--- a/eclass/tests/distutils-r1.sh
+++ b/eclass/tests/distutils-r1.sh
@@ -97,7 +97,7 @@ tend
einfo distutils_enable_tests
eindent
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(-)]"
+BASE_DEPS="python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]"
TEST_RESTRICT="!test? ( test )"
einfo "empty RDEPEND"
@@ -131,11 +131,11 @@ eoutdent
einfo DISTUTILS_USE_SETUPTOOLS
eindent
-SETUPTOOLS_DEP=">=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]"
+SETUPTOOLS_DEP=">=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]"
test-DISTUTILS_USE_SETUPTOOLS no "${BASE_DEPS}" "${BASE_DEPS}"
test-DISTUTILS_USE_SETUPTOOLS bdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS}"
test-DISTUTILS_USE_SETUPTOOLS rdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS} ${SETUPTOOLS_DEP}"
-test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} dev-python/pyproject2setuppy[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" "${BASE_DEPS}"
+test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?]" "${BASE_DEPS}"
test-DISTUTILS_USE_SETUPTOOLS manual "${BASE_DEPS}" "${BASE_DEPS}"
eoutdent
diff --git a/eclass/tests/distutils-r1_single.sh b/eclass/tests/distutils-r1_single.sh
index fb177261d0a0..56b62ca0e90f 100755
--- a/eclass/tests/distutils-r1_single.sh
+++ b/eclass/tests/distutils-r1_single.sh
@@ -115,7 +115,7 @@ SETUPTOOLS_DEP="python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2
test-DISTUTILS_USE_SETUPTOOLS no "${BASE_DEPS}" "${BASE_DEPS}"
test-DISTUTILS_USE_SETUPTOOLS bdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS}"
test-DISTUTILS_USE_SETUPTOOLS rdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS} ${SETUPTOOLS_DEP}"
-test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} python_single_target_python3_8? ( dev-python/pyproject2setuppy[python_targets_python3_8(-)] )" "${BASE_DEPS}"
+test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)] )" "${BASE_DEPS}"
test-DISTUTILS_USE_SETUPTOOLS manual "${BASE_DEPS}" "${BASE_DEPS}"
eoutdent
next reply other threads:[~2021-12-31 9:10 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-31 9:10 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-15 5:20 [gentoo-commits] repo/gentoo:master commit in: eclass/tests/ Sam James
2025-08-08 17:39 Sam James
2025-08-04 21:22 Sam James
2025-08-04 21:22 Sam James
2025-08-04 20:04 Sam James
2025-08-04 20:03 Sam James
2025-08-04 20:03 Sam James
2025-08-04 19:19 Sam James
2025-08-04 19:19 Sam James
2025-07-23 22:36 Sam James
2025-07-23 22:36 Sam James
2025-06-13 9:21 Sam James
2025-06-13 8:52 Sam James
2025-06-13 8:32 Sam James
2025-06-13 8:32 Sam James
2025-06-10 7:59 Sam James
2025-05-23 18:59 Michał Górny
2025-05-06 8:46 Sam James
2025-05-02 18:25 Michał Górny
2025-05-02 8:06 Petr Vaněk
2025-05-01 11:36 Michał Górny
2024-12-30 11:35 Michał Górny
2024-12-30 11:35 Michał Górny
2024-12-21 8:11 Michał Górny
2024-12-20 20:39 Michał Górny
2024-12-20 20:39 Michał Górny
2024-12-09 18:49 Ulrich Müller
2024-09-19 4:13 Sam James
2024-09-18 15:51 Sam James
2024-09-18 15:51 Sam James
2024-08-07 8:58 Andrew Ammerlaan
2024-08-07 8:58 Andrew Ammerlaan
2024-08-06 8:47 Michał Górny
2024-08-06 8:47 Michał Górny
2024-07-29 17:02 Michał Górny
2024-07-28 9:32 Ulrich Müller
2024-06-13 19:53 Ulrich Müller
2024-06-13 19:53 Ulrich Müller
2024-06-13 18:35 Ulrich Müller
2024-06-13 18:35 Ulrich Müller
2024-06-12 16:47 Ulrich Müller
2024-06-12 15:35 Michał Górny
2024-06-12 15:32 Ulrich Müller
2024-06-12 9:47 Ulrich Müller
2024-05-25 8:24 Ulrich Müller
2023-11-03 19:00 Michał Górny
2023-09-14 5:30 Michał Górny
2023-06-18 14:57 Michał Górny
2023-06-17 10:10 Michał Górny
2023-06-15 12:19 Michał Górny
2023-05-23 4:36 Michał Górny
2023-05-01 13:43 Sam James
2023-04-20 23:14 Sam James
2022-12-14 10:18 Michał Górny
2022-10-28 8:24 Michał Górny
2022-10-15 17:35 Mike Gilbert
2022-10-10 20:52 Michał Górny
2022-10-01 17:19 Michał Górny
2022-10-01 17:19 Michał Górny
2022-09-27 20:28 Michał Górny
2022-05-09 20:33 Michał Górny
2022-05-09 20:33 Michał Górny
2022-04-21 15:19 Michał Górny
2022-04-19 21:32 Mike Gilbert
2022-02-14 21:13 Mike Gilbert
2022-02-14 17:25 Mike Gilbert
2021-12-31 9:10 Michał Górny
2021-12-31 9:10 Michał Górny
2021-06-22 20:44 David Seifert
2021-05-12 20:55 Mike Gilbert
2021-05-12 19:39 Michał Górny
2021-05-05 18:20 Michał Górny
2021-03-28 11:48 Michał Górny
2020-11-23 18:11 Ulrich Müller
2020-07-02 8:29 Michał Górny
2020-07-02 8:29 Michał Górny
2020-07-02 8:29 Michał Górny
2020-07-02 8:29 Michał Górny
2020-06-19 11:52 Michał Górny
2020-05-28 11:41 Michał Górny
2020-05-10 1:02 Sergei Trofimovich
2020-04-30 9:45 Michał Górny
2020-04-19 16:47 Michał Górny
2020-03-30 13:11 Michał Górny
2020-03-30 11:57 Michał Górny
2020-03-27 23:54 Sergei Trofimovich
2020-02-27 16:29 Michał Górny
2020-02-09 18:09 Michał Górny
2019-12-23 11:47 Sergei Trofimovich
2019-12-13 22:37 Sergei Trofimovich
2019-12-07 16:59 Michał Górny
2019-12-01 11:29 Sergei Trofimovich
2019-11-24 15:09 Michał Górny
2019-11-20 20:30 Sergei Trofimovich
2019-11-20 19:51 Sergei Trofimovich
2019-11-20 9:23 Michał Górny
2019-11-20 9:16 Michał Górny
2019-11-20 9:15 Michał Górny
2019-11-20 9:00 Michał Górny
2019-11-20 9:00 Michał Górny
2019-11-20 9:00 Michał Górny
2019-11-20 8:46 Michał Górny
2019-11-20 8:46 Michał Górny
2019-11-20 8:46 Michał Górny
2019-11-20 7:47 Michał Górny
2019-11-06 22:44 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2017-09-19 13:15 Michał Górny
2017-09-14 19:05 Mike Gilbert
2017-08-08 19:42 Michał Górny
2017-04-14 16:28 Michał Górny
2017-03-08 7:35 Michał Górny
2016-06-27 5:58 Michał Górny
2016-01-08 5:14 Michał Górny
2015-12-09 20:42 Michał Górny
2015-11-21 19:58 Ulrich Müller
2015-11-12 16:03 Michał Górny
2015-11-11 10:27 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1640941498.2faf25df671629e393ccae66c98683bd3521cbb2.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox