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

Diff of /eclass/python.eclass

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

Revision 1.127 Revision 1.156
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.127 2011/07/08 07:49:36 djc Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.156 2012/08/16 07:46:15 patrick 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
12# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
13if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
12inherit multilib 14 inherit multilib
15fi
13 16
17# Export pkg_setup every time to avoid issues with eclass inheritance order.
18if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
19 EXPORT_FUNCTIONS pkg_setup
20fi
21
22# Avoid processing this eclass more than once.
23if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
24_PYTHON_ECLASS_INHERITED="1"
25
14if ! has "${EAPI:-0}" 0 1 2 3; then 26if ! has "${EAPI:-0}" 0 1 2 3 4; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 27 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 28fi
17 29
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 30_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3) 31_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 32_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
21_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.5) 33_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[@]}) 34_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
23 35
24# ================================================================================================ 36# ================================================================================================
25# ===================================== HANDLING OF METADATA ===================================== 37# ===================================== HANDLING OF METADATA =====================================
26# ================================================================================================ 38# ================================================================================================
… …
86 98
87 return 1 99 return 1
88 fi 100 fi
89} 101}
90 102
103_python_implementation() {
104 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
105 return 0
106 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
107 return 0
108 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
109 return 0
110 else
111 return 1
112 fi
113}
114
91_python_package_supporting_installation_for_multiple_python_abis() { 115_python_package_supporting_installation_for_multiple_python_abis() {
92 if has "${EAPI:-0}" 0 1 2 3 4; then 116 if has "${EAPI:-0}" 0 1 2 3 4; then
93 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 117 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
94 return 0 118 return 0
95 else 119 else
… …
231 else 255 else
232 die "Invalid syntax of PYTHON_DEPEND" 256 die "Invalid syntax of PYTHON_DEPEND"
233 fi 257 fi
234} 258}
235 259
260if _python_implementation; then
236DEPEND=">=app-admin/eselect-python-20091230" 261 DEPEND=">=app-admin/eselect-python-20091230"
237RDEPEND="${DEPEND}" 262 RDEPEND="${DEPEND}"
263 PDEPEND="app-admin/python-updater"
264fi
238 265
239if [[ -n "${PYTHON_DEPEND}" ]]; then 266if [[ -n "${PYTHON_DEPEND}" ]]; then
240 _python_parse_PYTHON_DEPEND 267 _python_parse_PYTHON_DEPEND
241else 268else
242 _PYTHON_ATOMS=("dev-lang/python") 269 _PYTHON_ATOMS=("dev-lang/python")
… …
281 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}" 308 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}"
282 fi 309 fi
283 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then 310 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
284 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )" 311 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )"
285 fi 312 fi
286 DEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 313 DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
287 RDEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 314 RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
288 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY 315 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY
289fi 316fi
290 317
291unset _PYTHON_ATOMS 318unset _PYTHON_ATOMS
292 319
293# ================================================================================================ 320# ================================================================================================
294# =================================== MISCELLANEOUS FUNCTIONS ==================================== 321# =================================== MISCELLANEOUS FUNCTIONS ====================================
295# ================================================================================================ 322# ================================================================================================
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 323
309_python_abi-specific_local_scope() { 324_python_abi-specific_local_scope() {
310 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] 325 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
311} 326}
312 327
… …
384 _CYAN= 399 _CYAN=
385 _NORMAL= 400 _NORMAL=
386 fi 401 fi
387} 402}
388 403
389unset PYTHON_PKG_SETUP_EXECUTED
390
391_python_check_python_pkg_setup_execution() { 404_python_check_python_pkg_setup_execution() {
392 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return 405 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
393 406
394 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then 407 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
395 die "python_pkg_setup() not called" 408 die "python_pkg_setup() not called"
… …
463 fi 476 fi
464 477
465 PYTHON_PKG_SETUP_EXECUTED="1" 478 PYTHON_PKG_SETUP_EXECUTED="1"
466} 479}
467 480
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)' 481_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
473 482
474# @FUNCTION: python_convert_shebangs 483# @FUNCTION: python_convert_shebangs
475# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 484# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
476# @DESCRIPTION: 485# @DESCRIPTION:
477# Convert shebangs in specified files. Directories can be specified only with --recursive option. 486# Convert shebangs in specified files. Directories can be specified only with --recursive option.
478python_convert_shebangs() { 487python_convert_shebangs() {
479 _python_check_python_pkg_setup_execution 488 _python_check_python_pkg_setup_execution
480 489
481 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" 490 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
482 491
483 while (($#)); do 492 while (($#)); do
484 case "$1" in 493 case "$1" in
485 -r|--recursive) 494 -r|--recursive)
486 recursive="1" 495 recursive="1"
… …
541 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 550 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
542 551
543 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 552 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 553 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
545 554
555 shebangs_converted="1"
556
546 if [[ "${quiet}" == "0" ]]; then 557 if [[ "${quiet}" == "0" ]]; then
547 einfo "Converting shebang in '${file}'" 558 einfo "Converting shebang in '${file}'"
548 fi 559 fi
549 560
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" 561 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 562 fi
563 done
564
565 if [[ "${shebangs_converted}" == "0" ]]; then
566 ewarn "${FUNCNAME}(): Python scripts not found"
567 fi
568}
569
570# @FUNCTION: python_clean_py-compile_files
571# @USAGE: [-q|--quiet]
572# @DESCRIPTION:
573# Clean py-compile files to disable byte-compilation.
574python_clean_py-compile_files() {
575 _python_check_python_pkg_setup_execution
576
577 local file files=() quiet="0"
578
579 while (($#)); do
580 case "$1" in
581 -q|--quiet)
582 quiet="1"
583 ;;
584 -*)
585 die "${FUNCNAME}(): Unrecognized option '$1'"
586 ;;
587 *)
588 die "${FUNCNAME}(): Invalid usage"
589 ;;
590 esac
591 shift
592 done
593
594 while read -d $'\0' -r file; do
595 files+=("${file#./}")
596 done < <(find -name py-compile -type f -print0)
597
598 for file in "${files[@]}"; do
599 if [[ "${quiet}" == "0" ]]; then
600 einfo "Cleaning '${file}' file"
601 fi
602 echo "#!/bin/sh" > "${file}"
552 done 603 done
553} 604}
554 605
555# @FUNCTION: python_clean_installation_image 606# @FUNCTION: python_clean_installation_image
556# @USAGE: [-q|--quiet] 607# @USAGE: [-q|--quiet]
… …
794 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}" 845 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
795 fi 846 fi
796 else 847 else
797 python3_version="" 848 python3_version=""
798 fi 849 fi
850 fi
851
852 if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
853 eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
854 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
855 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
856 eerror " dev-lang/python:${PYTHON_ABI}"
857 fi
858 done
859 die "No supported version of CPython installed"
799 fi 860 fi
800 861
801 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then 862 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" 863 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
803 eerror "is set incorrectly. Use \`eselect python\` to fix configuration." 864 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
… …
961 python_default_function() { 1022 python_default_function() {
962 emake "$@" 1023 emake "$@"
963 } 1024 }
964 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 1025 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
965 python_default_function() { 1026 python_default_function() {
1027 # Stolen from portage's _eapi0_src_test()
1028 local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
966 if emake -j1 -n check &> /dev/null; then 1029 if ${emake_cmd} -j1 -n check &> /dev/null; then
967 emake -j1 check "$@" 1030 ${emake_cmd} -j1 check "$@"
968 elif emake -j1 -n test &> /dev/null; then 1031 elif ${emake_cmd} -j1 -n test &> /dev/null; then
969 emake -j1 test "$@" 1032 ${emake_cmd} -j1 test "$@"
970 fi 1033 fi
971 } 1034 }
972 elif [[ "${EBUILD_PHASE}" == "install" ]]; then 1035 elif [[ "${EBUILD_PHASE}" == "install" ]]; then
973 python_default_function() { 1036 python_default_function() {
974 emake DESTDIR="${D}" install "$@" 1037 emake DESTDIR="${D}" install "$@"
… …
1231import os 1294import os
1232import re 1295import re
1233import subprocess 1296import subprocess
1234import sys 1297import sys
1235 1298
1236cpython_re = re.compile(r"^python(\d+\.\d+)$") 1299cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1300jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1301pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1302cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1237jython_re = re.compile(r"^jython(\d+\.\d+)$") 1303jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1238pypy_re = re.compile(r"^pypy-c(\d+\.\d+)$") 1304pypy_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)") 1305cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1306python_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$") 1307python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1241 1308
1242pypy_versions_mapping = { 1309pypy_versions_mapping = {
1243 "1.5": "2.7" 1310 "1.5": "2.7",
1311 "1.6": "2.7",
1312 "1.7": "2.7",
1313 "1.8": "2.7",
1314 "1.9": "2.7",
1244} 1315}
1245 1316
1246def get_PYTHON_ABI(EPYTHON): 1317def get_PYTHON_ABI(python_interpreter):
1247 cpython_matched = cpython_re.match(EPYTHON) 1318 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1248 jython_matched = jython_re.match(EPYTHON) 1319 jython_matched = jython_interpreter_re.match(python_interpreter)
1249 pypy_matched = pypy_re.match(EPYTHON) 1320 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1250 if cpython_matched is not None: 1321 if cpython_matched is not None:
1251 PYTHON_ABI = cpython_matched.group(1) 1322 PYTHON_ABI = cpython_matched.group(1)
1252 elif jython_matched is not None: 1323 elif jython_matched is not None:
1253 PYTHON_ABI = jython_matched.group(1) + "-jython" 1324 PYTHON_ABI = jython_matched.group(1) + "-jython"
1254 elif pypy_matched is not None: 1325 elif pypy_matched is not None:
1255 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1) 1326 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1256 else: 1327 else:
1257 PYTHON_ABI = None 1328 PYTHON_ABI = None
1258 return PYTHON_ABI 1329 return PYTHON_ABI
1259 1330
1331def get_python_interpreter(PYTHON_ABI):
1332 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1333 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1334 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1335 if cpython_matched is not None:
1336 python_interpreter = "python" + cpython_matched.group(1)
1337 elif jython_matched is not None:
1338 python_interpreter = "jython" + jython_matched.group(1)
1339 elif pypy_matched is not None:
1340 python_interpreter = "pypy-c" + pypy_matched.group(1)
1341 else:
1342 python_interpreter = None
1343 return python_interpreter
1344
1260EOF 1345EOF
1261 if [[ "$?" != "0" ]]; then 1346 if [[ "$?" != "0" ]]; then
1262 die "${FUNCNAME}(): Generation of '$1' failed" 1347 die "${FUNCNAME}(): Generation of '$1' failed"
1263 fi 1348 fi
1264 if [[ "${respect_EPYTHON}" == "1" ]]; then 1349 if [[ "${respect_EPYTHON}" == "1" ]]; then
1265 cat << EOF >> "${file}" 1350 cat << EOF >> "${file}"
1266EPYTHON = os.environ.get("EPYTHON") 1351python_interpreter = os.environ.get("EPYTHON")
1267if EPYTHON: 1352if python_interpreter:
1268 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1353 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1269 if PYTHON_ABI is None: 1354 if PYTHON_ABI is None:
1270 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1355 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1271 sys.exit(1) 1356 sys.exit(1)
1272else: 1357else:
1273 try: 1358 try:
1274 environment = os.environ.copy() 1359 environment = os.environ.copy()
1275 environment["ROOT"] = "/" 1360 environment["ROOT"] = "/"
… …
1278 raise ValueError 1363 raise ValueError
1279 except (OSError, ValueError): 1364 except (OSError, ValueError):
1280 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1365 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1281 sys.exit(1) 1366 sys.exit(1)
1282 1367
1283 EPYTHON = eselect_process.stdout.read() 1368 python_interpreter = eselect_process.stdout.read()
1284 if not isinstance(EPYTHON, str): 1369 if not isinstance(python_interpreter, str):
1285 # Python 3 1370 # Python 3
1286 EPYTHON = EPYTHON.decode() 1371 python_interpreter = python_interpreter.decode()
1287 EPYTHON = EPYTHON.rstrip("\n") 1372 python_interpreter = python_interpreter.rstrip("\n")
1288 1373
1289 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1374 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1290 if PYTHON_ABI is None: 1375 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)) 1376 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) 1377 sys.exit(1)
1293 1378
1294wrapper_script_path = os.path.realpath(sys.argv[0]) 1379wrapper_script_path = os.path.realpath(sys.argv[0])
1295target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1380target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1296if not os.path.exists(target_executable_path): 1381if not os.path.exists(target_executable_path):
… …
1310 raise ValueError 1395 raise ValueError
1311except (OSError, ValueError): 1396except (OSError, ValueError):
1312 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1397 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1313 sys.exit(1) 1398 sys.exit(1)
1314 1399
1315EPYTHON = eselect_process.stdout.read() 1400python_interpreter = eselect_process.stdout.read()
1316if not isinstance(EPYTHON, str): 1401if not isinstance(python_interpreter, str):
1317 # Python 3 1402 # Python 3
1318 EPYTHON = EPYTHON.decode() 1403 python_interpreter = python_interpreter.decode()
1319EPYTHON = EPYTHON.rstrip("\n") 1404python_interpreter = python_interpreter.rstrip("\n")
1320 1405
1321PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1406PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1322if PYTHON_ABI is None: 1407if 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)) 1408 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) 1409 sys.exit(1)
1325 1410
1326wrapper_script_path = os.path.realpath(sys.argv[0]) 1411wrapper_script_path = os.path.realpath(sys.argv[0])
1327for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1412for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1328 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1413 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1329 if os.path.exists(target_executable_path): 1414 if os.path.exists(target_executable_path):
1330 break 1415 break
1331else: 1416else:
1332 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path)) 1417 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1333 sys.exit(1) 1418 sys.exit(1)
1419
1420python_interpreter = get_python_interpreter(PYTHON_ABI)
1421if python_interpreter is None:
1422 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1423 sys.exit(1)
1334EOF 1424EOF
1335 if [[ "$?" != "0" ]]; then 1425 if [[ "$?" != "0" ]]; then
1336 die "${FUNCNAME}(): Generation of '$1' failed" 1426 die "${FUNCNAME}(): Generation of '$1' failed"
1337 fi 1427 fi
1338 fi 1428 fi
1339 cat << EOF >> "${file}" 1429 cat << EOF >> "${file}"
1340 1430
1341target_executable = open(target_executable_path, "rb") 1431target_executable = open(target_executable_path, "rb")
1342target_executable_first_line = target_executable.readline() 1432target_executable_first_line = target_executable.readline()
1433target_executable.close()
1343if not isinstance(target_executable_first_line, str): 1434if not isinstance(target_executable_first_line, str):
1344 # Python 3 1435 # Python 3
1345 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1436 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1346 1437
1438options = []
1439python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1440if python_shebang_options_matched is not None:
1441 options = [python_shebang_options_matched.group(1)]
1442
1347python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1443cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1348target_executable.close()
1349 1444
1350if python_shebang_matched is not None: 1445if cpython_shebang_matched is not None:
1351 try: 1446 try:
1352 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1447 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1353 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1448 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1354 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1449 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1355 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1450 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1356 if python_verification_process.wait() != 0: 1451 if python_verification_process.wait() != 0:
1357 raise ValueError 1452 raise ValueError
… …
1362 python_verification_output = python_verification_output.decode() 1457 python_verification_output = python_verification_output.decode()
1363 1458
1364 if not python_verification_output_re.match(python_verification_output): 1459 if not python_verification_output_re.match(python_verification_output):
1365 raise ValueError 1460 raise ValueError
1366 1461
1367 if cpython_re.match(EPYTHON) is not None: 1462 if cpython_interpreter_re.match(python_interpreter) is not None:
1368 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1463 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1369 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1464 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1370 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1465 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1371 1466
1372 if hasattr(os, "execv"): 1467 if hasattr(os, "execv"):
1373 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1468 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1374 else: 1469 else:
1375 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1470 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1376 except (KeyboardInterrupt, SystemExit): 1471 except (KeyboardInterrupt, SystemExit):
1377 raise 1472 raise
1378 except: 1473 except:
1379 pass 1474 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"): 1475 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 1659 fi
1565 done 1660 done
1566 1661
1567 popd > /dev/null || die "popd failed" 1662 popd > /dev/null || die "popd failed"
1568 1663
1664 # This is per bug #390691, without the duplication refactor, and with
1665 # the 3-way structure per comment #6. This enable users with old
1666 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1667 # before coreutils can be upgraded).
1668 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1669 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 1670 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" 1671 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 1672 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" 1673 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 1674 fi
1574 done 1675 done
… …
1593 stdout = sys.stdout.buffer 1694 stdout = sys.stdout.buffer
1594else: 1695else:
1595 # Python 2 1696 # Python 2
1596 stdout = sys.stdout 1697 stdout = sys.stdout
1597 1698
1699python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1598files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1700files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1701python_wrapper_scripts_file.close()
1599 1702
1600for file in sorted(files): 1703for file in sorted(files):
1601 stdout.write(file) 1704 stdout.write(file)
1602 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1705 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1603 1706
… …
1668 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1771 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1669 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1772 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1670} 1773}
1671 1774
1672# @FUNCTION: python_need_rebuild 1775# @FUNCTION: python_need_rebuild
1776# @DESCRIPTION:
1673# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1777# Mark current package for rebuilding by python-updater after
1674# switching of active version of Python. 1778# switching of active version of Python.
1675python_need_rebuild() { 1779python_need_rebuild() {
1676 if _python_package_supporting_installation_for_multiple_python_abis; then 1780 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" 1781 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1678 fi 1782 fi
… …
2377_python_test_hook() { 2481_python_test_hook() {
2378 if [[ "$#" -ne 1 ]]; then 2482 if [[ "$#" -ne 1 ]]; then
2379 die "${FUNCNAME}() requires 1 argument" 2483 die "${FUNCNAME}() requires 1 argument"
2380 fi 2484 fi
2381 2485
2382 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2486 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2383 "${FUNCNAME[3]}_$1_hook" 2487 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2384 fi 2488 fi
2385} 2489}
2386 2490
2387# @FUNCTION: python_execute_nosetests 2491# @FUNCTION: python_execute_nosetests
2388# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2492# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
… …
2422 python_test_function() { 2526 python_test_function() {
2423 local evaluated_PYTHONPATH 2527 local evaluated_PYTHONPATH
2424 2528
2425 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2529 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2426 2530
2427 _python_test_hook pre 2531 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2428 2532
2429 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2533 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2430 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2534 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2431 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2535 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2432 else 2536 else
2433 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2537 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2434 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2538 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2435 fi 2539 fi
2436 2540
2437 _python_test_hook post 2541 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2438 } 2542 }
2439 if _python_package_supporting_installation_for_multiple_python_abis; then 2543 if _python_package_supporting_installation_for_multiple_python_abis; then
2440 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2544 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2441 else 2545 else
2442 if [[ -n "${separate_build_dirs}" ]]; then 2546 if [[ -n "${separate_build_dirs}" ]]; then
… …
2486 python_test_function() { 2590 python_test_function() {
2487 local evaluated_PYTHONPATH 2591 local evaluated_PYTHONPATH
2488 2592
2489 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2593 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2490 2594
2491 _python_test_hook pre 2595 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2492 2596
2493 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2597 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2494 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2598 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 "$?" 2599 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2496 else 2600 else
2497 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2601 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2498 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2602 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2499 fi 2603 fi
2500 2604
2501 _python_test_hook post 2605 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2502 } 2606 }
2503 if _python_package_supporting_installation_for_multiple_python_abis; then 2607 if _python_package_supporting_installation_for_multiple_python_abis; then
2504 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2608 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2505 else 2609 else
2506 if [[ -n "${separate_build_dirs}" ]]; then 2610 if [[ -n "${separate_build_dirs}" ]]; then
… …
2550 python_test_function() { 2654 python_test_function() {
2551 local evaluated_PYTHONPATH 2655 local evaluated_PYTHONPATH
2552 2656
2553 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2657 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2554 2658
2555 _python_test_hook pre 2659 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2556 2660
2557 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2661 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2558 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2662 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 "$?" 2663 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2560 else 2664 else
2561 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2665 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2562 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2666 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2563 fi 2667 fi
2564 2668
2565 _python_test_hook post 2669 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2566 } 2670 }
2567 if _python_package_supporting_installation_for_multiple_python_abis; then 2671 if _python_package_supporting_installation_for_multiple_python_abis; then
2568 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2672 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2569 else 2673 else
2570 if [[ -n "${separate_build_dirs}" ]]; then 2674 if [[ -n "${separate_build_dirs}" ]]; then
… …
2662 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2766 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2663 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2767 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2664 else 2768 else
2665 [[ -f "${py_file}" ]] && continue 2769 [[ -f "${py_file}" ]] && continue
2666 fi 2770 fi
2667 echo "${_BLUE}<<< ${compiled_file%[co]}[co]${_NORMAL}"
2668 rm -f "${compiled_file%[co]}"[co] 2771 rm -f "${compiled_file%[co]}"[co]
2669 elif [[ "${compiled_file}" == *\$py.class ]]; then 2772 elif [[ "${compiled_file}" == *\$py.class ]]; then
2670 if [[ "${dir}" == "__pycache__" ]]; then 2773 if [[ "${dir}" == "__pycache__" ]]; then
2671 base_module_name="${compiled_file##*/}" 2774 base_module_name="${compiled_file##*/}"
2672 base_module_name="${base_module_name%\$py.class}" 2775 base_module_name="${base_module_name%\$py.class}"
… …
2677 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2780 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2678 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2781 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2679 else 2782 else
2680 [[ -f "${py_file}" ]] && continue 2783 [[ -f "${py_file}" ]] && continue
2681 fi 2784 fi
2682 echo "${_BLUE}<<< ${compiled_file}${_NORMAL}"
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}"
2693 else
2694 break 2794 break
2695 fi 2795 fi
2696 dir="${dir%/*}" 2796 dir="${dir%/*}"
2697 done 2797 done
2698 done 2798 done
… …
2829 done 2929 done
2830 for dir in "${evaluated_dirs[@]}"; do 2930 for dir in "${evaluated_dirs[@]}"; do
2831 eval "dirs+=(\"\${root}${dir}\")" 2931 eval "dirs+=(\"\${root}${dir}\")"
2832 done 2932 done
2833 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2933 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2834 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2934 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2835 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2935 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2836 fi 2936 fi
2837 _python_clean_compiled_modules "${dirs[@]}" 2937 _python_clean_compiled_modules "${dirs[@]}"
2838 fi 2938 fi
2839 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2939 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
… …
2842 done 2942 done
2843 for file in "${evaluated_files[@]}"; do 2943 for file in "${evaluated_files[@]}"; do
2844 eval "files+=(\"\${root}${file}\")" 2944 eval "files+=(\"\${root}${file}\")"
2845 done 2945 done
2846 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1" 2946 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2847 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2947 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2848 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1" 2948 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2849 fi 2949 fi
2850 _python_clean_compiled_modules "${files[@]}" 2950 _python_clean_compiled_modules "${files[@]}"
2851 fi 2951 fi
2852 eend "${return_code}" 2952 eend "${return_code}"
… …
2873 return_code="0" 2973 return_code="0"
2874 stderr="" 2974 stderr=""
2875 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2975 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2876 if ((${#other_dirs[@]})); then 2976 if ((${#other_dirs[@]})); then
2877 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2977 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 2978 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" 2979 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2880 fi 2980 fi
2881 _python_clean_compiled_modules "${other_dirs[@]}" 2981 _python_clean_compiled_modules "${other_dirs[@]}"
2882 fi 2982 fi
2883 if ((${#other_files[@]})); then 2983 if ((${#other_files[@]})); then
2884 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1" 2984 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 2985 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" 2986 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2887 fi 2987 fi
2888 _python_clean_compiled_modules "${other_files[@]}" 2988 _python_clean_compiled_modules "${other_files[@]}"
2889 fi 2989 fi
2890 eend "${return_code}" 2990 eend "${return_code}"
… …
3077} 3177}
3078 3178
3079# ================================================================================================ 3179# ================================================================================================
3080# ===================================== DEPRECATED FUNCTIONS ===================================== 3180# ===================================== DEPRECATED FUNCTIONS =====================================
3081# ================================================================================================ 3181# ================================================================================================
3182
3183fi # _PYTHON_ECLASS_INHERITED
Legend:
Removed from v.1.127  
changed lines
  Added in v.1.156
  ViewVC Help
Powered by ViewVC 1.1.13