On Sat, 2022-02-26 at 08:56 +0100, Konrad Weihmann wrote: > > On 25.02.22 05:03, Tim Orling wrote: > > From: Tim Orling <ticot...@gmail.com> > > > > 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 <tim.orl...@konsulko.com> > > --- > > Changes in v2: > > address review comments > > > > meta/classes/pip_install_wheel.bbclass | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/meta/classes/pip_install_wheel.bbclass > > b/meta/classes/pip_install_wheel.bbclass > > index 8a848c0ebab..9f9feda6ee0 100644 > > --- a/meta/classes/pip_install_wheel.bbclass > > +++ b/meta/classes/pip_install_wheel.bbclass > > @@ -1,6 +1,10 @@ > > 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''' > > + return (d.getVar('PYPI_PACKAGE') or d.getVar('PN')).replace('-', '_') > > In my opinion this needs to be BPN not PN - as if you will build > python3-foo-native (for native only recipes) it will result in > foo_native-1.2.3-*.whl, that just doesn't exit.
Agreed, fix sent. > What disappoints me the most is that none of this comes with unit tests > - it broke for a bunch of stuff I maintain this morning, making my > morning coffee taste bitter :-( I'd love more tests! Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162424): https://lists.openembedded.org/g/openembedded-core/message/162424 Mute This Topic: https://lists.openembedded.org/mt/89382270/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
