| 1 |
commit: aabb74b757d604aa524af81c800cb686260aa18c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 23 01:16:21 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 23 01:16:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=aabb74b7 |
| 7 |
|
| 8 |
python-utils-r1.eclass: sync with ::gentoo |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/python-utils-r1.eclass | 21 ++++++++++++++++++++- |
| 13 |
1 file changed, 20 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
| 16 |
index 5e035f86a9..9170229202 100644 |
| 17 |
--- a/eclass/python-utils-r1.eclass |
| 18 |
+++ b/eclass/python-utils-r1.eclass |
| 19 |
@@ -436,6 +436,12 @@ _python_export() { |
| 20 |
case ${impl} in |
| 21 |
python2.7) |
| 22 |
PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';; |
| 23 |
+ python3.8) |
| 24 |
+ PYTHON_PKG_DEP=">=dev-lang/python-3.8.8_p1-r1:3.8";; |
| 25 |
+ python3.9) |
| 26 |
+ PYTHON_PKG_DEP=">=dev-lang/python-3.9.6_p1-r1:3.9";; |
| 27 |
+ python3.10) |
| 28 |
+ PYTHON_PKG_DEP=">=dev-lang/python-3.10.0_p1-r1:3.10";; |
| 29 |
python*) |
| 30 |
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; |
| 31 |
pypy) |
| 32 |
@@ -1273,7 +1279,8 @@ build_sphinx() { |
| 33 |
sed -i -e 's:^intersphinx_mapping:disabled_&:' \ |
| 34 |
"${dir}"/conf.py || die |
| 35 |
# not all packages include the Makefile in pypi tarball |
| 36 |
- sphinx-build -b html -d "${dir}"/_build/doctrees "${dir}" \ |
| 37 |
+ "${EPYTHON}" -m sphinx.cmd.build \ |
| 38 |
+ -b html -d "${dir}"/_build/doctrees "${dir}" \ |
| 39 |
"${dir}"/_build/html || die |
| 40 |
|
| 41 |
HTML_DOCS+=( "${dir}/_build/html/." ) |
| 42 |
@@ -1320,6 +1327,16 @@ epytest() { |
| 43 |
|
| 44 |
_python_check_EPYTHON |
| 45 |
|
| 46 |
+ local color |
| 47 |
+ case ${NOCOLOR} in |
| 48 |
+ true|yes) |
| 49 |
+ color=no |
| 50 |
+ ;; |
| 51 |
+ *) |
| 52 |
+ color=yes |
| 53 |
+ ;; |
| 54 |
+ esac |
| 55 |
+ |
| 56 |
local args=( |
| 57 |
# verbose progress reporting and tracebacks |
| 58 |
-vv |
| 59 |
@@ -1331,6 +1348,8 @@ epytest() { |
| 60 |
# override filterwarnings=error, we do not really want -Werror |
| 61 |
# for end users, as it tends to fail on new warnings from deps |
| 62 |
-Wdefault |
| 63 |
+ # override color output |
| 64 |
+ "--color=${color}" |
| 65 |
) |
| 66 |
local x |
| 67 |
for x in "${EPYTEST_DESELECT[@]}"; do |
Archives