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

Diff of /eclass/python.eclass

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

Revision 1.117 Revision 1.139
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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.117 2011/07/04 11:28:24 djc Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.139 2011/10/15 20:58:08 phajdan.jr 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
12inherit multilib 12inherit multilib
13 13
14if ! has "${EAPI:-0}" 0 1 2 3; then 14if ! has "${EAPI:-0}" 0 1 2 3 4; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 15 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 16fi
17 17
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.0 3.1 3.2 3.3) 19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
21_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.5)
21_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]}) 22_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
22 23
23# ================================================================================================ 24# ================================================================================================
24# ===================================== HANDLING OF METADATA ===================================== 25# ===================================== HANDLING OF METADATA =====================================
25# ================================================================================================ 26# ================================================================================================
27
28_PYTHON_ABI_PATTERN_REGEX="([[:alnum:]]|\.|-|\*|\[|\])+"
26 29
27_python_check_python_abi_matching() { 30_python_check_python_abi_matching() {
28 local pattern patterns patterns_list="0" PYTHON_ABI 31 local pattern patterns patterns_list="0" PYTHON_ABI
29 32
30 while (($#)); do 33 while (($#)); do
… …
56 pattern="$2" 59 pattern="$2"
57 60
58 if [[ "${pattern}" == *"-cpython" ]]; then 61 if [[ "${pattern}" == *"-cpython" ]]; then
59 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]] 62 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]]
60 elif [[ "${pattern}" == *"-jython" ]]; then 63 elif [[ "${pattern}" == *"-jython" ]]; then
64 [[ "${PYTHON_ABI}" == ${pattern} ]]
65 elif [[ "${pattern}" == *"-pypy-"* ]]; then
61 [[ "${PYTHON_ABI}" == ${pattern} ]] 66 [[ "${PYTHON_ABI}" == ${pattern} ]]
62 else 67 else
63 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 68 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
64 [[ "${PYTHON_ABI}" == ${pattern} ]] 69 [[ "${PYTHON_ABI}" == ${pattern} ]]
65 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 70 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
66 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]] 71 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]]
72 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
73 [[ "${PYTHON_ABI%-pypy-*}" == ${pattern} ]]
67 else 74 else
68 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'" 75 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'"
69 fi 76 fi
70 fi 77 fi
71 else 78 else
… …
76 return 0 83 return 0
77 fi 84 fi
78 done <<< "${patterns}" 85 done <<< "${patterns}"
79 86
80 return 1 87 return 1
88 fi
89}
90
91_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
94 return 0
95 else
96 return 1
97 fi
98 else
99 die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
81 fi 100 fi
82} 101}
83 102
84# @ECLASS-VARIABLE: PYTHON_DEPEND 103# @ECLASS-VARIABLE: PYTHON_DEPEND
85# @DESCRIPTION: 104# @DESCRIPTION:
… …
278_python_implementation() { 297_python_implementation() {
279 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then 298 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
280 return 0 299 return 0
281 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then 300 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
282 return 0 301 return 0
302 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
303 return 0
283 else 304 else
284 return 1 305 return 1
285 fi
286}
287
288_python_package_supporting_installation_for_multiple_python_abis() {
289 if [[ "${EBUILD_PHASE}" == "depend" ]]; then
290 die "${FUNCNAME}() cannot be used in global scope"
291 fi
292
293 if has "${EAPI:-0}" 0 1 2 3 4; then
294 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
295 return 0
296 else
297 return 1
298 fi
299 else
300 die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
301 fi 306 fi
302} 307}
303 308
304_python_abi-specific_local_scope() { 309_python_abi-specific_local_scope() {
305 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] 310 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
… …
462 467
463if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then 468if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
464 EXPORT_FUNCTIONS pkg_setup 469 EXPORT_FUNCTIONS pkg_setup
465fi 470fi
466 471
467_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|python)' 472_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
468 473
469# @FUNCTION: python_convert_shebangs 474# @FUNCTION: python_convert_shebangs
470# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 475# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
471# @DESCRIPTION: 476# @DESCRIPTION:
472# Convert shebangs in specified files. Directories can be specified only with --recursive option. 477# Convert shebangs in specified files. Directories can be specified only with --recursive option.
… …
540 545
541 if [[ "${quiet}" == "0" ]]; then 546 if [[ "${quiet}" == "0" ]]; then
542 einfo "Converting shebang in '${file}'" 547 einfo "Converting shebang in '${file}'"
543 fi 548 fi
544 549
545 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed" 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"
546 fi 551 fi
547 done 552 done
548} 553}
549 554
550# @FUNCTION: python_clean_installation_image 555# @FUNCTION: python_clean_installation_image
… …
820 eval "_PYTHON_SAVED_${variable}=\"\${!variable}\"" 825 eval "_PYTHON_SAVED_${variable}=\"\${!variable}\""
821 for prefix in PYTHON_USER_ PYTHON_; do 826 for prefix in PYTHON_USER_ PYTHON_; do
822 if [[ "$(declare -p ${prefix}${variable} 2> /dev/null)" == "declare -a ${prefix}${variable}="* ]]; then 827 if [[ "$(declare -p ${prefix}${variable} 2> /dev/null)" == "declare -a ${prefix}${variable}="* ]]; then
823 eval "array=(\"\${${prefix}${variable}[@]}\")" 828 eval "array=(\"\${${prefix}${variable}[@]}\")"
824 for element in "${array[@]}"; do 829 for element in "${array[@]}"; do
825 if [[ "${element}" =~ ^([[:alnum:]]|\.|-|\*|\[|\])+\ (\+|-)\ .+ ]]; then 830 if [[ "${element}" =~ ^${_PYTHON_ABI_PATTERN_REGEX}\ (\+|-)\ .+ ]]; then
826 pattern="${element%% *}" 831 pattern="${element%% *}"
827 element="${element#* }" 832 element="${element#* }"
828 operator="${element%% *}" 833 operator="${element%% *}"
829 flags="${element#* }" 834 flags="${element#* }"
830 if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then 835 if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then
… …
1000 iterated_PYTHON_ABIS="${PYTHON_ABIS}" 1005 iterated_PYTHON_ABIS="${PYTHON_ABIS}"
1001 fi 1006 fi
1002 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do 1007 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
1003 if [[ "${EBUILD_PHASE}" == "test" ]] && _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${PYTHON_TESTS_RESTRICTED_ABIS}"; then 1008 if [[ "${EBUILD_PHASE}" == "test" ]] && _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${PYTHON_TESTS_RESTRICTED_ABIS}"; then
1004 if [[ "${quiet}" == "0" ]]; then 1009 if [[ "${quiet}" == "0" ]]; then
1005 echo " ${_GREEN}*${_NORMAL} ${_BLUE}Testing of ${CATEGORY}/${PF} with $(python_get_implementation) $(python_get_version) skipped${_NORMAL}" 1010 echo " ${_GREEN}*${_NORMAL} ${_BLUE}Testing of ${CATEGORY}/${PF} with $(python_get_implementation_and_version) skipped${_NORMAL}"
1006 fi 1011 fi
1007 continue 1012 continue
1008 fi 1013 fi
1009 1014
1010 _python_prepare_flags 1015 _python_prepare_flags
1011 1016
1012 if [[ "${quiet}" == "0" ]]; then 1017 if [[ "${quiet}" == "0" ]]; then
1013 if [[ -n "${action_message_template}" ]]; then 1018 if [[ -n "${action_message_template}" ]]; then
1014 eval "action_message=\"${action_message_template}\"" 1019 eval "action_message=\"${action_message_template}\""
1015 else 1020 else
1016 action_message="${action} of ${CATEGORY}/${PF} with $(python_get_implementation) $(python_get_version)..." 1021 action_message="${action} of ${CATEGORY}/${PF} with $(python_get_implementation_and_version)..."
1017 fi 1022 fi
1018 echo " ${_GREEN}*${_NORMAL} ${_BLUE}${action_message}${_NORMAL}" 1023 echo " ${_GREEN}*${_NORMAL} ${_BLUE}${action_message}${_NORMAL}"
1019 fi 1024 fi
1020 1025
1021 if [[ "${separate_build_dirs}" == "1" ]]; then 1026 if [[ "${separate_build_dirs}" == "1" ]]; then
… …
1045 1050
1046 if [[ "${return_code}" -ne 0 ]]; then 1051 if [[ "${return_code}" -ne 0 ]]; then
1047 if [[ -n "${failure_message_template}" ]]; then 1052 if [[ -n "${failure_message_template}" ]]; then
1048 eval "failure_message=\"${failure_message_template}\"" 1053 eval "failure_message=\"${failure_message_template}\""
1049 else 1054 else
1050 failure_message="${action} failed with $(python_get_implementation) $(python_get_version) in ${function}() function" 1055 failure_message="${action} failed with $(python_get_implementation_and_version) in ${function}() function"
1051 fi 1056 fi
1052 1057
1053 if [[ "${nonfatal}" == "1" ]]; then 1058 if [[ "${nonfatal}" == "1" ]]; then
1054 if [[ "${quiet}" == "0" ]]; then 1059 if [[ "${quiet}" == "0" ]]; then
1055 ewarn "${failure_message}" 1060 ewarn "${failure_message}"
… …
1226import os 1231import os
1227import re 1232import re
1228import subprocess 1233import subprocess
1229import sys 1234import sys
1230 1235
1231cpython_re = re.compile(r"^python(\d+\.\d+)$") 1236cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1237jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1238pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1239cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1232jython_re = re.compile(r"^jython(\d+\.\d+)$") 1240jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1241pypy_interpreter_re = re.compile(r"^pypy-c(\d+\.\d+)$")
1233python_shebang_re = re.compile(r"^#! *(${EPREFIX}/usr/bin/python|(${EPREFIX})?/usr/bin/env +(${EPREFIX}/usr/bin/)?python)") 1242cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1243python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
1234python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") 1244python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1235 1245
1236def get_PYTHON_ABI(EPYTHON): 1246pypy_versions_mapping = {
1237 cpython_matched = cpython_re.match(EPYTHON) 1247 "1.5": "2.7"
1238 jython_matched = jython_re.match(EPYTHON) 1248}
1249
1250def get_PYTHON_ABI(python_interpreter):
1251 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1252 jython_matched = jython_interpreter_re.match(python_interpreter)
1253 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1239 if cpython_matched is not None: 1254 if cpython_matched is not None:
1240 PYTHON_ABI = cpython_matched.group(1) 1255 PYTHON_ABI = cpython_matched.group(1)
1241 elif jython_matched is not None: 1256 elif jython_matched is not None:
1242 PYTHON_ABI = jython_matched.group(1) + "-jython" 1257 PYTHON_ABI = jython_matched.group(1) + "-jython"
1258 elif pypy_matched is not None:
1259 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1243 else: 1260 else:
1244 PYTHON_ABI = None 1261 PYTHON_ABI = None
1245 return PYTHON_ABI 1262 return PYTHON_ABI
1246 1263
1264def get_python_interpreter(PYTHON_ABI):
1265 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1266 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1267 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1268 if cpython_matched is not None:
1269 python_interpreter = "python" + cpython_matched.group(1)
1270 elif jython_matched is not None:
1271 python_interpreter = "jython" + jython_matched.group(1)
1272 elif pypy_matched is not None:
1273 python_interpreter = "pypy-c" + pypy_matched.group(1)
1274 else:
1275 python_interpreter = None
1276 return python_interpreter
1277
1247EOF 1278EOF
1248 if [[ "$?" != "0" ]]; then 1279 if [[ "$?" != "0" ]]; then
1249 die "${FUNCNAME}(): Generation of '$1' failed" 1280 die "${FUNCNAME}(): Generation of '$1' failed"
1250 fi 1281 fi
1251 if [[ "${respect_EPYTHON}" == "1" ]]; then 1282 if [[ "${respect_EPYTHON}" == "1" ]]; then
1252 cat << EOF >> "${file}" 1283 cat << EOF >> "${file}"
1253EPYTHON = os.environ.get("EPYTHON") 1284python_interpreter = os.environ.get("EPYTHON")
1254if EPYTHON: 1285if python_interpreter:
1255 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1286 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1256 if PYTHON_ABI is None: 1287 if PYTHON_ABI is None:
1257 sys.stderr.write("EPYTHON variable has unrecognized value '%s'\n" % EPYTHON) 1288 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1258 sys.exit(1) 1289 sys.exit(1)
1259else: 1290else:
1260 try: 1291 try:
1292 environment = os.environ.copy()
1293 environment["ROOT"] = "/"
1261 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], stdout=subprocess.PIPE) 1294 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE)
1262 if eselect_process.wait() != 0: 1295 if eselect_process.wait() != 0:
1263 raise ValueError 1296 raise ValueError
1264 except (OSError, ValueError): 1297 except (OSError, ValueError):
1265 sys.stderr.write("Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n") 1298 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1266 sys.exit(1) 1299 sys.exit(1)
1267 1300
1268 EPYTHON = eselect_process.stdout.read() 1301 python_interpreter = eselect_process.stdout.read()
1269 if not isinstance(EPYTHON, str): 1302 if not isinstance(python_interpreter, str):
1270 # Python 3 1303 # Python 3
1271 EPYTHON = EPYTHON.decode() 1304 python_interpreter = python_interpreter.decode()
1272 EPYTHON = EPYTHON.rstrip("\n") 1305 python_interpreter = python_interpreter.rstrip("\n")
1273 1306
1274 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1307 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1275 if PYTHON_ABI is None: 1308 if PYTHON_ABI is None:
1276 sys.stderr.write("'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % EPYTHON) 1309 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1277 sys.exit(1) 1310 sys.exit(1)
1278 1311
1279wrapper_script_path = os.path.realpath(sys.argv[0]) 1312wrapper_script_path = os.path.realpath(sys.argv[0])
1280target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1313target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1281if not os.path.exists(target_executable_path): 1314if not os.path.exists(target_executable_path):
1282 sys.stderr.write("'%s' does not exist\n" % target_executable_path) 1315 sys.stderr.write("%s: '%s' does not exist\n" % (sys.argv[0], target_executable_path))
1283 sys.exit(1) 1316 sys.exit(1)
1284EOF 1317EOF
1285 if [[ "$?" != "0" ]]; then 1318 if [[ "$?" != "0" ]]; then
1286 die "${FUNCNAME}(): Generation of '$1' failed" 1319 die "${FUNCNAME}(): Generation of '$1' failed"
1287 fi 1320 fi
1288 else 1321 else
1289 cat << EOF >> "${file}" 1322 cat << EOF >> "${file}"
1290try: 1323try:
1324 environment = os.environ.copy()
1325 environment["ROOT"] = "/"
1291 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], stdout=subprocess.PIPE) 1326 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE)
1292 if eselect_process.wait() != 0: 1327 if eselect_process.wait() != 0:
1293 raise ValueError 1328 raise ValueError
1294except (OSError, ValueError): 1329except (OSError, ValueError):
1295 sys.stderr.write("Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n") 1330 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1296 sys.exit(1) 1331 sys.exit(1)
1297 1332
1298EPYTHON = eselect_process.stdout.read() 1333python_interpreter = eselect_process.stdout.read()
1299if not isinstance(EPYTHON, str): 1334if not isinstance(python_interpreter, str):
1300 # Python 3 1335 # Python 3
1301 EPYTHON = EPYTHON.decode() 1336 python_interpreter = python_interpreter.decode()
1302EPYTHON = EPYTHON.rstrip("\n") 1337python_interpreter = python_interpreter.rstrip("\n")
1303 1338
1304PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1339PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1305if PYTHON_ABI is None: 1340if PYTHON_ABI is None:
1306 sys.stderr.write("'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % EPYTHON) 1341 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1307 sys.exit(1) 1342 sys.exit(1)
1308 1343
1309wrapper_script_path = os.path.realpath(sys.argv[0]) 1344wrapper_script_path = os.path.realpath(sys.argv[0])
1310for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1345for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1311 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1346 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1312 if os.path.exists(target_executable_path): 1347 if os.path.exists(target_executable_path):
1313 break 1348 break
1314else: 1349else:
1315 sys.stderr.write("No target script exists for '%s'\n" % wrapper_script_path) 1350 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1351 sys.exit(1)
1352
1353python_interpreter = get_python_interpreter(PYTHON_ABI)
1354if python_interpreter is None:
1355 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1316 sys.exit(1) 1356 sys.exit(1)
1317EOF 1357EOF
1318 if [[ "$?" != "0" ]]; then 1358 if [[ "$?" != "0" ]]; then
1319 die "${FUNCNAME}(): Generation of '$1' failed" 1359 die "${FUNCNAME}(): Generation of '$1' failed"
1320 fi 1360 fi
1321 fi 1361 fi
1322 cat << EOF >> "${file}" 1362 cat << EOF >> "${file}"
1323 1363
1324target_executable = open(target_executable_path, "rb") 1364target_executable = open(target_executable_path, "rb")
1325target_executable_first_line = target_executable.readline() 1365target_executable_first_line = target_executable.readline()
1366target_executable.close()
1326if not isinstance(target_executable_first_line, str): 1367if not isinstance(target_executable_first_line, str):
1327 # Python 3 1368 # Python 3
1328 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1369 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1329 1370
1371options = []
1372python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1373if python_shebang_options_matched is not None:
1374 options = [python_shebang_options_matched.group(1)]
1375
1330python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1376cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1331target_executable.close()
1332 1377
1333if python_shebang_matched is not None: 1378if cpython_shebang_matched is not None:
1334 try: 1379 try:
1335 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1380 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1336 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1381 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1337 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1382 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1338 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1383 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1339 if python_verification_process.wait() != 0: 1384 if python_verification_process.wait() != 0:
1340 raise ValueError 1385 raise ValueError
… …
1345 python_verification_output = python_verification_output.decode() 1390 python_verification_output = python_verification_output.decode()
1346 1391
1347 if not python_verification_output_re.match(python_verification_output): 1392 if not python_verification_output_re.match(python_verification_output):
1348 raise ValueError 1393 raise ValueError
1349 1394
1350 if cpython_re.match(EPYTHON) is not None: 1395 if cpython_interpreter_re.match(python_interpreter) is not None:
1351 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1396 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1352 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1397 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1353 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1398 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1354 1399
1355 if hasattr(os, "execv"): 1400 if hasattr(os, "execv"):
1356 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1401 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1357 else: 1402 else:
1358 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1403 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1359 except (KeyboardInterrupt, SystemExit): 1404 except (KeyboardInterrupt, SystemExit):
1360 raise 1405 raise
1361 except: 1406 except:
1362 pass 1407 pass
1363 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"): 1408 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"):
… …
1405 fi 1450 fi
1406 1451
1407 _python_check_python_pkg_setup_execution 1452 _python_check_python_pkg_setup_execution
1408 _python_initialize_prefix_variables 1453 _python_initialize_prefix_variables
1409 1454
1410 local b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=() 1455 local absolute_file b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=()
1411 1456
1412 while (($#)); do 1457 while (($#)); do
1413 case "$1" in 1458 case "$1" in
1414 -q|--quiet) 1459 -q|--quiet)
1415 quiet="1" 1460 quiet="1"
… …
1497 break 1542 break
1498 fi 1543 fi
1499 done 1544 done
1500 fi 1545 fi
1501 1546
1502 [[ "${version_executable}" == "0" || ! -x "${file}" ]] && continue 1547 [[ "${version_executable}" == "0" ]] && continue
1503 1548
1549 if [[ -L "${file}" ]]; then
1550 absolute_file="$(readlink "${file}")"
1551 if [[ "${absolute_file}" == /* ]]; then
1552 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file##/}"
1553 else
1554 if [[ "${file}" == */* ]]; then
1555 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file%/*}/${absolute_file}"
1556 else
1557 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file}"
1558 fi
1559 fi
1560 else
1561 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file}"
1562 fi
1563
1564 [[ ! -x "${absolute_file}" ]] && continue
1565
1504 shebang="$(head -n1 "${file}")" || die "Extraction of shebang from '${file}' failed" 1566 shebang="$(head -n1 "${absolute_file}")" || die "Extraction of shebang from '${absolute_file}' failed"
1505 1567
1506 if [[ "${version_executable}" == "2" ]]; then 1568 if [[ "${version_executable}" == "2" ]]; then
1507 wrapper_scripts+=("${ED}${file}") 1569 wrapper_scripts+=("${ED}${file}")
1508 elif [[ "${version_executable}" == "1" ]]; then 1570 elif [[ "${version_executable}" == "1" ]]; then
1509 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then 1571 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then
… …
1520 fi 1582 fi
1521 1583
1522 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed" 1584 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed"
1523 1585
1524 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then 1586 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then
1587 if [[ -L "${file}-${PYTHON_ABI}" ]]; then
1588 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${absolute_file}"
1589 else
1525 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}" 1590 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}"
1591 fi
1526 fi 1592 fi
1527 done 1593 done
1528 1594
1529 popd > /dev/null || die "popd failed" 1595 popd > /dev/null || die "popd failed"
1530 1596
1531 if ROOT="/" has_version sys-apps/coreutils; then 1597 if ROOT="/" has_version sys-apps/coreutils; then
1532 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" 1598 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"
1533 else 1599 else
1534 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1600 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1535 fi 1601 fi
1536 done 1602 done
1537 1603
… …
1555 stdout = sys.stdout.buffer 1621 stdout = sys.stdout.buffer
1556else: 1622else:
1557 # Python 2 1623 # Python 2
1558 stdout = sys.stdout 1624 stdout = sys.stdout
1559 1625
1626python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1560files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1627files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1628python_wrapper_scripts_file.close()
1561 1629
1562for file in sorted(files): 1630for file in sorted(files):
1563 stdout.write(file) 1631 stdout.write(file)
1564 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1632 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1565 1633
… …
1630 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1698 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1631 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1699 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1632} 1700}
1633 1701
1634# @FUNCTION: python_need_rebuild 1702# @FUNCTION: python_need_rebuild
1703# @DESCRIPTION:
1635# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1704# Mark current package for rebuilding by python-updater after
1636# switching of active version of Python. 1705# switching of active version of Python.
1637python_need_rebuild() { 1706python_need_rebuild() {
1638 if _python_package_supporting_installation_for_multiple_python_abis; then 1707 if _python_package_supporting_installation_for_multiple_python_abis; then
1639 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs" 1708 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1640 fi 1709 fi
… …
1650 1719
1651# ================================================================================================ 1720# ================================================================================================
1652# ======================================= GETTER FUNCTIONS ======================================= 1721# ======================================= GETTER FUNCTIONS =======================================
1653# ================================================================================================ 1722# ================================================================================================
1654 1723
1655_PYTHON_ABI_EXTRACTION_COMMAND='import platform 1724_PYTHON_ABI_EXTRACTION_COMMAND=\
1725'import platform
1656import sys 1726import sys
1657sys.stdout.write(".".join(str(x) for x in sys.version_info[:2])) 1727sys.stdout.write(".".join(str(x) for x in sys.version_info[:2]))
1658if platform.system()[:4] == "Java": 1728if platform.system()[:4] == "Java":
1659 sys.stdout.write("-jython")' 1729 sys.stdout.write("-jython")
1730elif hasattr(platform, "python_implementation") and platform.python_implementation() == "PyPy":
1731 sys.stdout.write("-pypy-" + ".".join(str(x) for x in sys.pypy_version_info[:2]))'
1660 1732
1661_python_get_implementation() { 1733_python_get_implementation() {
1662 local ignore_invalid="0" 1734 local ignore_invalid="0"
1663 1735
1664 while (($#)); do 1736 while (($#)); do
… …
1686 1758
1687 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 1759 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
1688 echo "CPython" 1760 echo "CPython"
1689 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 1761 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
1690 echo "Jython" 1762 echo "Jython"
1763 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
1764 echo "PyPy"
1691 else 1765 else
1692 if [[ "${ignore_invalid}" == "0" ]]; then 1766 if [[ "${ignore_invalid}" == "0" ]]; then
1693 die "${FUNCNAME}(): Unrecognized Python ABI '$1'" 1767 die "${FUNCNAME}(): Unrecognized Python ABI '$1'"
1694 fi 1768 fi
1695 fi 1769 fi
… …
1758 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 1832 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
1759 fi 1833 fi
1760 _python_calculate_PYTHON_ABIS 1834 _python_calculate_PYTHON_ABIS
1761 PYTHON_ABI="${PYTHON_ABIS##* }" 1835 PYTHON_ABI="${PYTHON_ABIS##* }"
1762 elif [[ "${python2}" == "1" ]]; then 1836 elif [[ "${python2}" == "1" ]]; then
1763 PYTHON_ABI="$(eselect python show --python2 --ABI)" 1837 PYTHON_ABI="$(ROOT="/" eselect python show --python2 --ABI)"
1764 if [[ -z "${PYTHON_ABI}" ]]; then 1838 if [[ -z "${PYTHON_ABI}" ]]; then
1765 die "${FUNCNAME}(): Active version of CPython 2 not set" 1839 die "${FUNCNAME}(): Active version of CPython 2 not set"
1766 elif [[ "${PYTHON_ABI}" != "2."* ]]; then 1840 elif [[ "${PYTHON_ABI}" != "2."* ]]; then
1767 die "${FUNCNAME}(): Internal error in \`eselect python show --python2\`" 1841 die "${FUNCNAME}(): Internal error in \`eselect python show --python2\`"
1768 fi 1842 fi
1769 elif [[ "${python3}" == "1" ]]; then 1843 elif [[ "${python3}" == "1" ]]; then
1770 PYTHON_ABI="$(eselect python show --python3 --ABI)" 1844 PYTHON_ABI="$(ROOT="/" eselect python show --python3 --ABI)"
1771 if [[ -z "${PYTHON_ABI}" ]]; then 1845 if [[ -z "${PYTHON_ABI}" ]]; then
1772 die "${FUNCNAME}(): Active version of CPython 3 not set" 1846 die "${FUNCNAME}(): Active version of CPython 3 not set"
1773 elif [[ "${PYTHON_ABI}" != "3."* ]]; then 1847 elif [[ "${PYTHON_ABI}" != "3."* ]]; then
1774 die "${FUNCNAME}(): Internal error in \`eselect python show --python3\`" 1848 die "${FUNCNAME}(): Internal error in \`eselect python show --python3\`"
1775 fi 1849 fi
… …
1804 else 1878 else
1805 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1879 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1806 python_interpreter="python${PYTHON_ABI}" 1880 python_interpreter="python${PYTHON_ABI}"
1807 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1881 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1808 python_interpreter="jython${PYTHON_ABI%-jython}" 1882 python_interpreter="jython${PYTHON_ABI%-jython}"
1883 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1884 python_interpreter="pypy-c${PYTHON_ABI#*-pypy-}"
1809 fi 1885 fi
1810 1886
1811 if [[ "${absolute_path_output}" == "1" ]]; then 1887 if [[ "${absolute_path_output}" == "1" ]]; then
1812 echo -n "${EPREFIX}/usr/bin/${python_interpreter}" 1888 echo -n "${EPREFIX}/usr/bin/${python_interpreter}"
1813 else 1889 else
… …
1906 if [[ "${EAPI:-0}" == "0" ]]; then 1982 if [[ "${EAPI:-0}" == "0" ]]; then
1907 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1983 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1908 echo "=dev-lang/python-${PYTHON_ABI}*" 1984 echo "=dev-lang/python-${PYTHON_ABI}*"
1909 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1985 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1910 echo "=dev-java/jython-${PYTHON_ABI%-jython}*" 1986 echo "=dev-java/jython-${PYTHON_ABI%-jython}*"
1987 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1988 echo "=dev-python/pypy-${PYTHON_ABI#*-pypy-}*"
1911 fi 1989 fi
1912 else 1990 else
1913 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1991 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1914 echo "dev-lang/python:${PYTHON_ABI}" 1992 echo "dev-lang/python:${PYTHON_ABI}"
1915 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1993 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1916 echo "dev-java/jython:${PYTHON_ABI%-jython}" 1994 echo "dev-java/jython:${PYTHON_ABI%-jython}"
1995 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1996 echo "dev-python/pypy:${PYTHON_ABI#*-pypy-}"
1917 fi 1997 fi
1918 fi 1998 fi
1919} 1999}
1920 2000
1921# @FUNCTION: python_get_includedir 2001# @FUNCTION: python_get_includedir
… …
1968 2048
1969 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2049 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1970 echo "${prefix}usr/include/python${PYTHON_ABI}" 2050 echo "${prefix}usr/include/python${PYTHON_ABI}"
1971 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2051 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1972 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include" 2052 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include"
2053 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2054 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/include"
1973 fi 2055 fi
1974} 2056}
1975 2057
1976# @FUNCTION: python_get_libdir 2058# @FUNCTION: python_get_libdir
1977# @USAGE: [-b|--base-path] [-f|--final-ABI] 2059# @USAGE: [-b|--base-path] [-f|--final-ABI]
1978# @DESCRIPTION: 2060# @DESCRIPTION:
1979# Print path to Python library directory. 2061# Print path to Python standard library directory.
1980# If --base-path option is specified, then path not prefixed with "/" is printed. 2062# If --base-path option is specified, then path not prefixed with "/" is printed.
1981# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2063# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
1982python_get_libdir() { 2064python_get_libdir() {
1983 _python_check_python_pkg_setup_execution 2065 _python_check_python_pkg_setup_execution
1984 2066
… …
2023 2105
2024 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2106 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2025 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}" 2107 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}"
2026 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2108 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2027 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib" 2109 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib"
2110 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2111 die "${FUNCNAME}(): PyPy has multiple standard library directories"
2028 fi 2112 fi
2029} 2113}
2030 2114
2031# @FUNCTION: python_get_sitedir 2115# @FUNCTION: python_get_sitedir
2032# @USAGE: [-b|--base-path] [-f|--final-ABI] 2116# @USAGE: [-b|--base-path] [-f|--final-ABI]
… …
2035# If --base-path option is specified, then path not prefixed with "/" is printed. 2119# If --base-path option is specified, then path not prefixed with "/" is printed.
2036# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2120# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2037python_get_sitedir() { 2121python_get_sitedir() {
2038 _python_check_python_pkg_setup_execution 2122 _python_check_python_pkg_setup_execution
2039 2123
2040 local final_ABI="0" options=() 2124 local base_path="0" final_ABI="0" prefix PYTHON_ABI="${PYTHON_ABI}"
2041 2125
2042 while (($#)); do 2126 while (($#)); do
2043 case "$1" in 2127 case "$1" in
2044 -b|--base-path) 2128 -b|--base-path)
2045 options+=("$1") 2129 base_path="1"
2046 ;; 2130 ;;
2047 -f|--final-ABI) 2131 -f|--final-ABI)
2048 final_ABI="1" 2132 final_ABI="1"
2049 options+=("$1")
2050 ;; 2133 ;;
2051 -*) 2134 -*)
2052 die "${FUNCNAME}(): Unrecognized option '$1'" 2135 die "${FUNCNAME}(): Unrecognized option '$1'"
2053 ;; 2136 ;;
2054 *) 2137 *)
… …
2056 ;; 2139 ;;
2057 esac 2140 esac
2058 shift 2141 shift
2059 done 2142 done
2060 2143
2144 if [[ "${base_path}" == "0" ]]; then
2145 prefix="/"
2146 fi
2147
2061 if [[ "${final_ABI}" == "1" ]]; then 2148 if [[ "${final_ABI}" == "1" ]]; then
2062 if ! _python_package_supporting_installation_for_multiple_python_abis; then 2149 if ! _python_package_supporting_installation_for_multiple_python_abis; then
2063 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 2150 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2064 fi 2151 fi
2152 PYTHON_ABI="$(PYTHON -f --ABI)"
2065 else 2153 else
2066 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then 2154 if _python_package_supporting_installation_for_multiple_python_abis; then
2155 if ! _python_abi-specific_local_scope; then
2067 die "${FUNCNAME}() should be used in ABI-specific local scope" 2156 die "${FUNCNAME}() should be used in ABI-specific local scope"
2068 fi 2157 fi
2158 else
2159 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
2069 fi 2160 fi
2161 fi
2070 2162
2071 echo "$(python_get_libdir "${options[@]}")/site-packages" 2163 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2164 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}/site-packages"
2165 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2166 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib/site-packages"
2167 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2168 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/site-packages"
2169 fi
2072} 2170}
2073 2171
2074# @FUNCTION: python_get_library 2172# @FUNCTION: python_get_library
2075# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option] 2173# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option]
2076# @DESCRIPTION: 2174# @DESCRIPTION:
… …
2133 else 2231 else
2134 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)" 2232 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)"
2135 fi 2233 fi
2136 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2234 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2137 die "${FUNCNAME}(): Jython does not have shared library" 2235 die "${FUNCNAME}(): Jython does not have shared library"
2236 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2237 die "${FUNCNAME}(): PyPy does not have shared library"
2138 fi 2238 fi
2139} 2239}
2140 2240
2141# @FUNCTION: python_get_version 2241# @FUNCTION: python_get_version
2142# @USAGE: [-f|--final-ABI] [--full] [--major] [--minor] [--micro] 2242# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro]
2143# @DESCRIPTION: 2243# @DESCRIPTION:
2144# Print Python version. 2244# Print version of Python implementation.
2145# --full, --major, --minor and --micro options cannot be specified simultaneously. 2245# --full, --major, --minor and --micro options cannot be specified simultaneously.
2146# If --full, --major, --minor and --micro options are not specified, then "${major_version}.${minor_version}" is printed. 2246# If --full, --major, --minor and --micro options are not specified, then "${major_version}.${minor_version}" is printed.
2247# If --language option is specified, then version of Python language is printed.
2248# --language and --full options cannot be specified simultaneously.
2249# --language and --micro options cannot be specified simultaneously.
2147# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2250# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2148python_get_version() { 2251python_get_version() {
2149 _python_check_python_pkg_setup_execution 2252 _python_check_python_pkg_setup_execution
2150 2253
2151 local final_ABI="0" full="0" major="0" minor="0" micro="0" python_command 2254 local final_ABI="0" language="0" language_version full="0" major="0" minor="0" micro="0" PYTHON_ABI="${PYTHON_ABI}" python_command
2152 2255
2153 while (($#)); do 2256 while (($#)); do
2154 case "$1" in 2257 case "$1" in
2155 -f|--final-ABI) 2258 -f|--final-ABI)
2156 final_ABI="1" 2259 final_ABI="1"
2157 ;; 2260 ;;
2261 -l|--language)
2262 language="1"
2263 ;;
2158 --full) 2264 --full)
2159 full="1" 2265 full="1"
2160 ;; 2266 ;;
2161 --major) 2267 --major)
2162 major="1" 2268 major="1"
… …
2175 ;; 2281 ;;
2176 esac 2282 esac
2177 shift 2283 shift
2178 done 2284 done
2179 2285
2180 if [[ "$((${full} + ${major} + ${minor} + ${micro}))" -gt 1 ]]; then
2181 die "${FUNCNAME}(): '--full', '--major', '--minor' or '--micro' options cannot be specified simultaneously"
2182 fi
2183
2184 if [[ "${full}" == "1" ]]; then
2185 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:3]))"
2186 elif [[ "${major}" == "1" ]]; then
2187 python_command="from sys import version_info; print(version_info[0])"
2188 elif [[ "${minor}" == "1" ]]; then
2189 python_command="from sys import version_info; print(version_info[1])"
2190 elif [[ "${micro}" == "1" ]]; then
2191 python_command="from sys import version_info; print(version_info[2])"
2192 else
2193 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
2194 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2195 echo "${PYTHON_ABI}"
2196 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2197 echo "${PYTHON_ABI%-jython}"
2198 fi
2199 return
2200 fi
2201 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
2202 fi
2203
2204 if [[ "${final_ABI}" == "1" ]]; then 2286 if [[ "${final_ABI}" == "1" ]]; then
2205 if ! _python_package_supporting_installation_for_multiple_python_abis; then 2287 if ! _python_package_supporting_installation_for_multiple_python_abis; then
2206 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 2288 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2207 fi 2289 fi
2208 "$(PYTHON -f)" -c "${python_command}"
2209 else 2290 else
2210 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then 2291 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then
2211 die "${FUNCNAME}() should be used in ABI-specific local scope" 2292 die "${FUNCNAME}() should be used in ABI-specific local scope"
2212 fi 2293 fi
2294 fi
2295
2296 if [[ "$((${full} + ${major} + ${minor} + ${micro}))" -gt 1 ]]; then
2297 die "${FUNCNAME}(): '--full', '--major', '--minor' or '--micro' options cannot be specified simultaneously"
2298 fi
2299
2300 if [[ "${language}" == "1" ]]; then
2301 if [[ "${final_ABI}" == "1" ]]; then
2302 PYTHON_ABI="$(PYTHON -f --ABI)"
2303 elif [[ -z "${PYTHON_ABI}" ]]; then
2304 PYTHON_ABI="$(PYTHON --ABI)"
2305 fi
2306 language_version="${PYTHON_ABI%%-*}"
2307 if [[ "${full}" == "1" ]]; then
2308 die "${FUNCNAME}(): '--language' and '--full' options cannot be specified simultaneously"
2309 elif [[ "${major}" == "1" ]]; then
2310 echo "${language_version%.*}"
2311 elif [[ "${minor}" == "1" ]]; then
2312 echo "${language_version#*.}"
2313 elif [[ "${micro}" == "1" ]]; then
2314 die "${FUNCNAME}(): '--language' and '--micro' options cannot be specified simultaneously"
2315 else
2316 echo "${language_version}"
2317 fi
2318 else
2319 if [[ "${full}" == "1" ]]; then
2320 python_command="import sys; print('.'.join(str(x) for x in getattr(sys, 'pypy_version_info', sys.version_info)[:3]))"
2321 elif [[ "${major}" == "1" ]]; then
2322 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[0])"
2323 elif [[ "${minor}" == "1" ]]; then
2324 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[1])"
2325 elif [[ "${micro}" == "1" ]]; then
2326 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[2])"
2327 else
2328 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
2329 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2330 echo "${PYTHON_ABI}"
2331 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2332 echo "${PYTHON_ABI%-jython}"
2333 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2334 echo "${PYTHON_ABI#*-pypy-}"
2335 fi
2336 return
2337 fi
2338 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
2339 fi
2340
2341 if [[ "${final_ABI}" == "1" ]]; then
2342 "$(PYTHON -f)" -c "${python_command}"
2343 else
2213 "$(PYTHON ${PYTHON_ABI})" -c "${python_command}" 2344 "$(PYTHON ${PYTHON_ABI})" -c "${python_command}"
2345 fi
2346 fi
2347}
2348
2349# @FUNCTION: python_get_implementation_and_version
2350# @USAGE: [-f|--final-ABI]
2351# @DESCRIPTION:
2352# Print name and version of Python implementation.
2353# If version of Python implementation is not bound to version of Python language, then
2354# version of Python language is additionally printed.
2355# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2356python_get_implementation_and_version() {
2357 _python_check_python_pkg_setup_execution
2358
2359 local final_ABI="0" PYTHON_ABI="${PYTHON_ABI}"
2360
2361 while (($#)); do
2362 case "$1" in
2363 -f|--final-ABI)
2364 final_ABI="1"
2365 ;;
2366 -*)
2367 die "${FUNCNAME}(): Unrecognized option '$1'"
2368 ;;
2369 *)
2370 die "${FUNCNAME}(): Invalid usage"
2371 ;;
2372 esac
2373 shift
2374 done
2375
2376 if [[ "${final_ABI}" == "1" ]]; then
2377 if ! _python_package_supporting_installation_for_multiple_python_abis; then
2378 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2379 fi
2380 PYTHON_ABI="$(PYTHON -f --ABI)"
2381 else
2382 if _python_package_supporting_installation_for_multiple_python_abis; then
2383 if ! _python_abi-specific_local_scope; then
2384 die "${FUNCNAME}() should be used in ABI-specific local scope"
2385 fi
2386 else
2387 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
2388 fi
2389 fi
2390
2391 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-[[:alnum:]]+-[[:digit:]]+\.[[:digit:]]+$ ]]; then
2392 echo "$(_python_get_implementation "${PYTHON_ABI}") ${PYTHON_ABI##*-} (Python ${PYTHON_ABI%%-*})"
2393 else
2394 echo "$(_python_get_implementation "${PYTHON_ABI}") ${PYTHON_ABI%%-*}"
2214 fi 2395 fi
2215} 2396}
2216 2397
2217# ================================================================================================ 2398# ================================================================================================
2218# ================================ FUNCTIONS FOR RUNNING OF TESTS ================================ 2399# ================================ FUNCTIONS FOR RUNNING OF TESTS ================================
… …
2227_python_test_hook() { 2408_python_test_hook() {
2228 if [[ "$#" -ne 1 ]]; then 2409 if [[ "$#" -ne 1 ]]; then
2229 die "${FUNCNAME}() requires 1 argument" 2410 die "${FUNCNAME}() requires 1 argument"
2230 fi 2411 fi
2231 2412
2232 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2413 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2233 "${FUNCNAME[3]}_$1_hook" 2414 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2234 fi 2415 fi
2235} 2416}
2236 2417
2237# @FUNCTION: python_execute_nosetests 2418# @FUNCTION: python_execute_nosetests
2238# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2419# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
… …
2272 python_test_function() { 2453 python_test_function() {
2273 local evaluated_PYTHONPATH 2454 local evaluated_PYTHONPATH
2274 2455
2275 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2456 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2276 2457
2277 _python_test_hook pre 2458 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2278 2459
2279 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2460 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2280 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2461 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2281 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2462 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2282 else 2463 else
2283 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2464 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2284 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2465 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2285 fi 2466 fi
2286 2467
2287 _python_test_hook post 2468 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2288 } 2469 }
2289 if _python_package_supporting_installation_for_multiple_python_abis; then 2470 if _python_package_supporting_installation_for_multiple_python_abis; then
2290 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2471 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2291 else 2472 else
2292 if [[ -n "${separate_build_dirs}" ]]; then 2473 if [[ -n "${separate_build_dirs}" ]]; then
… …
2336 python_test_function() { 2517 python_test_function() {
2337 local evaluated_PYTHONPATH 2518 local evaluated_PYTHONPATH
2338 2519
2339 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2520 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2340 2521
2341 _python_test_hook pre 2522 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2342 2523
2343 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2524 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2344 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2525 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL}
2345 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?" 2526 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2346 else 2527 else
2347 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2528 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2348 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2529 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2349 fi 2530 fi
2350 2531
2351 _python_test_hook post 2532 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2352 } 2533 }
2353 if _python_package_supporting_installation_for_multiple_python_abis; then 2534 if _python_package_supporting_installation_for_multiple_python_abis; then
2354 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2535 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2355 else 2536 else
2356 if [[ -n "${separate_build_dirs}" ]]; then 2537 if [[ -n "${separate_build_dirs}" ]]; then
… …
2400 python_test_function() { 2581 python_test_function() {
2401 local evaluated_PYTHONPATH 2582 local evaluated_PYTHONPATH
2402 2583
2403 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2584 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2404 2585
2405 _python_test_hook pre 2586 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2406 2587
2407 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2588 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2408 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2589 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2409 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2590 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2410 else 2591 else
2411 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2592 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2412 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2593 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2413 fi 2594 fi
2414 2595
2415 _python_test_hook post 2596 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2416 } 2597 }
2417 if _python_package_supporting_installation_for_multiple_python_abis; then 2598 if _python_package_supporting_installation_for_multiple_python_abis; then
2418 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2599 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2419 else 2600 else
2420 if [[ -n "${separate_build_dirs}" ]]; then 2601 if [[ -n "${separate_build_dirs}" ]]; then
… …
2564 _python_check_python_pkg_setup_execution 2745 _python_check_python_pkg_setup_execution
2565 _python_initialize_prefix_variables 2746 _python_initialize_prefix_variables
2566 2747
2567 if ! has "${EAPI:-0}" 0 1 2 || _python_package_supporting_installation_for_multiple_python_abis || _python_implementation || [[ "${CATEGORY}/${PN}" == "sys-apps/portage" ]]; then 2748 if ! has "${EAPI:-0}" 0 1 2 || _python_package_supporting_installation_for_multiple_python_abis || _python_implementation || [[ "${CATEGORY}/${PN}" == "sys-apps/portage" ]]; then
2568 # PYTHON_ABI variable cannot be local in packages not supporting installation for multiple Python ABIs. 2749 # PYTHON_ABI variable cannot be local in packages not supporting installation for multiple Python ABIs.
2569 local allow_evaluated_non_sitedir_paths="0" dir dirs=() evaluated_dirs=() evaluated_files=() file files=() iterated_PYTHON_ABIS options=() other_dirs=() other_files=() previous_PYTHON_ABI="${PYTHON_ABI}" return_code root site_packages_dirs=() site_packages_files=() 2750 local allow_evaluated_non_sitedir_paths="0" dir dirs=() evaluated_dirs=() evaluated_files=() file files=() iterated_PYTHON_ABIS options=() other_dirs=() other_files=() previous_PYTHON_ABI="${PYTHON_ABI}" return_code root site_packages_dirs=() site_packages_files=() stderr stderr_line
2570 2751
2571 if _python_package_supporting_installation_for_multiple_python_abis; then 2752 if _python_package_supporting_installation_for_multiple_python_abis; then
2572 if has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_ABIS}" ]]; then 2753 if has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_ABIS}" ]]; then
2573 die "${FUNCNAME}(): python_pkg_setup() or python_execute_function() not called" 2754 die "${FUNCNAME}(): python_pkg_setup() or python_execute_function() not called"
2574 fi 2755 fi
… …
2669 options+=("-q") 2850 options+=("-q")
2670 2851
2671 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do 2852 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
2672 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})) || ((${#evaluated_dirs[@]})) || ((${#evaluated_files[@]})); then 2853 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})) || ((${#evaluated_dirs[@]})) || ((${#evaluated_files[@]})); then
2673 return_code="0" 2854 return_code="0"
2855 stderr=""
2674 ebegin "Compilation and optimization of Python modules for $(python_get_implementation) $(python_get_version)" 2856 ebegin "Compilation and optimization of Python modules for $(python_get_implementation_and_version)"
2675 if ((${#site_packages_dirs[@]})) || ((${#evaluated_dirs[@]})); then 2857 if ((${#site_packages_dirs[@]})) || ((${#evaluated_dirs[@]})); then
2676 for dir in "${site_packages_dirs[@]}"; do 2858 for dir in "${site_packages_dirs[@]}"; do
2677 dirs+=("${root}$(python_get_sitedir)/${dir}") 2859 dirs+=("${root}$(python_get_sitedir)/${dir}")
2678 done 2860 done
2679 for dir in "${evaluated_dirs[@]}"; do 2861 for dir in "${evaluated_dirs[@]}"; do
2680 eval "dirs+=(\"\${root}${dir}\")" 2862 eval "dirs+=(\"\${root}${dir}\")"
2681 done 2863 done
2682 "$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" || return_code="1" 2864 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2683 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2865 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2684 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2866 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2685 fi 2867 fi
2686 _python_clean_compiled_modules "${dirs[@]}" 2868 _python_clean_compiled_modules "${dirs[@]}"
2687 fi 2869 fi
2688 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2870 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2689 for file in "${site_packages_files[@]}"; do 2871 for file in "${site_packages_files[@]}"; do
2690 files+=("${root}$(python_get_sitedir)/${file}") 2872 files+=("${root}$(python_get_sitedir)/${file}")
2691 done 2873 done
2692 for file in "${evaluated_files[@]}"; do 2874 for file in "${evaluated_files[@]}"; do
2693 eval "files+=(\"\${root}${file}\")" 2875 eval "files+=(\"\${root}${file}\")"
2694 done 2876 done
2695 "$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" || return_code="1" 2877 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2696 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2878 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2697 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" &> /dev/null || return_code="1" 2879 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2698 fi 2880 fi
2699 _python_clean_compiled_modules "${files[@]}" 2881 _python_clean_compiled_modules "${files[@]}"
2700 fi 2882 fi
2701 eend "${return_code}" 2883 eend "${return_code}"
2884 if [[ -n "${stderr}" ]]; then
2885 eerror "Syntax errors / warnings in Python modules for $(python_get_implementation_and_version):" &> /dev/null
2886 while read stderr_line; do
2887 eerror " ${stderr_line}"
2888 done <<< "${stderr}"
2889 fi
2702 fi 2890 fi
2703 unset dirs files 2891 unset dirs files
2704 done 2892 done
2705 2893
2706 if _python_package_supporting_installation_for_multiple_python_abis; then 2894 if _python_package_supporting_installation_for_multiple_python_abis; then
… …
2712 fi 2900 fi
2713 fi 2901 fi
2714 2902
2715 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 2903 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
2716 return_code="0" 2904 return_code="0"
2905 stderr=""
2717 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation) $(python_get_version)" 2906 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2718 if ((${#other_dirs[@]})); then 2907 if ((${#other_dirs[@]})); then
2719 "$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 2908 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2720 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2909 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2721 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2910 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2722 fi 2911 fi
2723 _python_clean_compiled_modules "${other_dirs[@]}" 2912 _python_clean_compiled_modules "${other_dirs[@]}"
2724 fi 2913 fi
2725 if ((${#other_files[@]})); then 2914 if ((${#other_files[@]})); then
2726 "$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 2915 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
2727 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2916 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2728 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1" 2917 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2729 fi 2918 fi
2730 _python_clean_compiled_modules "${other_files[@]}" 2919 _python_clean_compiled_modules "${other_files[@]}"
2731 fi 2920 fi
2732 eend "${return_code}" 2921 eend "${return_code}"
2922 if [[ -n "${stderr}" ]]; then
2923 eerror "Syntax errors / warnings in Python modules placed outside of site-packages directories for $(python_get_implementation_and_version):" &> /dev/null
2924 while read stderr_line; do
2925 eerror " ${stderr_line}"
2926 done <<< "${stderr}"
2927 fi
2733 fi 2928 fi
2734 else 2929 else
2735 # Deprecated part of python_mod_optimize() 2930 # Deprecated part of python_mod_optimize()
2736 ewarn 2931 ewarn
2737 ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation" 2932 ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation"
Legend:
Removed from v.1.117  
changed lines
  Added in v.1.139
  ViewVC Help
Powered by ViewVC 1.1.13