/[gentoo-x86]/eclass/python.eclass
Gentoo

Diff of /eclass/python.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.129 Revision 1.161
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.129 2011/08/19 10:18:59 lxnay Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.161 2012/11/24 21:07:14 mgorny Exp $
4 4
5# @ECLASS: python.eclass 5# @ECLASS: python.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Gentoo Python Project <python@gentoo.org> 7# Gentoo Python Project <python@gentoo.org>
8# @BLURB: Eclass for Python packages 8# @BLURB: Eclass for Python packages
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The python eclass contains miscellaneous, useful functions for Python packages. 10# The python eclass contains miscellaneous, useful functions for Python packages.
11 11
12if [[ ${_PYTHON_UTILS_R1} ]]; then
13 die 'python.eclass can not be used with python-r1 suite eclasses.'
14fi
15
16# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
17if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
12inherit multilib 18 inherit multilib
19fi
13 20
21# Export pkg_setup every time to avoid issues with eclass inheritance order.
22if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
23 EXPORT_FUNCTIONS pkg_setup
24fi
25
26# Avoid processing this eclass more than once.
27if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
28_PYTHON_ECLASS_INHERITED="1"
29
14if ! has "${EAPI:-0}" 0 1 2 3; then 30if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 31 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 32fi
17 33
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 34_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3) 35_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 36_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
21_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.5) 37_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9)
22_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]}) 38_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
23 39
24# ================================================================================================ 40# ================================================================================================
25# ===================================== HANDLING OF METADATA ===================================== 41# ===================================== HANDLING OF METADATA =====================================
26# ================================================================================================ 42# ================================================================================================
86 102
87 return 1 103 return 1
88 fi 104 fi
89} 105}
90 106
107_python_implementation() {
108 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
109 return 0
110 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
111 return 0
112 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
113 return 0
114 else
115 return 1
116 fi
117}
118
91_python_package_supporting_installation_for_multiple_python_abis() { 119_python_package_supporting_installation_for_multiple_python_abis() {
92 if has "${EAPI:-0}" 0 1 2 3 4; then
93 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 120 [[ -n "${SUPPORT_PYTHON_ABIS}" ]]
94 return 0
95 else
96 return 1
97 fi
98 else
99 die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
100 fi
101} 121}
102 122
103# @ECLASS-VARIABLE: PYTHON_DEPEND 123# @ECLASS-VARIABLE: PYTHON_DEPEND
104# @DESCRIPTION: 124# @DESCRIPTION:
105# Specification of dependency on dev-lang/python. 125# Specification of dependency on dev-lang/python.
231 else 251 else
232 die "Invalid syntax of PYTHON_DEPEND" 252 die "Invalid syntax of PYTHON_DEPEND"
233 fi 253 fi
234} 254}
235 255
256if _python_implementation; then
236DEPEND=">=app-admin/eselect-python-20091230" 257 DEPEND=">=app-admin/eselect-python-20091230"
237RDEPEND="${DEPEND}" 258 RDEPEND="${DEPEND}"
259 PDEPEND="app-admin/python-updater"
260fi
238 261
239if [[ -n "${PYTHON_DEPEND}" ]]; then 262if [[ -n "${PYTHON_DEPEND}" ]]; then
240 _python_parse_PYTHON_DEPEND 263 _python_parse_PYTHON_DEPEND
241else 264else
242 _PYTHON_ATOMS=("dev-lang/python") 265 _PYTHON_ATOMS=("dev-lang/python")
281 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}" 304 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}"
282 fi 305 fi
283 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then 306 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
284 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )" 307 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )"
285 fi 308 fi
286 DEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 309 DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
287 RDEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 310 RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
288 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY 311 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY
289fi 312fi
290 313
291unset _PYTHON_ATOMS 314unset _PYTHON_ATOMS
292 315
293# ================================================================================================ 316# ================================================================================================
294# =================================== MISCELLANEOUS FUNCTIONS ==================================== 317# =================================== MISCELLANEOUS FUNCTIONS ====================================
295# ================================================================================================ 318# ================================================================================================
296
297_python_implementation() {
298 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
299 return 0
300 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
301 return 0
302 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
303 return 0
304 else
305 return 1
306 fi
307}
308 319
309_python_abi-specific_local_scope() { 320_python_abi-specific_local_scope() {
310 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] 321 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
311} 322}
312 323
384 _CYAN= 395 _CYAN=
385 _NORMAL= 396 _NORMAL=
386 fi 397 fi
387} 398}
388 399
389unset PYTHON_PKG_SETUP_EXECUTED
390
391_python_check_python_pkg_setup_execution() { 400_python_check_python_pkg_setup_execution() {
392 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return 401 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
393 402
394 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then 403 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
395 die "python_pkg_setup() not called" 404 die "python_pkg_setup() not called"
419 export EPYTHON="$(PYTHON -f)" 428 export EPYTHON="$(PYTHON -f)"
420 else 429 else
421 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}" 430 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
422 fi 431 fi
423 432
424 if has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; then 433 if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; then
425 if [[ "${PYTHON_USE_WITH_OPT}" ]]; then 434 if [[ "${PYTHON_USE_WITH_OPT}" ]]; then
426 if [[ "${PYTHON_USE_WITH_OPT}" == !* ]]; then 435 if [[ "${PYTHON_USE_WITH_OPT}" == !* ]]; then
427 use ${PYTHON_USE_WITH_OPT#!} && return 436 use ${PYTHON_USE_WITH_OPT#!} && return
428 else 437 else
429 use !${PYTHON_USE_WITH_OPT} && return 438 use !${PYTHON_USE_WITH_OPT} && return
463 fi 472 fi
464 473
465 PYTHON_PKG_SETUP_EXECUTED="1" 474 PYTHON_PKG_SETUP_EXECUTED="1"
466} 475}
467 476
468if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
469 EXPORT_FUNCTIONS pkg_setup
470fi
471
472_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)' 477_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
473 478
474# @FUNCTION: python_convert_shebangs 479# @FUNCTION: python_convert_shebangs
475# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 480# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
476# @DESCRIPTION: 481# @DESCRIPTION:
477# Convert shebangs in specified files. Directories can be specified only with --recursive option. 482# Convert shebangs in specified files. Directories can be specified only with --recursive option.
478python_convert_shebangs() { 483python_convert_shebangs() {
479 _python_check_python_pkg_setup_execution 484 _python_check_python_pkg_setup_execution
480 485
481 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" 486 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
482 487
483 while (($#)); do 488 while (($#)); do
484 case "$1" in 489 case "$1" in
485 -r|--recursive) 490 -r|--recursive)
486 recursive="1" 491 recursive="1"
541 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 546 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
542 547
543 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 548 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then
544 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue 549 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
545 550
551 shebangs_converted="1"
552
546 if [[ "${quiet}" == "0" ]]; then 553 if [[ "${quiet}" == "0" ]]; then
547 einfo "Converting shebang in '${file}'" 554 einfo "Converting shebang in '${file}'"
548 fi 555 fi
549 556
550 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed" 557 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
551 fi 558 fi
559 done
560
561 if [[ "${shebangs_converted}" == "0" ]]; then
562 ewarn "${FUNCNAME}(): Python scripts not found"
563 fi
564}
565
566# @FUNCTION: python_clean_py-compile_files
567# @USAGE: [-q|--quiet]
568# @DESCRIPTION:
569# Clean py-compile files to disable byte-compilation.
570python_clean_py-compile_files() {
571 _python_check_python_pkg_setup_execution
572
573 local file files=() quiet="0"
574
575 while (($#)); do
576 case "$1" in
577 -q|--quiet)
578 quiet="1"
579 ;;
580 -*)
581 die "${FUNCNAME}(): Unrecognized option '$1'"
582 ;;
583 *)
584 die "${FUNCNAME}(): Invalid usage"
585 ;;
586 esac
587 shift
588 done
589
590 while read -d $'\0' -r file; do
591 files+=("${file#./}")
592 done < <(find -name py-compile -type f -print0)
593
594 for file in "${files[@]}"; do
595 if [[ "${quiet}" == "0" ]]; then
596 einfo "Cleaning '${file}' file"
597 fi
598 echo "#!/bin/sh" > "${file}"
552 done 599 done
553} 600}
554 601
555# @FUNCTION: python_clean_installation_image 602# @FUNCTION: python_clean_installation_image
556# @USAGE: [-q|--quiet] 603# @USAGE: [-q|--quiet]
699 if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then 746 if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then
700 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install 747 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
701 fi 748 fi
702fi 749fi
703 750
704if has "${EAPI:-0}" 0 1 2 3 4; then
705 unset PYTHON_ABIS 751unset PYTHON_ABIS
706fi
707 752
708_python_calculate_PYTHON_ABIS() { 753_python_calculate_PYTHON_ABIS() {
709 if ! _python_package_supporting_installation_for_multiple_python_abis; then 754 if ! _python_package_supporting_installation_for_multiple_python_abis; then
710 die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 755 die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
711 fi 756 fi
712 757
713 _python_initial_sanity_checks 758 _python_initial_sanity_checks
714 759
715 if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3 4; then 760 if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]]; then
716 local PYTHON_ABI 761 local PYTHON_ABI
717 762
718 if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then 763 if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then
719 local cpython_enabled="0" 764 local cpython_enabled="0"
720 765
794 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}" 839 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
795 fi 840 fi
796 else 841 else
797 python3_version="" 842 python3_version=""
798 fi 843 fi
844 fi
845
846 if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
847 eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
848 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
849 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
850 eerror " dev-lang/python:${PYTHON_ABI}"
851 fi
852 done
853 die "No supported version of CPython installed"
799 fi 854 fi
800 855
801 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then 856 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then
802 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink" 857 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
803 eerror "is set incorrectly. Use \`eselect python\` to fix configuration." 858 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
961 python_default_function() { 1016 python_default_function() {
962 emake "$@" 1017 emake "$@"
963 } 1018 }
964 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 1019 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
965 python_default_function() { 1020 python_default_function() {
1021 # Stolen from portage's _eapi0_src_test()
1022 local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
966 if emake -j1 -n check &> /dev/null; then 1023 if ${emake_cmd} -j1 -n check &> /dev/null; then
967 emake -j1 check "$@" 1024 ${emake_cmd} -j1 check "$@"
968 elif emake -j1 -n test &> /dev/null; then 1025 elif ${emake_cmd} -j1 -n test &> /dev/null; then
969 emake -j1 test "$@" 1026 ${emake_cmd} -j1 test "$@"
970 fi 1027 fi
971 } 1028 }
972 elif [[ "${EBUILD_PHASE}" == "install" ]]; then 1029 elif [[ "${EBUILD_PHASE}" == "install" ]]; then
973 python_default_function() { 1030 python_default_function() {
974 emake DESTDIR="${D}" install "$@" 1031 emake DESTDIR="${D}" install "$@"
1231import os 1288import os
1232import re 1289import re
1233import subprocess 1290import subprocess
1234import sys 1291import sys
1235 1292
1236cpython_re = re.compile(r"^python(\d+\.\d+)$") 1293cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1294jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1295pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1296cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1237jython_re = re.compile(r"^jython(\d+\.\d+)$") 1297jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1238pypy_re = re.compile(r"^pypy-c(\d+\.\d+)$") 1298pypy_interpreter_re = re.compile(r"^pypy-c(\d+\.\d+)$")
1239python_shebang_re = re.compile(r"^#! *(${EPREFIX}/usr/bin/python|(${EPREFIX})?/usr/bin/env +(${EPREFIX}/usr/bin/)?python)") 1299cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1300python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
1240python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") 1301python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1241 1302
1242pypy_versions_mapping = { 1303pypy_versions_mapping = {
1243 "1.5": "2.7" 1304 "1.5": "2.7",
1305 "1.6": "2.7",
1306 "1.7": "2.7",
1307 "1.8": "2.7",
1308 "1.9": "2.7",
1244} 1309}
1245 1310
1246def get_PYTHON_ABI(EPYTHON): 1311def get_PYTHON_ABI(python_interpreter):
1247 cpython_matched = cpython_re.match(EPYTHON) 1312 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1248 jython_matched = jython_re.match(EPYTHON) 1313 jython_matched = jython_interpreter_re.match(python_interpreter)
1249 pypy_matched = pypy_re.match(EPYTHON) 1314 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1250 if cpython_matched is not None: 1315 if cpython_matched is not None:
1251 PYTHON_ABI = cpython_matched.group(1) 1316 PYTHON_ABI = cpython_matched.group(1)
1252 elif jython_matched is not None: 1317 elif jython_matched is not None:
1253 PYTHON_ABI = jython_matched.group(1) + "-jython" 1318 PYTHON_ABI = jython_matched.group(1) + "-jython"
1254 elif pypy_matched is not None: 1319 elif pypy_matched is not None:
1255 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1) 1320 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1256 else: 1321 else:
1257 PYTHON_ABI = None 1322 PYTHON_ABI = None
1258 return PYTHON_ABI 1323 return PYTHON_ABI
1259 1324
1325def get_python_interpreter(PYTHON_ABI):
1326 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1327 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1328 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1329 if cpython_matched is not None:
1330 python_interpreter = "python" + cpython_matched.group(1)
1331 elif jython_matched is not None:
1332 python_interpreter = "jython" + jython_matched.group(1)
1333 elif pypy_matched is not None:
1334 python_interpreter = "pypy-c" + pypy_matched.group(1)
1335 else:
1336 python_interpreter = None
1337 return python_interpreter
1338
1260EOF 1339EOF
1261 if [[ "$?" != "0" ]]; then 1340 if [[ "$?" != "0" ]]; then
1262 die "${FUNCNAME}(): Generation of '$1' failed" 1341 die "${FUNCNAME}(): Generation of '$1' failed"
1263 fi 1342 fi
1264 if [[ "${respect_EPYTHON}" == "1" ]]; then 1343 if [[ "${respect_EPYTHON}" == "1" ]]; then
1265 cat << EOF >> "${file}" 1344 cat << EOF >> "${file}"
1266EPYTHON = os.environ.get("EPYTHON") 1345python_interpreter = os.environ.get("EPYTHON")
1267if EPYTHON: 1346if python_interpreter:
1268 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1347 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1269 if PYTHON_ABI is None: 1348 if PYTHON_ABI is None:
1270 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1349 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1271 sys.exit(1) 1350 sys.exit(1)
1272else: 1351else:
1273 try: 1352 try:
1274 environment = os.environ.copy() 1353 environment = os.environ.copy()
1275 environment["ROOT"] = "/" 1354 environment["ROOT"] = "/"
1278 raise ValueError 1357 raise ValueError
1279 except (OSError, ValueError): 1358 except (OSError, ValueError):
1280 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1359 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1281 sys.exit(1) 1360 sys.exit(1)
1282 1361
1283 EPYTHON = eselect_process.stdout.read() 1362 python_interpreter = eselect_process.stdout.read()
1284 if not isinstance(EPYTHON, str): 1363 if not isinstance(python_interpreter, str):
1285 # Python 3 1364 # Python 3
1286 EPYTHON = EPYTHON.decode() 1365 python_interpreter = python_interpreter.decode()
1287 EPYTHON = EPYTHON.rstrip("\n") 1366 python_interpreter = python_interpreter.rstrip("\n")
1288 1367
1289 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1368 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1290 if PYTHON_ABI is None: 1369 if PYTHON_ABI is None:
1291 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1370 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1292 sys.exit(1) 1371 sys.exit(1)
1293 1372
1294wrapper_script_path = os.path.realpath(sys.argv[0]) 1373wrapper_script_path = os.path.realpath(sys.argv[0])
1295target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1374target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1296if not os.path.exists(target_executable_path): 1375if not os.path.exists(target_executable_path):
1310 raise ValueError 1389 raise ValueError
1311except (OSError, ValueError): 1390except (OSError, ValueError):
1312 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1391 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1313 sys.exit(1) 1392 sys.exit(1)
1314 1393
1315EPYTHON = eselect_process.stdout.read() 1394python_interpreter = eselect_process.stdout.read()
1316if not isinstance(EPYTHON, str): 1395if not isinstance(python_interpreter, str):
1317 # Python 3 1396 # Python 3
1318 EPYTHON = EPYTHON.decode() 1397 python_interpreter = python_interpreter.decode()
1319EPYTHON = EPYTHON.rstrip("\n") 1398python_interpreter = python_interpreter.rstrip("\n")
1320 1399
1321PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1400PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1322if PYTHON_ABI is None: 1401if PYTHON_ABI is None:
1323 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1402 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1324 sys.exit(1) 1403 sys.exit(1)
1325 1404
1326wrapper_script_path = os.path.realpath(sys.argv[0]) 1405wrapper_script_path = os.path.realpath(sys.argv[0])
1327for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1406for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1328 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1407 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1329 if os.path.exists(target_executable_path): 1408 if os.path.exists(target_executable_path):
1330 break 1409 break
1331else: 1410else:
1332 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path)) 1411 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1333 sys.exit(1) 1412 sys.exit(1)
1413
1414python_interpreter = get_python_interpreter(PYTHON_ABI)
1415if python_interpreter is None:
1416 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1417 sys.exit(1)
1334EOF 1418EOF
1335 if [[ "$?" != "0" ]]; then 1419 if [[ "$?" != "0" ]]; then
1336 die "${FUNCNAME}(): Generation of '$1' failed" 1420 die "${FUNCNAME}(): Generation of '$1' failed"
1337 fi 1421 fi
1338 fi 1422 fi
1339 cat << EOF >> "${file}" 1423 cat << EOF >> "${file}"
1340 1424
1341target_executable = open(target_executable_path, "rb") 1425target_executable = open(target_executable_path, "rb")
1342target_executable_first_line = target_executable.readline() 1426target_executable_first_line = target_executable.readline()
1427target_executable.close()
1343if not isinstance(target_executable_first_line, str): 1428if not isinstance(target_executable_first_line, str):
1344 # Python 3 1429 # Python 3
1345 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1430 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1346 1431
1432options = []
1433python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1434if python_shebang_options_matched is not None:
1435 options = [python_shebang_options_matched.group(1)]
1436
1347python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1437cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1348target_executable.close()
1349 1438
1350if python_shebang_matched is not None: 1439if cpython_shebang_matched is not None:
1351 try: 1440 try:
1352 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1441 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1353 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1442 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1354 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1443 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1355 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1444 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1356 if python_verification_process.wait() != 0: 1445 if python_verification_process.wait() != 0:
1357 raise ValueError 1446 raise ValueError
1362 python_verification_output = python_verification_output.decode() 1451 python_verification_output = python_verification_output.decode()
1363 1452
1364 if not python_verification_output_re.match(python_verification_output): 1453 if not python_verification_output_re.match(python_verification_output):
1365 raise ValueError 1454 raise ValueError
1366 1455
1367 if cpython_re.match(EPYTHON) is not None: 1456 if cpython_interpreter_re.match(python_interpreter) is not None:
1368 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1457 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1369 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1458 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1370 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1459 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1371 1460
1372 if hasattr(os, "execv"): 1461 if hasattr(os, "execv"):
1373 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1462 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1374 else: 1463 else:
1375 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1464 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1376 except (KeyboardInterrupt, SystemExit): 1465 except (KeyboardInterrupt, SystemExit):
1377 raise 1466 raise
1378 except: 1467 except:
1379 pass 1468 pass
1380 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"): 1469 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"):
1564 fi 1653 fi
1565 done 1654 done
1566 1655
1567 popd > /dev/null || die "popd failed" 1656 popd > /dev/null || die "popd failed"
1568 1657
1658 # This is per bug #390691, without the duplication refactor, and with
1659 # the 3-way structure per comment #6. This enable users with old
1660 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1661 # before coreutils can be upgraded).
1662 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1663 cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1569 if ROOT="/" has_version sys-apps/coreutils; then 1664 elif ROOT="/" has_version sys-apps/coreutils; then
1570 cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1665 cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1571 else 1666 else
1572 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1667 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1573 fi 1668 fi
1574 done 1669 done
1593 stdout = sys.stdout.buffer 1688 stdout = sys.stdout.buffer
1594else: 1689else:
1595 # Python 2 1690 # Python 2
1596 stdout = sys.stdout 1691 stdout = sys.stdout
1597 1692
1693python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1598files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1694files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1695python_wrapper_scripts_file.close()
1599 1696
1600for file in sorted(files): 1697for file in sorted(files):
1601 stdout.write(file) 1698 stdout.write(file)
1602 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1699 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1603 1700
1668 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1765 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1669 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1766 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1670} 1767}
1671 1768
1672# @FUNCTION: python_need_rebuild 1769# @FUNCTION: python_need_rebuild
1770# @DESCRIPTION:
1673# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1771# Mark current package for rebuilding by python-updater after
1674# switching of active version of Python. 1772# switching of active version of Python.
1675python_need_rebuild() { 1773python_need_rebuild() {
1676 if _python_package_supporting_installation_for_multiple_python_abis; then 1774 if _python_package_supporting_installation_for_multiple_python_abis; then
1677 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs" 1775 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1678 fi 1776 fi
2377_python_test_hook() { 2475_python_test_hook() {
2378 if [[ "$#" -ne 1 ]]; then 2476 if [[ "$#" -ne 1 ]]; then
2379 die "${FUNCNAME}() requires 1 argument" 2477 die "${FUNCNAME}() requires 1 argument"
2380 fi 2478 fi
2381 2479
2382 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2480 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2383 "${FUNCNAME[3]}_$1_hook" 2481 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2384 fi 2482 fi
2385} 2483}
2386 2484
2387# @FUNCTION: python_execute_nosetests 2485# @FUNCTION: python_execute_nosetests
2388# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2486# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
2422 python_test_function() { 2520 python_test_function() {
2423 local evaluated_PYTHONPATH 2521 local evaluated_PYTHONPATH
2424 2522
2425 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2523 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2426 2524
2427 _python_test_hook pre 2525 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2428 2526
2429 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2527 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2430 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2528 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2431 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2529 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2432 else 2530 else
2433 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2531 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2434 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2532 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2435 fi 2533 fi
2436 2534
2437 _python_test_hook post 2535 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2438 } 2536 }
2439 if _python_package_supporting_installation_for_multiple_python_abis; then 2537 if _python_package_supporting_installation_for_multiple_python_abis; then
2440 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2538 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2441 else 2539 else
2442 if [[ -n "${separate_build_dirs}" ]]; then 2540 if [[ -n "${separate_build_dirs}" ]]; then
2486 python_test_function() { 2584 python_test_function() {
2487 local evaluated_PYTHONPATH 2585 local evaluated_PYTHONPATH
2488 2586
2489 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2587 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2490 2588
2491 _python_test_hook pre 2589 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2492 2590
2493 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2591 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2494 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2592 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL}
2495 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?" 2593 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2496 else 2594 else
2497 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2595 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2498 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2596 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2499 fi 2597 fi
2500 2598
2501 _python_test_hook post 2599 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2502 } 2600 }
2503 if _python_package_supporting_installation_for_multiple_python_abis; then 2601 if _python_package_supporting_installation_for_multiple_python_abis; then
2504 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2602 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2505 else 2603 else
2506 if [[ -n "${separate_build_dirs}" ]]; then 2604 if [[ -n "${separate_build_dirs}" ]]; then
2550 python_test_function() { 2648 python_test_function() {
2551 local evaluated_PYTHONPATH 2649 local evaluated_PYTHONPATH
2552 2650
2553 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2651 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2554 2652
2555 _python_test_hook pre 2653 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2556 2654
2557 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2655 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2558 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2656 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2559 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2657 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2560 else 2658 else
2561 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2659 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2562 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2660 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2563 fi 2661 fi
2564 2662
2565 _python_test_hook post 2663 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2566 } 2664 }
2567 if _python_package_supporting_installation_for_multiple_python_abis; then 2665 if _python_package_supporting_installation_for_multiple_python_abis; then
2568 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2666 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2569 else 2667 else
2570 if [[ -n "${separate_build_dirs}" ]]; then 2668 if [[ -n "${separate_build_dirs}" ]]; then
2607 fi 2705 fi
2608 2706
2609 export PYTHONDONTWRITEBYTECODE="1" 2707 export PYTHONDONTWRITEBYTECODE="1"
2610} 2708}
2611 2709
2710_python_vecho() {
2711 [[ -z ${PORTAGE_VERBOSE} ]] || echo "$@"
2712}
2713
2612_python_clean_compiled_modules() { 2714_python_clean_compiled_modules() {
2613 _python_initialize_prefix_variables 2715 _python_initialize_prefix_variables
2614 _python_set_color_variables 2716 _python_set_color_variables
2615 2717
2616 [[ "${FUNCNAME[1]}" =~ ^(python_mod_optimize|python_mod_cleanup)$ ]] || die "${FUNCNAME}(): Invalid usage" 2718 [[ "${FUNCNAME[1]}" =~ ^(python_mod_optimize|python_mod_cleanup)$ ]] || die "${FUNCNAME}(): Invalid usage"
2629 2731
2630 if [[ "${EBUILD_PHASE}" == "postrm" ]]; then 2732 if [[ "${EBUILD_PHASE}" == "postrm" ]]; then
2631 # Delete empty child directories. 2733 # Delete empty child directories.
2632 find "${path}" -type d | sort -r | while read -r dir; do 2734 find "${path}" -type d | sort -r | while read -r dir; do
2633 if rmdir "${dir}" 2> /dev/null; then 2735 if rmdir "${dir}" 2> /dev/null; then
2634 echo "${_CYAN}<<< ${dir}${_NORMAL}" 2736 _python_vecho "<<< ${dir}"
2635 fi 2737 fi
2636 done 2738 done
2637 fi 2739 fi
2638 elif [[ "${path}" == *.py ]]; then 2740 elif [[ "${path}" == *.py ]]; then
2639 base_module_name="${path##*/}" 2741 base_module_name="${path##*/}"
2662 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2764 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2663 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2765 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2664 else 2766 else
2665 [[ -f "${py_file}" ]] && continue 2767 [[ -f "${py_file}" ]] && continue
2666 fi 2768 fi
2667 echo "${_BLUE}<<< ${compiled_file%[co]}[co]${_NORMAL}" 2769 _python_vecho "<<< ${compiled_file%[co]}[co]"
2668 rm -f "${compiled_file%[co]}"[co] 2770 rm -f "${compiled_file%[co]}"[co]
2669 elif [[ "${compiled_file}" == *\$py.class ]]; then 2771 elif [[ "${compiled_file}" == *\$py.class ]]; then
2670 if [[ "${dir}" == "__pycache__" ]]; then 2772 if [[ "${dir}" == "__pycache__" ]]; then
2671 base_module_name="${compiled_file##*/}" 2773 base_module_name="${compiled_file##*/}"
2672 base_module_name="${base_module_name%\$py.class}" 2774 base_module_name="${base_module_name%\$py.class}"
2677 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2779 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2678 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2780 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2679 else 2781 else
2680 [[ -f "${py_file}" ]] && continue 2782 [[ -f "${py_file}" ]] && continue
2681 fi 2783 fi
2682 echo "${_BLUE}<<< ${compiled_file}${_NORMAL}" 2784 _python_vecho "<<< ${compiled_file}"
2683 rm -f "${compiled_file}" 2785 rm -f "${compiled_file}"
2684 else 2786 else
2685 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'" 2787 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'"
2686 fi 2788 fi
2687 2789
2688 # Delete empty parent directories. 2790 # Delete empty parent directories.
2689 dir="${compiled_file%/*}" 2791 dir="${compiled_file%/*}"
2690 while [[ "${dir}" != "${root}" ]]; do 2792 while [[ "${dir}" != "${root}" ]]; do
2691 if rmdir "${dir}" 2> /dev/null; then 2793 if rmdir "${dir}" 2> /dev/null; then
2692 echo "${_CYAN}<<< ${dir}${_NORMAL}" 2794 _python_vecho "<<< ${dir}"
2693 else 2795 else
2694 break 2796 break
2695 fi 2797 fi
2696 dir="${dir%/*}" 2798 dir="${dir%/*}"
2697 done 2799 done
2829 done 2931 done
2830 for dir in "${evaluated_dirs[@]}"; do 2932 for dir in "${evaluated_dirs[@]}"; do
2831 eval "dirs+=(\"\${root}${dir}\")" 2933 eval "dirs+=(\"\${root}${dir}\")"
2832 done 2934 done
2833 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2935 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2834 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2936 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2835 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2937 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2836 fi 2938 fi
2837 _python_clean_compiled_modules "${dirs[@]}" 2939 _python_clean_compiled_modules "${dirs[@]}"
2838 fi 2940 fi
2839 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2941 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2842 done 2944 done
2843 for file in "${evaluated_files[@]}"; do 2945 for file in "${evaluated_files[@]}"; do
2844 eval "files+=(\"\${root}${file}\")" 2946 eval "files+=(\"\${root}${file}\")"
2845 done 2947 done
2846 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1" 2948 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2847 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2949 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2848 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1" 2950 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2849 fi 2951 fi
2850 _python_clean_compiled_modules "${files[@]}" 2952 _python_clean_compiled_modules "${files[@]}"
2851 fi 2953 fi
2852 eend "${return_code}" 2954 eend "${return_code}"
2873 return_code="0" 2975 return_code="0"
2874 stderr="" 2976 stderr=""
2875 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2977 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2876 if ((${#other_dirs[@]})); then 2978 if ((${#other_dirs[@]})); then
2877 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2979 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2878 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2980 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2879 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2981 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2880 fi 2982 fi
2881 _python_clean_compiled_modules "${other_dirs[@]}" 2983 _python_clean_compiled_modules "${other_dirs[@]}"
2882 fi 2984 fi
2883 if ((${#other_files[@]})); then 2985 if ((${#other_files[@]})); then
2884 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1" 2986 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
2885 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2987 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2886 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1" 2988 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2887 fi 2989 fi
2888 _python_clean_compiled_modules "${other_files[@]}" 2990 _python_clean_compiled_modules "${other_files[@]}"
2889 fi 2991 fi
2890 eend "${return_code}" 2992 eend "${return_code}"
3077} 3179}
3078 3180
3079# ================================================================================================ 3181# ================================================================================================
3080# ===================================== DEPRECATED FUNCTIONS ===================================== 3182# ===================================== DEPRECATED FUNCTIONS =====================================
3081# ================================================================================================ 3183# ================================================================================================
3184
3185fi # _PYTHON_ECLASS_INHERITED

Legend:
Removed from v.1.129  
changed lines
  Added in v.1.161

  ViewVC Help
Powered by ViewVC 1.1.20