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

Diff of /eclass/python.eclass

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

Revision 1.128 Revision 1.164
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.128 2011/08/19 10:10:03 lxnay Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.164 2012/12/20 06:34:57 floppym 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 2.7-pypy-2.0)
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"
398 407
399# @FUNCTION: python_pkg_setup 408# @FUNCTION: python_pkg_setup
400# @DESCRIPTION: 409# @DESCRIPTION:
401# Perform sanity checks and initialize environment. 410# Perform sanity checks and initialize environment.
402# 411#
403# This function is exported in EAPI 2 and 3. Calling of this function is mandatory in EAPI >=4. 412# This function is exported in EAPI 2 and 3 when PYTHON_USE_WITH or PYTHON_USE_WITH_OR variable
413# is set and always in EAPI >=4. Calling of this function is mandatory in EAPI >=4.
404python_pkg_setup() { 414python_pkg_setup() {
405 if [[ "${EBUILD_PHASE}" != "setup" ]]; then 415 if [[ "${EBUILD_PHASE}" != "setup" ]]; then
406 die "${FUNCNAME}() can be used only in pkg_setup() phase" 416 die "${FUNCNAME}() can be used only in pkg_setup() phase"
407 fi 417 fi
408 418
418 export EPYTHON="$(PYTHON -f)" 428 export EPYTHON="$(PYTHON -f)"
419 else 429 else
420 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}" 430 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
421 fi 431 fi
422 432
433 if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; then
434 if [[ "${PYTHON_USE_WITH_OPT}" ]]; then
435 if [[ "${PYTHON_USE_WITH_OPT}" == !* ]]; then
436 use ${PYTHON_USE_WITH_OPT#!} && return
437 else
438 use !${PYTHON_USE_WITH_OPT} && return
439 fi
440 fi
441
442 python_pkg_setup_check_USE_flags() {
443 local python_atom USE_flag
444 python_atom="$(python_get_implementational_package)"
445
446 for USE_flag in ${PYTHON_USE_WITH}; do
447 if ! has_version "${python_atom}[${USE_flag}]"; then
448 eerror "Please rebuild ${python_atom} with the following USE flags enabled: ${PYTHON_USE_WITH}"
449 die "Please rebuild ${python_atom} with the following USE flags enabled: ${PYTHON_USE_WITH}"
450 fi
451 done
452
453 for USE_flag in ${PYTHON_USE_WITH_OR}; do
454 if has_version "${python_atom}[${USE_flag}]"; then
455 return
456 fi
457 done
458
459 if [[ ${PYTHON_USE_WITH_OR} ]]; then
460 eerror "Please rebuild ${python_atom} with at least one of the following USE flags enabled: ${PYTHON_USE_WITH_OR}"
461 die "Please rebuild ${python_atom} with at least one of the following USE flags enabled: ${PYTHON_USE_WITH_OR}"
462 fi
463 }
464
465 if _python_package_supporting_installation_for_multiple_python_abis; then
466 PYTHON_SKIP_SANITY_CHECKS="1" python_execute_function -q python_pkg_setup_check_USE_flags
467 else
468 python_pkg_setup_check_USE_flags
469 fi
470
471 unset -f python_pkg_setup_check_USE_flags
472 fi
473
423 PYTHON_PKG_SETUP_EXECUTED="1" 474 PYTHON_PKG_SETUP_EXECUTED="1"
424} 475}
425
426if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
427 EXPORT_FUNCTIONS pkg_setup
428fi
429 476
430_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)'
431 478
432# @FUNCTION: python_convert_shebangs 479# @FUNCTION: python_convert_shebangs
433# @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]
434# @DESCRIPTION: 481# @DESCRIPTION:
435# 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.
436python_convert_shebangs() { 483python_convert_shebangs() {
437 _python_check_python_pkg_setup_execution 484 _python_check_python_pkg_setup_execution
438 485
439 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"
440 487
441 while (($#)); do 488 while (($#)); do
442 case "$1" in 489 case "$1" in
443 -r|--recursive) 490 -r|--recursive)
444 recursive="1" 491 recursive="1"
499 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 546 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
500 547
501 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 548 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then
502 [[ "$(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
503 550
551 shebangs_converted="1"
552
504 if [[ "${quiet}" == "0" ]]; then 553 if [[ "${quiet}" == "0" ]]; then
505 einfo "Converting shebang in '${file}'" 554 einfo "Converting shebang in '${file}'"
506 fi 555 fi
507 556
508 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"
509 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}"
510 done 599 done
511} 600}
512 601
513# @FUNCTION: python_clean_installation_image 602# @FUNCTION: python_clean_installation_image
514# @USAGE: [-q|--quiet] 603# @USAGE: [-q|--quiet]
657 if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then 746 if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then
658 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
659 fi 748 fi
660fi 749fi
661 750
662if has "${EAPI:-0}" 0 1 2 3 4; then
663 unset PYTHON_ABIS 751unset PYTHON_ABIS
664fi
665 752
666_python_calculate_PYTHON_ABIS() { 753_python_calculate_PYTHON_ABIS() {
667 if ! _python_package_supporting_installation_for_multiple_python_abis; then 754 if ! _python_package_supporting_installation_for_multiple_python_abis; then
668 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"
669 fi 756 fi
670 757
671 _python_initial_sanity_checks 758 _python_initial_sanity_checks
672 759
673 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
674 local PYTHON_ABI 761 local PYTHON_ABI
675 762
676 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
677 local cpython_enabled="0" 764 local cpython_enabled="0"
678 765
752 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}"
753 fi 840 fi
754 else 841 else
755 python3_version="" 842 python3_version=""
756 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"
757 fi 854 fi
758 855
759 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
760 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"
761 eerror "is set incorrectly. Use \`eselect python\` to fix configuration." 858 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
919 python_default_function() { 1016 python_default_function() {
920 emake "$@" 1017 emake "$@"
921 } 1018 }
922 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 1019 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
923 python_default_function() { 1020 python_default_function() {
1021 # Stolen from portage's _eapi0_src_test()
1022 local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
924 if emake -j1 -n check &> /dev/null; then 1023 if ${emake_cmd} -j1 -n check &> /dev/null; then
925 emake -j1 check "$@" 1024 ${emake_cmd} -j1 check "$@"
926 elif emake -j1 -n test &> /dev/null; then 1025 elif ${emake_cmd} -j1 -n test &> /dev/null; then
927 emake -j1 test "$@" 1026 ${emake_cmd} -j1 test "$@"
928 fi 1027 fi
929 } 1028 }
930 elif [[ "${EBUILD_PHASE}" == "install" ]]; then 1029 elif [[ "${EBUILD_PHASE}" == "install" ]]; then
931 python_default_function() { 1030 python_default_function() {
932 emake DESTDIR="${D}" install "$@" 1031 emake DESTDIR="${D}" install "$@"
1189import os 1288import os
1190import re 1289import re
1191import subprocess 1290import subprocess
1192import sys 1291import sys
1193 1292
1194cpython_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+)$")
1195jython_re = re.compile(r"^jython(\d+\.\d+)$") 1297jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1196pypy_re = re.compile(r"^pypy-c(\d+\.\d+)$") 1298pypy_interpreter_re = re.compile(r"^pypy-c(\d+\.\d+)$")
1197python_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)")
1198python_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$")
1199 1302
1200pypy_versions_mapping = { 1303#pypy_versions_mapping = {
1201 "1.5": "2.7" 1304# "1.5": "2.7",
1202} 1305# "1.6": "2.7",
1306# "1.7": "2.7",
1307# "1.8": "2.7",
1308# "1.9": "2.7",
1309# "2.0": "2.7",
1310#}
1203 1311
1204def get_PYTHON_ABI(EPYTHON): 1312def get_PYTHON_ABI(python_interpreter):
1205 cpython_matched = cpython_re.match(EPYTHON) 1313 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1206 jython_matched = jython_re.match(EPYTHON) 1314 jython_matched = jython_interpreter_re.match(python_interpreter)
1207 pypy_matched = pypy_re.match(EPYTHON) 1315 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1208 if cpython_matched is not None: 1316 if cpython_matched is not None:
1209 PYTHON_ABI = cpython_matched.group(1) 1317 PYTHON_ABI = cpython_matched.group(1)
1210 elif jython_matched is not None: 1318 elif jython_matched is not None:
1211 PYTHON_ABI = jython_matched.group(1) + "-jython" 1319 PYTHON_ABI = jython_matched.group(1) + "-jython"
1212 elif pypy_matched is not None: 1320 elif pypy_matched is not None:
1213 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1) 1321 #PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1322 PYTHON_ABI = "2.7-pypy-" + pypy_matched.group(1)
1214 else: 1323 else:
1215 PYTHON_ABI = None 1324 PYTHON_ABI = None
1216 return PYTHON_ABI 1325 return PYTHON_ABI
1217 1326
1327def get_python_interpreter(PYTHON_ABI):
1328 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1329 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1330 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1331 if cpython_matched is not None:
1332 python_interpreter = "python" + cpython_matched.group(1)
1333 elif jython_matched is not None:
1334 python_interpreter = "jython" + jython_matched.group(1)
1335 elif pypy_matched is not None:
1336 python_interpreter = "pypy-c" + pypy_matched.group(1)
1337 else:
1338 python_interpreter = None
1339 return python_interpreter
1340
1218EOF 1341EOF
1219 if [[ "$?" != "0" ]]; then 1342 if [[ "$?" != "0" ]]; then
1220 die "${FUNCNAME}(): Generation of '$1' failed" 1343 die "${FUNCNAME}(): Generation of '$1' failed"
1221 fi 1344 fi
1222 if [[ "${respect_EPYTHON}" == "1" ]]; then 1345 if [[ "${respect_EPYTHON}" == "1" ]]; then
1223 cat << EOF >> "${file}" 1346 cat << EOF >> "${file}"
1224EPYTHON = os.environ.get("EPYTHON") 1347python_interpreter = os.environ.get("EPYTHON")
1225if EPYTHON: 1348if python_interpreter:
1226 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1349 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1227 if PYTHON_ABI is None: 1350 if PYTHON_ABI is None:
1228 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1351 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1229 sys.exit(1) 1352 sys.exit(1)
1230else: 1353else:
1231 try: 1354 try:
1232 environment = os.environ.copy() 1355 environment = os.environ.copy()
1233 environment["ROOT"] = "/" 1356 environment["ROOT"] = "/"
1236 raise ValueError 1359 raise ValueError
1237 except (OSError, ValueError): 1360 except (OSError, ValueError):
1238 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1361 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1239 sys.exit(1) 1362 sys.exit(1)
1240 1363
1241 EPYTHON = eselect_process.stdout.read() 1364 python_interpreter = eselect_process.stdout.read()
1242 if not isinstance(EPYTHON, str): 1365 if not isinstance(python_interpreter, str):
1243 # Python 3 1366 # Python 3
1244 EPYTHON = EPYTHON.decode() 1367 python_interpreter = python_interpreter.decode()
1245 EPYTHON = EPYTHON.rstrip("\n") 1368 python_interpreter = python_interpreter.rstrip("\n")
1246 1369
1247 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1370 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1248 if PYTHON_ABI is None: 1371 if PYTHON_ABI is None:
1249 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1372 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1250 sys.exit(1) 1373 sys.exit(1)
1251 1374
1252wrapper_script_path = os.path.realpath(sys.argv[0]) 1375wrapper_script_path = os.path.realpath(sys.argv[0])
1253target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1376target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1254if not os.path.exists(target_executable_path): 1377if not os.path.exists(target_executable_path):
1268 raise ValueError 1391 raise ValueError
1269except (OSError, ValueError): 1392except (OSError, ValueError):
1270 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1393 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1271 sys.exit(1) 1394 sys.exit(1)
1272 1395
1273EPYTHON = eselect_process.stdout.read() 1396python_interpreter = eselect_process.stdout.read()
1274if not isinstance(EPYTHON, str): 1397if not isinstance(python_interpreter, str):
1275 # Python 3 1398 # Python 3
1276 EPYTHON = EPYTHON.decode() 1399 python_interpreter = python_interpreter.decode()
1277EPYTHON = EPYTHON.rstrip("\n") 1400python_interpreter = python_interpreter.rstrip("\n")
1278 1401
1279PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1402PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1280if PYTHON_ABI is None: 1403if PYTHON_ABI is None:
1281 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1404 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1282 sys.exit(1) 1405 sys.exit(1)
1283 1406
1284wrapper_script_path = os.path.realpath(sys.argv[0]) 1407wrapper_script_path = os.path.realpath(sys.argv[0])
1285for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1408for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1286 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1409 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1287 if os.path.exists(target_executable_path): 1410 if os.path.exists(target_executable_path):
1288 break 1411 break
1289else: 1412else:
1290 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path)) 1413 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1291 sys.exit(1) 1414 sys.exit(1)
1415
1416python_interpreter = get_python_interpreter(PYTHON_ABI)
1417if python_interpreter is None:
1418 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1419 sys.exit(1)
1292EOF 1420EOF
1293 if [[ "$?" != "0" ]]; then 1421 if [[ "$?" != "0" ]]; then
1294 die "${FUNCNAME}(): Generation of '$1' failed" 1422 die "${FUNCNAME}(): Generation of '$1' failed"
1295 fi 1423 fi
1296 fi 1424 fi
1297 cat << EOF >> "${file}" 1425 cat << EOF >> "${file}"
1298 1426
1299target_executable = open(target_executable_path, "rb") 1427target_executable = open(target_executable_path, "rb")
1300target_executable_first_line = target_executable.readline() 1428target_executable_first_line = target_executable.readline()
1429target_executable.close()
1301if not isinstance(target_executable_first_line, str): 1430if not isinstance(target_executable_first_line, str):
1302 # Python 3 1431 # Python 3
1303 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1432 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1304 1433
1434options = []
1435python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1436if python_shebang_options_matched is not None:
1437 options = [python_shebang_options_matched.group(1)]
1438
1305python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1439cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1306target_executable.close()
1307 1440
1308if python_shebang_matched is not None: 1441if cpython_shebang_matched is not None:
1309 try: 1442 try:
1310 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1443 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1311 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1444 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1312 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1445 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1313 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1446 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1314 if python_verification_process.wait() != 0: 1447 if python_verification_process.wait() != 0:
1315 raise ValueError 1448 raise ValueError
1320 python_verification_output = python_verification_output.decode() 1453 python_verification_output = python_verification_output.decode()
1321 1454
1322 if not python_verification_output_re.match(python_verification_output): 1455 if not python_verification_output_re.match(python_verification_output):
1323 raise ValueError 1456 raise ValueError
1324 1457
1325 if cpython_re.match(EPYTHON) is not None: 1458 if cpython_interpreter_re.match(python_interpreter) is not None:
1326 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1459 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1327 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1460 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1328 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1461 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1329 1462
1330 if hasattr(os, "execv"): 1463 if hasattr(os, "execv"):
1331 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1464 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1332 else: 1465 else:
1333 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1466 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1334 except (KeyboardInterrupt, SystemExit): 1467 except (KeyboardInterrupt, SystemExit):
1335 raise 1468 raise
1336 except: 1469 except:
1337 pass 1470 pass
1338 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"): 1471 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"):
1522 fi 1655 fi
1523 done 1656 done
1524 1657
1525 popd > /dev/null || die "popd failed" 1658 popd > /dev/null || die "popd failed"
1526 1659
1660 # This is per bug #390691, without the duplication refactor, and with
1661 # the 3-way structure per comment #6. This enable users with old
1662 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1663 # before coreutils can be upgraded).
1664 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1665 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"
1527 if ROOT="/" has_version sys-apps/coreutils; then 1666 elif ROOT="/" has_version sys-apps/coreutils; then
1528 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" 1667 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"
1529 else 1668 else
1530 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1669 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1531 fi 1670 fi
1532 done 1671 done
1551 stdout = sys.stdout.buffer 1690 stdout = sys.stdout.buffer
1552else: 1691else:
1553 # Python 2 1692 # Python 2
1554 stdout = sys.stdout 1693 stdout = sys.stdout
1555 1694
1695python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1556files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1696files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1697python_wrapper_scripts_file.close()
1557 1698
1558for file in sorted(files): 1699for file in sorted(files):
1559 stdout.write(file) 1700 stdout.write(file)
1560 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1701 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1561 1702
1626 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1767 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1627 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1768 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1628} 1769}
1629 1770
1630# @FUNCTION: python_need_rebuild 1771# @FUNCTION: python_need_rebuild
1772# @DESCRIPTION:
1631# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1773# Mark current package for rebuilding by python-updater after
1632# switching of active version of Python. 1774# switching of active version of Python.
1633python_need_rebuild() { 1775python_need_rebuild() {
1634 if _python_package_supporting_installation_for_multiple_python_abis; then 1776 if _python_package_supporting_installation_for_multiple_python_abis; then
1635 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs" 1777 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1636 fi 1778 fi
2335_python_test_hook() { 2477_python_test_hook() {
2336 if [[ "$#" -ne 1 ]]; then 2478 if [[ "$#" -ne 1 ]]; then
2337 die "${FUNCNAME}() requires 1 argument" 2479 die "${FUNCNAME}() requires 1 argument"
2338 fi 2480 fi
2339 2481
2340 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2482 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2341 "${FUNCNAME[3]}_$1_hook" 2483 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2342 fi 2484 fi
2343} 2485}
2344 2486
2345# @FUNCTION: python_execute_nosetests 2487# @FUNCTION: python_execute_nosetests
2346# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2488# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
2380 python_test_function() { 2522 python_test_function() {
2381 local evaluated_PYTHONPATH 2523 local evaluated_PYTHONPATH
2382 2524
2383 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2525 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2384 2526
2385 _python_test_hook pre 2527 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2386 2528
2387 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2529 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2388 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2530 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2389 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2531 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2390 else 2532 else
2391 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2533 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2392 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2534 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2393 fi 2535 fi
2394 2536
2395 _python_test_hook post 2537 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2396 } 2538 }
2397 if _python_package_supporting_installation_for_multiple_python_abis; then 2539 if _python_package_supporting_installation_for_multiple_python_abis; then
2398 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2540 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2399 else 2541 else
2400 if [[ -n "${separate_build_dirs}" ]]; then 2542 if [[ -n "${separate_build_dirs}" ]]; then
2444 python_test_function() { 2586 python_test_function() {
2445 local evaluated_PYTHONPATH 2587 local evaluated_PYTHONPATH
2446 2588
2447 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2589 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2448 2590
2449 _python_test_hook pre 2591 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2450 2592
2451 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2593 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2452 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2594 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL}
2453 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?" 2595 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2454 else 2596 else
2455 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2597 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2456 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2598 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2457 fi 2599 fi
2458 2600
2459 _python_test_hook post 2601 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2460 } 2602 }
2461 if _python_package_supporting_installation_for_multiple_python_abis; then 2603 if _python_package_supporting_installation_for_multiple_python_abis; then
2462 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2604 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2463 else 2605 else
2464 if [[ -n "${separate_build_dirs}" ]]; then 2606 if [[ -n "${separate_build_dirs}" ]]; then
2508 python_test_function() { 2650 python_test_function() {
2509 local evaluated_PYTHONPATH 2651 local evaluated_PYTHONPATH
2510 2652
2511 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2653 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2512 2654
2513 _python_test_hook pre 2655 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2514 2656
2515 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2657 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2516 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2658 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2517 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2659 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2518 else 2660 else
2519 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2661 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2520 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2662 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2521 fi 2663 fi
2522 2664
2523 _python_test_hook post 2665 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2524 } 2666 }
2525 if _python_package_supporting_installation_for_multiple_python_abis; then 2667 if _python_package_supporting_installation_for_multiple_python_abis; then
2526 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2668 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2527 else 2669 else
2528 if [[ -n "${separate_build_dirs}" ]]; then 2670 if [[ -n "${separate_build_dirs}" ]]; then
2565 fi 2707 fi
2566 2708
2567 export PYTHONDONTWRITEBYTECODE="1" 2709 export PYTHONDONTWRITEBYTECODE="1"
2568} 2710}
2569 2711
2712_python_vecho() {
2713 [[ -z ${PORTAGE_VERBOSE} ]] || echo "$@"
2714}
2715
2570_python_clean_compiled_modules() { 2716_python_clean_compiled_modules() {
2571 _python_initialize_prefix_variables 2717 _python_initialize_prefix_variables
2572 _python_set_color_variables 2718 _python_set_color_variables
2573 2719
2574 [[ "${FUNCNAME[1]}" =~ ^(python_mod_optimize|python_mod_cleanup)$ ]] || die "${FUNCNAME}(): Invalid usage" 2720 [[ "${FUNCNAME[1]}" =~ ^(python_mod_optimize|python_mod_cleanup)$ ]] || die "${FUNCNAME}(): Invalid usage"
2587 2733
2588 if [[ "${EBUILD_PHASE}" == "postrm" ]]; then 2734 if [[ "${EBUILD_PHASE}" == "postrm" ]]; then
2589 # Delete empty child directories. 2735 # Delete empty child directories.
2590 find "${path}" -type d | sort -r | while read -r dir; do 2736 find "${path}" -type d | sort -r | while read -r dir; do
2591 if rmdir "${dir}" 2> /dev/null; then 2737 if rmdir "${dir}" 2> /dev/null; then
2592 echo "${_CYAN}<<< ${dir}${_NORMAL}" 2738 _python_vecho "<<< ${dir}"
2593 fi 2739 fi
2594 done 2740 done
2595 fi 2741 fi
2596 elif [[ "${path}" == *.py ]]; then 2742 elif [[ "${path}" == *.py ]]; then
2597 base_module_name="${path##*/}" 2743 base_module_name="${path##*/}"
2620 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2766 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2621 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2767 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2622 else 2768 else
2623 [[ -f "${py_file}" ]] && continue 2769 [[ -f "${py_file}" ]] && continue
2624 fi 2770 fi
2625 echo "${_BLUE}<<< ${compiled_file%[co]}[co]${_NORMAL}" 2771 _python_vecho "<<< ${compiled_file%[co]}[co]"
2626 rm -f "${compiled_file%[co]}"[co] 2772 rm -f "${compiled_file%[co]}"[co]
2627 elif [[ "${compiled_file}" == *\$py.class ]]; then 2773 elif [[ "${compiled_file}" == *\$py.class ]]; then
2628 if [[ "${dir}" == "__pycache__" ]]; then 2774 if [[ "${dir}" == "__pycache__" ]]; then
2629 base_module_name="${compiled_file##*/}" 2775 base_module_name="${compiled_file##*/}"
2630 base_module_name="${base_module_name%\$py.class}" 2776 base_module_name="${base_module_name%\$py.class}"
2635 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2781 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2636 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2782 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2637 else 2783 else
2638 [[ -f "${py_file}" ]] && continue 2784 [[ -f "${py_file}" ]] && continue
2639 fi 2785 fi
2640 echo "${_BLUE}<<< ${compiled_file}${_NORMAL}" 2786 _python_vecho "<<< ${compiled_file}"
2641 rm -f "${compiled_file}" 2787 rm -f "${compiled_file}"
2642 else 2788 else
2643 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'" 2789 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'"
2644 fi 2790 fi
2645 2791
2646 # Delete empty parent directories. 2792 # Delete empty parent directories.
2647 dir="${compiled_file%/*}" 2793 dir="${compiled_file%/*}"
2648 while [[ "${dir}" != "${root}" ]]; do 2794 while [[ "${dir}" != "${root}" ]]; do
2649 if rmdir "${dir}" 2> /dev/null; then 2795 if rmdir "${dir}" 2> /dev/null; then
2650 echo "${_CYAN}<<< ${dir}${_NORMAL}" 2796 _python_vecho "<<< ${dir}"
2651 else 2797 else
2652 break 2798 break
2653 fi 2799 fi
2654 dir="${dir%/*}" 2800 dir="${dir%/*}"
2655 done 2801 done
2787 done 2933 done
2788 for dir in "${evaluated_dirs[@]}"; do 2934 for dir in "${evaluated_dirs[@]}"; do
2789 eval "dirs+=(\"\${root}${dir}\")" 2935 eval "dirs+=(\"\${root}${dir}\")"
2790 done 2936 done
2791 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2937 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2792 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2938 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2793 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2939 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2794 fi 2940 fi
2795 _python_clean_compiled_modules "${dirs[@]}" 2941 _python_clean_compiled_modules "${dirs[@]}"
2796 fi 2942 fi
2797 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2943 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2800 done 2946 done
2801 for file in "${evaluated_files[@]}"; do 2947 for file in "${evaluated_files[@]}"; do
2802 eval "files+=(\"\${root}${file}\")" 2948 eval "files+=(\"\${root}${file}\")"
2803 done 2949 done
2804 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1" 2950 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2805 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2951 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2806 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1" 2952 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2807 fi 2953 fi
2808 _python_clean_compiled_modules "${files[@]}" 2954 _python_clean_compiled_modules "${files[@]}"
2809 fi 2955 fi
2810 eend "${return_code}" 2956 eend "${return_code}"
2831 return_code="0" 2977 return_code="0"
2832 stderr="" 2978 stderr=""
2833 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2979 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2834 if ((${#other_dirs[@]})); then 2980 if ((${#other_dirs[@]})); then
2835 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2981 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2836 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2982 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2837 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2983 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2838 fi 2984 fi
2839 _python_clean_compiled_modules "${other_dirs[@]}" 2985 _python_clean_compiled_modules "${other_dirs[@]}"
2840 fi 2986 fi
2841 if ((${#other_files[@]})); then 2987 if ((${#other_files[@]})); then
2842 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1" 2988 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
2843 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2989 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2844 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1" 2990 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2845 fi 2991 fi
2846 _python_clean_compiled_modules "${other_files[@]}" 2992 _python_clean_compiled_modules "${other_files[@]}"
2847 fi 2993 fi
2848 eend "${return_code}" 2994 eend "${return_code}"
3035} 3181}
3036 3182
3037# ================================================================================================ 3183# ================================================================================================
3038# ===================================== DEPRECATED FUNCTIONS ===================================== 3184# ===================================== DEPRECATED FUNCTIONS =====================================
3039# ================================================================================================ 3185# ================================================================================================
3186
3187fi # _PYTHON_ECLASS_INHERITED

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.164

  ViewVC Help
Powered by ViewVC 1.1.20