summaryrefslogtreecommitdiff
path: root/metadata/install-qa-check.d/60python-site
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@gentoo.org>2025-04-18 14:35:18 -0400
committerSam James <sam@gentoo.org>2025-04-19 01:22:55 +0100
commit012e58054c1cb7a2f65a3959c8f42f191862585f (patch)
tree22b0151d86801ef35aa64bb74d8f66b2c8c3f51a /metadata/install-qa-check.d/60python-site
parent8a7efac6a20aafc403fcf36c88156ac6b388fb9b (diff)
downloadgentoo-012e58054c1cb7a2f65a3959c8f42f191862585f.tar.gz
gentoo-012e58054c1cb7a2f65a3959c8f42f191862585f.tar.bz2
gentoo-012e58054c1cb7a2f65a3959c8f42f191862585f.zip
metadata/install-qa-check.d: fix python checks for non-distutils software
The existing check makes an intimidating value proposition: that all software being checked was installed using distutils-r1.eclass, hence moving the check from there as-is to a new home is sufficient. This includes the use of functions specific to the distutils-r1 eclass inheritance chain. In particular, get_modname is part of multilib.eclass, which distutils-r1 inherits, but python-single-r1 does not inherit. This results in the following QA warning: ``` /var/db/repos/gentoo/metadata/install-qa-check.d/60python-site: line 53: get_modname: command not found /var/db/repos/gentoo/metadata/install-qa-check.d/60python-site: line 53: get_modname: command not found /var/db/repos/gentoo/metadata/install-qa-check.d/60python-site: line 53: get_modname: command not found * Verifying compiled files for python3.12 * * QA Notice: Extensions found compiled for the wrong Python version * (likely broken build isolation): * * /usr/lib/python3.12/site-packages/__pycache__/init_calibre.cpython-312.pyc * /usr/lib/python3.12/site-packages/__pycache__/init_calibre.cpython-312.opt-1.pyc * /usr/lib/python3.12/site-packages/__pycache__/init_calibre.cpython-312.opt-2.pyc ``` because we are matching all files matching "*.cpython*" that are also named "*" instead of all files named "*$(get_modname)". Instead of using multilib.eclass, go directly to the preferred canonical source, and query cpython what *it* thinks a module extension should be. This is also more flexible since cpython itself doesn't really guarantee that extension modules are named anything like get_modname, but generally equals -- for backwards compatibility -- the final value from `_PyImport_DynLoadFiletab` / `_imp.extension_suffixes()` (and on Windows, that is .pyd instead of .dll, though admittedly, sysconfig.get_config_vars is pretty empty there; on the other hand, PyPy doesn't recognize unadorned .so because it doesn't need the compatibility, so we see that it's not really a guarantee, and might as well go for the sysconfig variable which is unambiguous where present). Signed-off-by: Eli Schwartz <eschwartz@gentoo.org> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'metadata/install-qa-check.d/60python-site')
-rw-r--r--metadata/install-qa-check.d/60python-site13
1 files changed, 10 insertions, 3 deletions
diff --git a/metadata/install-qa-check.d/60python-site b/metadata/install-qa-check.d/60python-site
index 3791fa80ecdd..49d4b3a1a830 100644
--- a/metadata/install-qa-check.d/60python-site
+++ b/metadata/install-qa-check.d/60python-site
@@ -75,6 +75,13 @@ python_site_check() {
local sitedir=( "${pydir}"/site-packages )
[[ -d ${sitedir} ]] || continue
+ local modname=$(
+ "${impl}" - <<-EOF
+ import sysconfig
+ print(sysconfig.get_config_var("SHLIB_SUFFIX"))
+ EOF
+ )
+
# check for bad package versions
while IFS= read -d $'\0' -r f; do
bad_versions+=( "${f#${ED}}" )
@@ -107,7 +114,7 @@ python_site_check() {
-name '*.pth' -o \
-name '*.py' -o \
-name '*.pyi' -o \
- -name "*$(get_modname)" -o \
+ -name "*${modname}" -o \
-name 'README.txt' \
')' -print0
)
@@ -130,8 +137,8 @@ python_site_check() {
wrong_ext+=( "${f#${ED}}" )
done < <(
find "${sitedir}" '(' \
- -name "*.pypy*$(get_modname)" -o \
- -name "*.cpython*$(get_modname)" \
+ -name "*.pypy*${modname}" -o \
+ -name "*.cpython*${modname}" \
')' -a '!' -name "*${ext_suffix}" -print0
)