mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-20 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

pip_install_wheel: install wheel with a glob

Browse Source 
Now that the build systems that use pip_install_wheel are all building
their wheel into a directory that we knew was empty before, we can just
install *.whl and not need to know the precise names.

By design a pyproject.toml will always build a single wheel, so there
shouldn't be any way for this to end up installing more than expected.

This obsoletes PIP_INSTALL_PACKAGE and PYPA_WHEEL, neither of which are
needed anymore.

(From OE-Core rev: e6e4c63bbdd09d91428e55cb5a852170511f05cc)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2022-03-09 16:51:13 +00:00
committed by Richard Purdie
parent 9bafd512a4
commit 438b58fd4b
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes/pip_install_wheel.bbclass
View File

@@ -1,20 +1,10 @@
DEPENDS:append = " python3-pip-native" DEPENDS:append = " python3-pip-native"
def guess_pip_install_package_name(d):
import re
'''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode'''
name = d.getVar('PYPI_PACKAGE') or re.sub(r"^python3-", "", d.getVar('BPN'))
return name.replace('-', '_')
PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}"
# The directory where wheels should be written too. Build classes # The directory where wheels should be written too. Build classes
# will ideally [cleandirs] this but we don't do that here in case # will ideally [cleandirs] this but we don't do that here in case
# a recipe wants to install prebuilt wheels. # a recipe wants to install prebuilt wheels.
PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist" PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist"
PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
PIP_INSTALL_ARGS = "\ PIP_INSTALL_ARGS = "\
-vvvv \ -vvvv \
--ignore-installed \ --ignore-installed \
@@ -29,8 +19,14 @@ PIP_INSTALL_PYTHON = "python3"
PIP_INSTALL_PYTHON:class-native = "nativepython3" PIP_INSTALL_PYTHON:class-native = "nativepython3"
pip_install_wheel_do_install () { pip_install_wheel_do_install () {
nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} || COUNT=$(find ${PIP_INSTALL_DIST_PATH} -name '*.whl' | wc -l)
bbfatal_log "Failed to pip install wheel. Check the logs." if test $COUNT -eq 0; then
bbfatal No wheels found in ${PIP_INSTALL_DIST_PATH}
elif test $COUNT -gt 1; then
bbfatal More than one wheel found in ${PIP_INSTALL_DIST_PATH}, this should not happen
fi
nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PIP_INSTALL_DIST_PATH}/*.whl
cd ${D} cd ${D}
for i in ${D}${bindir}/* ${D}${sbindir}/*; do for i in ${D}${bindir}/* ${D}${sbindir}/*; do