/[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.150
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.150 2012/02/13 23:50:12 zmedico 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)
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# ================================================================================================
384 _CYAN= 396 _CYAN=
385 _NORMAL= 397 _NORMAL=
386 fi 398 fi
387} 399}
388 400
389unset PYTHON_PKG_SETUP_EXECUTED
390
391_python_check_python_pkg_setup_execution() { 401_python_check_python_pkg_setup_execution() {
392 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return 402 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
393 403
394 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then 404 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
395 die "python_pkg_setup() not called" 405 die "python_pkg_setup() not called"
463 fi 473 fi
464 474
465 PYTHON_PKG_SETUP_EXECUTED="1" 475 PYTHON_PKG_SETUP_EXECUTED="1"
466} 476}
467 477
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)' 478_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
473 479
474# @FUNCTION: python_convert_shebangs 480# @FUNCTION: python_convert_shebangs
475# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 481# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
476# @DESCRIPTION: 482# @DESCRIPTION:
477# Convert shebangs in specified files. Directories can be specified only with --recursive option. 483# Convert shebangs in specified files. Directories can be specified only with --recursive option.
478python_convert_shebangs() { 484python_convert_shebangs() {
479 _python_check_python_pkg_setup_execution 485 _python_check_python_pkg_setup_execution
480 486
481 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" 487 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
482 488
483 while (($#)); do 489 while (($#)); do
484 case "$1" in 490 case "$1" in
485 -r|--recursive) 491 -r|--recursive)
486 recursive="1" 492 recursive="1"
541 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 547 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
542 548
543 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 549 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 550 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
545 551
552 shebangs_converted="1"
553
546 if [[ "${quiet}" == "0" ]]; then 554 if [[ "${quiet}" == "0" ]]; then
547 einfo "Converting shebang in '${file}'" 555 einfo "Converting shebang in '${file}'"
548 fi 556 fi
549 557
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" 558 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 559 fi
560 done
561
562 if [[ "${shebangs_converted}" == "0" ]]; then
563 ewarn "${FUNCNAME}(): Python scripts not found"
564 fi
565}
566
567# @FUNCTION: python_clean_py-compile_files
568# @USAGE: [-q|--quiet]
569# @DESCRIPTION:
570# Clean py-compile files to disable byte-compilation.
571python_clean_py-compile_files() {
572 _python_check_python_pkg_setup_execution
573
574 local file files=() quiet="0"
575
576 while (($#)); do
577 case "$1" in
578 -q|--quiet)
579 quiet="1"
580 ;;
581 -*)
582 die "${FUNCNAME}(): Unrecognized option '$1'"
583 ;;
584 *)
585 die "${FUNCNAME}(): Invalid usage"
586 ;;
587 esac
588 shift
589 done
590
591 while read -d $'\0' -r file; do
592 files+=("${file#./}")
593 done < <(find -name py-compile -type f -print0)
594
595 for file in "${files[@]}"; do
596 if [[ "${quiet}" == "0" ]]; then
597 einfo "Cleaning '${file}' file"
598 fi
599 echo "#!/bin/sh" > "${file}"
552 done 600 done
553} 601}
554 602
555# @FUNCTION: python_clean_installation_image 603# @FUNCTION: python_clean_installation_image
556# @USAGE: [-q|--quiet] 604# @USAGE: [-q|--quiet]
1231import os 1279import os
1232import re 1280import re
1233import subprocess 1281import subprocess
1234import sys 1282import sys
1235 1283
1236cpython_re = re.compile(r"^python(\d+\.\d+)$") 1284cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1285jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1286pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1287cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1237jython_re = re.compile(r"^jython(\d+\.\d+)$") 1288jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1238pypy_re = re.compile(r"^pypy-c(\d+\.\d+)$") 1289pypy_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)") 1290cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1291python_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$") 1292python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1241 1293
1242pypy_versions_mapping = { 1294pypy_versions_mapping = {
1243 "1.5": "2.7" 1295 "1.5": "2.7"
1244} 1296}
1245 1297
1246def get_PYTHON_ABI(EPYTHON): 1298def get_PYTHON_ABI(python_interpreter):
1247 cpython_matched = cpython_re.match(EPYTHON) 1299 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1248 jython_matched = jython_re.match(EPYTHON) 1300 jython_matched = jython_interpreter_re.match(python_interpreter)
1249 pypy_matched = pypy_re.match(EPYTHON) 1301 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1250 if cpython_matched is not None: 1302 if cpython_matched is not None:
1251 PYTHON_ABI = cpython_matched.group(1) 1303 PYTHON_ABI = cpython_matched.group(1)
1252 elif jython_matched is not None: 1304 elif jython_matched is not None:
1253 PYTHON_ABI = jython_matched.group(1) + "-jython" 1305 PYTHON_ABI = jython_matched.group(1) + "-jython"
1254 elif pypy_matched is not None: 1306 elif pypy_matched is not None:
1255 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1) 1307 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1256 else: 1308 else:
1257 PYTHON_ABI = None 1309 PYTHON_ABI = None
1258 return PYTHON_ABI 1310 return PYTHON_ABI
1259 1311
1312def get_python_interpreter(PYTHON_ABI):
1313 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1314 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1315 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1316 if cpython_matched is not None:
1317 python_interpreter = "python" + cpython_matched.group(1)
1318 elif jython_matched is not None:
1319 python_interpreter = "jython" + jython_matched.group(1)
1320 elif pypy_matched is not None:
1321 python_interpreter = "pypy-c" + pypy_matched.group(1)
1322 else:
1323 python_interpreter = None
1324 return python_interpreter
1325
1260EOF 1326EOF
1261 if [[ "$?" != "0" ]]; then 1327 if [[ "$?" != "0" ]]; then
1262 die "${FUNCNAME}(): Generation of '$1' failed" 1328 die "${FUNCNAME}(): Generation of '$1' failed"
1263 fi 1329 fi
1264 if [[ "${respect_EPYTHON}" == "1" ]]; then 1330 if [[ "${respect_EPYTHON}" == "1" ]]; then
1265 cat << EOF >> "${file}" 1331 cat << EOF >> "${file}"
1266EPYTHON = os.environ.get("EPYTHON") 1332python_interpreter = os.environ.get("EPYTHON")
1267if EPYTHON: 1333if python_interpreter:
1268 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1334 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1269 if PYTHON_ABI is None: 1335 if PYTHON_ABI is None:
1270 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1336 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1271 sys.exit(1) 1337 sys.exit(1)
1272else: 1338else:
1273 try: 1339 try:
1274 environment = os.environ.copy() 1340 environment = os.environ.copy()
1275 environment["ROOT"] = "/" 1341 environment["ROOT"] = "/"
1278 raise ValueError 1344 raise ValueError
1279 except (OSError, ValueError): 1345 except (OSError, ValueError):
1280 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1346 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1281 sys.exit(1) 1347 sys.exit(1)
1282 1348
1283 EPYTHON = eselect_process.stdout.read() 1349 python_interpreter = eselect_process.stdout.read()
1284 if not isinstance(EPYTHON, str): 1350 if not isinstance(python_interpreter, str):
1285 # Python 3 1351 # Python 3
1286 EPYTHON = EPYTHON.decode() 1352 python_interpreter = python_interpreter.decode()
1287 EPYTHON = EPYTHON.rstrip("\n") 1353 python_interpreter = python_interpreter.rstrip("\n")
1288 1354
1289 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1355 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1290 if PYTHON_ABI is None: 1356 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)) 1357 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) 1358 sys.exit(1)
1293 1359
1294wrapper_script_path = os.path.realpath(sys.argv[0]) 1360wrapper_script_path = os.path.realpath(sys.argv[0])
1295target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1361target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1296if not os.path.exists(target_executable_path): 1362if not os.path.exists(target_executable_path):
1310 raise ValueError 1376 raise ValueError
1311except (OSError, ValueError): 1377except (OSError, ValueError):
1312 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1378 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1313 sys.exit(1) 1379 sys.exit(1)
1314 1380
1315EPYTHON = eselect_process.stdout.read() 1381python_interpreter = eselect_process.stdout.read()
1316if not isinstance(EPYTHON, str): 1382if not isinstance(python_interpreter, str):
1317 # Python 3 1383 # Python 3
1318 EPYTHON = EPYTHON.decode() 1384 python_interpreter = python_interpreter.decode()
1319EPYTHON = EPYTHON.rstrip("\n") 1385python_interpreter = python_interpreter.rstrip("\n")
1320 1386
1321PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1387PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1322if PYTHON_ABI is None: 1388if 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)) 1389 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) 1390 sys.exit(1)
1325 1391
1326wrapper_script_path = os.path.realpath(sys.argv[0]) 1392wrapper_script_path = os.path.realpath(sys.argv[0])
1327for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1393for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1328 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1394 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1329 if os.path.exists(target_executable_path): 1395 if os.path.exists(target_executable_path):
1330 break 1396 break
1331else: 1397else:
1332 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path)) 1398 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1333 sys.exit(1) 1399 sys.exit(1)
1400
1401python_interpreter = get_python_interpreter(PYTHON_ABI)
1402if python_interpreter is None:
1403 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1404 sys.exit(1)
1334EOF 1405EOF
1335 if [[ "$?" != "0" ]]; then 1406 if [[ "$?" != "0" ]]; then
1336 die "${FUNCNAME}(): Generation of '$1' failed" 1407 die "${FUNCNAME}(): Generation of '$1' failed"
1337 fi 1408 fi
1338 fi 1409 fi
1339 cat << EOF >> "${file}" 1410 cat << EOF >> "${file}"
1340 1411
1341target_executable = open(target_executable_path, "rb") 1412target_executable = open(target_executable_path, "rb")
1342target_executable_first_line = target_executable.readline() 1413target_executable_first_line = target_executable.readline()
1414target_executable.close()
1343if not isinstance(target_executable_first_line, str): 1415if not isinstance(target_executable_first_line, str):
1344 # Python 3 1416 # Python 3
1345 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1417 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1346 1418
1419options = []
1420python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1421if python_shebang_options_matched is not None:
1422 options = [python_shebang_options_matched.group(1)]
1423
1347python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1424cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1348target_executable.close()
1349 1425
1350if python_shebang_matched is not None: 1426if cpython_shebang_matched is not None:
1351 try: 1427 try:
1352 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1428 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1353 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1429 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1354 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1430 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1355 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1431 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1356 if python_verification_process.wait() != 0: 1432 if python_verification_process.wait() != 0:
1357 raise ValueError 1433 raise ValueError
1362 python_verification_output = python_verification_output.decode() 1438 python_verification_output = python_verification_output.decode()
1363 1439
1364 if not python_verification_output_re.match(python_verification_output): 1440 if not python_verification_output_re.match(python_verification_output):
1365 raise ValueError 1441 raise ValueError
1366 1442
1367 if cpython_re.match(EPYTHON) is not None: 1443 if cpython_interpreter_re.match(python_interpreter) is not None:
1368 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1444 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1369 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1445 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1370 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1446 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1371 1447
1372 if hasattr(os, "execv"): 1448 if hasattr(os, "execv"):
1373 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1449 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1374 else: 1450 else:
1375 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1451 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1376 except (KeyboardInterrupt, SystemExit): 1452 except (KeyboardInterrupt, SystemExit):
1377 raise 1453 raise
1378 except: 1454 except:
1379 pass 1455 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"): 1456 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 1640 fi
1565 done 1641 done
1566 1642
1567 popd > /dev/null || die "popd failed" 1643 popd > /dev/null || die "popd failed"
1568 1644
1645 # This is per bug #390691, without the duplication refactor, and with
1646 # the 3-way structure per comment #6. This enable users with old
1647 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1648 # before coreutils can be upgraded).
1649 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1650 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 1651 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" 1652 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 1653 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" 1654 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 1655 fi
1574 done 1656 done
1593 stdout = sys.stdout.buffer 1675 stdout = sys.stdout.buffer
1594else: 1676else:
1595 # Python 2 1677 # Python 2
1596 stdout = sys.stdout 1678 stdout = sys.stdout
1597 1679
1680python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1598files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1681files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1682python_wrapper_scripts_file.close()
1599 1683
1600for file in sorted(files): 1684for file in sorted(files):
1601 stdout.write(file) 1685 stdout.write(file)
1602 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1686 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1603 1687
1668 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1752 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1669 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1753 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1670} 1754}
1671 1755
1672# @FUNCTION: python_need_rebuild 1756# @FUNCTION: python_need_rebuild
1757# @DESCRIPTION:
1673# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1758# Mark current package for rebuilding by python-updater after
1674# switching of active version of Python. 1759# switching of active version of Python.
1675python_need_rebuild() { 1760python_need_rebuild() {
1676 if _python_package_supporting_installation_for_multiple_python_abis; then 1761 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" 1762 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1678 fi 1763 fi
2377_python_test_hook() { 2462_python_test_hook() {
2378 if [[ "$#" -ne 1 ]]; then 2463 if [[ "$#" -ne 1 ]]; then
2379 die "${FUNCNAME}() requires 1 argument" 2464 die "${FUNCNAME}() requires 1 argument"
2380 fi 2465 fi
2381 2466
2382 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2467 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2383 "${FUNCNAME[3]}_$1_hook" 2468 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2384 fi 2469 fi
2385} 2470}
2386 2471
2387# @FUNCTION: python_execute_nosetests 2472# @FUNCTION: python_execute_nosetests
2388# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2473# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
2422 python_test_function() { 2507 python_test_function() {
2423 local evaluated_PYTHONPATH 2508 local evaluated_PYTHONPATH
2424 2509
2425 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2510 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2426 2511
2427 _python_test_hook pre 2512 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2428 2513
2429 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2514 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2430 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2515 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2431 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2516 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2432 else 2517 else
2433 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2518 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2434 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2519 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2435 fi 2520 fi
2436 2521
2437 _python_test_hook post 2522 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2438 } 2523 }
2439 if _python_package_supporting_installation_for_multiple_python_abis; then 2524 if _python_package_supporting_installation_for_multiple_python_abis; then
2440 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2525 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2441 else 2526 else
2442 if [[ -n "${separate_build_dirs}" ]]; then 2527 if [[ -n "${separate_build_dirs}" ]]; then
2486 python_test_function() { 2571 python_test_function() {
2487 local evaluated_PYTHONPATH 2572 local evaluated_PYTHONPATH
2488 2573
2489 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2574 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2490 2575
2491 _python_test_hook pre 2576 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2492 2577
2493 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2578 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2494 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2579 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 "$?" 2580 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2496 else 2581 else
2497 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2582 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2498 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2583 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2499 fi 2584 fi
2500 2585
2501 _python_test_hook post 2586 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2502 } 2587 }
2503 if _python_package_supporting_installation_for_multiple_python_abis; then 2588 if _python_package_supporting_installation_for_multiple_python_abis; then
2504 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2589 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2505 else 2590 else
2506 if [[ -n "${separate_build_dirs}" ]]; then 2591 if [[ -n "${separate_build_dirs}" ]]; then
2550 python_test_function() { 2635 python_test_function() {
2551 local evaluated_PYTHONPATH 2636 local evaluated_PYTHONPATH
2552 2637
2553 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2638 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2554 2639
2555 _python_test_hook pre 2640 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2556 2641
2557 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2642 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2558 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2643 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 "$?" 2644 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2560 else 2645 else
2561 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2646 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2562 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2647 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2563 fi 2648 fi
2564 2649
2565 _python_test_hook post 2650 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2566 } 2651 }
2567 if _python_package_supporting_installation_for_multiple_python_abis; then 2652 if _python_package_supporting_installation_for_multiple_python_abis; then
2568 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2653 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2569 else 2654 else
2570 if [[ -n "${separate_build_dirs}" ]]; then 2655 if [[ -n "${separate_build_dirs}" ]]; then
2829 done 2914 done
2830 for dir in "${evaluated_dirs[@]}"; do 2915 for dir in "${evaluated_dirs[@]}"; do
2831 eval "dirs+=(\"\${root}${dir}\")" 2916 eval "dirs+=(\"\${root}${dir}\")"
2832 done 2917 done
2833 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2918 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2834 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2919 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2835 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2920 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2836 fi 2921 fi
2837 _python_clean_compiled_modules "${dirs[@]}" 2922 _python_clean_compiled_modules "${dirs[@]}"
2838 fi 2923 fi
2839 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2924 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2842 done 2927 done
2843 for file in "${evaluated_files[@]}"; do 2928 for file in "${evaluated_files[@]}"; do
2844 eval "files+=(\"\${root}${file}\")" 2929 eval "files+=(\"\${root}${file}\")"
2845 done 2930 done
2846 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1" 2931 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2847 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2932 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2848 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1" 2933 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2849 fi 2934 fi
2850 _python_clean_compiled_modules "${files[@]}" 2935 _python_clean_compiled_modules "${files[@]}"
2851 fi 2936 fi
2852 eend "${return_code}" 2937 eend "${return_code}"
2873 return_code="0" 2958 return_code="0"
2874 stderr="" 2959 stderr=""
2875 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2960 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2876 if ((${#other_dirs[@]})); then 2961 if ((${#other_dirs[@]})); then
2877 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2962 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 2963 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" 2964 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2880 fi 2965 fi
2881 _python_clean_compiled_modules "${other_dirs[@]}" 2966 _python_clean_compiled_modules "${other_dirs[@]}"
2882 fi 2967 fi
2883 if ((${#other_files[@]})); then 2968 if ((${#other_files[@]})); then
2884 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1" 2969 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 2970 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" 2971 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2887 fi 2972 fi
2888 _python_clean_compiled_modules "${other_files[@]}" 2973 _python_clean_compiled_modules "${other_files[@]}"
2889 fi 2974 fi
2890 eend "${return_code}" 2975 eend "${return_code}"
3077} 3162}
3078 3163
3079# ================================================================================================ 3164# ================================================================================================
3080# ===================================== DEPRECATED FUNCTIONS ===================================== 3165# ===================================== DEPRECATED FUNCTIONS =====================================
3081# ================================================================================================ 3166# ================================================================================================
3167
3168fi # _PYTHON_ECLASS_INHERITED

Legend:
Removed from v.1.127  
changed lines
  Added in v.1.150

  ViewVC Help
Powered by ViewVC 1.1.20