1 |
The DISTUTILS_USE_SETUPTOOLS check is now done in install-qa-check.d, |
2 |
so remove the duplicate. |
3 |
|
4 |
Signed-off-by: Michał Górny <mgorny@g.o> |
5 |
--- |
6 |
eclass/distutils-r1.eclass | 42 -------------------------------------- |
7 |
1 file changed, 42 deletions(-) |
8 |
|
9 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
10 |
index e0e7a945ab87..25cb67b78a31 100644 |
11 |
--- a/eclass/distutils-r1.eclass |
12 |
+++ b/eclass/distutils-r1.eclass |
13 |
@@ -455,47 +455,6 @@ distutils_enable_tests() { |
14 |
return 0 |
15 |
} |
16 |
|
17 |
-# @FUNCTION: _distutils-r1_verify_use_setuptools |
18 |
-# @INTERNAL |
19 |
-# @DESCRIPTION: |
20 |
-# Check setup.py for signs that DISTUTILS_USE_SETUPTOOLS have been set |
21 |
-# incorrectly. |
22 |
-_distutils_verify_use_setuptools() { |
23 |
- [[ ${DISTUTILS_OPTIONAL} ]] && return |
24 |
- [[ ${DISTUTILS_USE_SETUPTOOLS} == manual ]] && return |
25 |
- [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]] && return |
26 |
- |
27 |
- # ok, those are cheap greps. we can try toimprove them if we hit |
28 |
- # false positives. |
29 |
- local expected=no |
30 |
- if [[ ${CATEGORY}/${PN} == dev-python/setuptools ]]; then |
31 |
- # as a special case, setuptools provides itself ;-) |
32 |
- : |
33 |
- elif grep -E -q -s '(from|import)\s+setuptools' setup.py; then |
34 |
- if grep -E -q -s 'entry_points\s*=' setup.py; then |
35 |
- expected=rdepend |
36 |
- elif grep -F -q -s '[options.entry_points]' setup.cfg; then |
37 |
- expected=rdepend |
38 |
- elif grep -F -q -s '[entry_points]' setup.cfg; then # pbr |
39 |
- expected=rdepend |
40 |
- else |
41 |
- expected=bdepend |
42 |
- fi |
43 |
- fi |
44 |
- |
45 |
- if [[ ${DISTUTILS_USE_SETUPTOOLS} != ${expected} ]]; then |
46 |
- if [[ ! ${_DISTUTILS_SETUPTOOLS_WARNED} ]]; then |
47 |
- _DISTUTILS_SETUPTOOLS_WARNED=1 |
48 |
- local def= |
49 |
- [[ ${DISTUTILS_USE_SETUPTOOLS} == bdepend ]] && def=' (default?)' |
50 |
- |
51 |
- eqawarn "DISTUTILS_USE_SETUPTOOLS value is probably incorrect" |
52 |
- eqawarn " value: DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}${def}" |
53 |
- eqawarn " expected: DISTUTILS_USE_SETUPTOOLS=${expected}" |
54 |
- fi |
55 |
- fi |
56 |
-} |
57 |
- |
58 |
# @FUNCTION: esetup.py |
59 |
# @USAGE: [<args>...] |
60 |
# @DESCRIPTION: |
61 |
@@ -518,7 +477,6 @@ esetup.py() { |
62 |
[[ ${EAPI} != [45] ]] && die_args+=( -n ) |
63 |
|
64 |
[[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg |
65 |
- _distutils_verify_use_setuptools |
66 |
|
67 |
set -- "${EPYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}" |
68 |
|
69 |
-- |
70 |
2.28.0 |