Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 24/28] distutils-r1.eclass: Require >=pyproject2setuppy-15
Date: Sun, 20 Jun 2021 10:03:52
Message-Id: 20210620095552.625633-25-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/28] python-r1 suite EAPI 8 support/cleanup by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/distutils-r1.eclass | 5 ++---
4 1 file changed, 2 insertions(+), 3 deletions(-)
5
6 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
7 index d7a476f48586..1446d2cda749 100644
8 --- a/eclass/distutils-r1.eclass
9 +++ b/eclass/distutils-r1.eclass
10 @@ -129,7 +129,7 @@ _distutils_set_globals() {
11 rdep+=" ${setuptools_dep}"
12 ;;
13 pyproject.toml)
14 - bdep+=' dev-python/pyproject2setuppy[${PYTHON_USEDEP}]'
15 + bdep+=' >=dev-python/pyproject2setuppy-15[${PYTHON_USEDEP}]'
16 ;;
17 *)
18 die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}"
19 @@ -465,8 +465,7 @@ esetup.py() {
20
21 local setup_py=( setup.py )
22 if [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]]; then
23 - # TODO: remove '.main' when we require v10
24 - setup_py=( -m pyproject2setuppy.main )
25 + setup_py=( -m pyproject2setuppy )
26 fi
27
28 if [[ ${EAPI} != [67] && ${mydistutilsargs[@]} ]]; then
29 --
30 2.32.0