> -----Original Message----- > From: [email protected] > <[email protected]> On Behalf Of Tim Orling > Sent: den 24 februari 2022 05:12 > To: [email protected] > Cc: Tim Orling <[email protected]> > Subject: [OE-core] [PATCH 2/2] pip_install_wheel: improved wheel filename > guess > > Rather than only use PYPI_PACKAGE as a guess, fall back on PN for cases > where a recipe does not inherit pypi. > > Wheels can only have alphanumeric characters in the 'distribution' > name [1]. Any other characters are replaced with an underscore. Provide a > function to replace dash with underscore. > > [1] https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode > > Signed-off-by: Tim Orling <[email protected]> > --- > meta/classes/pip_install_wheel.bbclass | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/pip_install_wheel.bbclass > b/meta/classes/pip_install_wheel.bbclass > index f0312e0b1eb..e0f0b97ad13 100644 > --- a/meta/classes/pip_install_wheel.bbclass > +++ b/meta/classes/pip_install_wheel.bbclass > @@ -1,6 +1,15 @@ > DEPENDS:append = " python3-pip-native" > > -PIP_INSTALL_PACKAGE ?= "${PYPI_PACKAGE}" > +def guess_pip_install_package_name(d): > + '''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode''' > + package = "" > + if not d.getVar('PYPI_PACKAGE'): > + package = (d.getVar('PN').replace('-', '_')) > + else: > + package = (d.getVar('PYPI_PACKAGE').replace('-', '_')) > + return package
You can simplify the above to: +def guess_pip_install_package_name(d): + '''https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode''' + return (d.getVar('PYPI_PACKAGE') or d.getVar('PN')).replace('-', '_') > + > +PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}" > PIP_INSTALL_DIST_PATH ?= "${B}/dist" > PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-${PV}-*.whl" > > -- > 2.30.2 //Peter
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162313): https://lists.openembedded.org/g/openembedded-core/message/162313 Mute This Topic: https://lists.openembedded.org/mt/89359058/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
