Yep, a trailing slash should be enough. Will create a new patch - thanks
all for the input
On 09.05.20 10:03, Alexander Kanavin wrote:
Then maybe appending a / to the regex will do?
Alex
On Sat, 9 May 2020 at 09:45, Konrad Weihmann <[email protected]
<mailto:[email protected]>> wrote:
Well, I faced that at least on the following packages
- flake8 (current stable 3.7.9, existing alphas 3.8.0a1, 3.8.0a2)
- markupsafe (current stable 1.1.1, existing alphas 2.0.0a1)
On 09.05.20 09:38, Alexander Kanavin wrote:
> Can you give specific examples please? I think we can probably
add \.tar
> to the end of the existing regex, which will ensure there are no
> unwanted suffixes. This is already done in plenty of recipes for the
> same reason.
>
> Alex
>
> On Sat, 9 May 2020 at 08:55, Konrad Weihmann
<[email protected] <mailto:[email protected]>
> <mailto:[email protected] <mailto:[email protected]>>> wrote:
>
> Fully support that, it's same for me.
> But then the regex is also not a 100% correct, as it will issue a
> notification via "devtool check-upgrade-status", even for an
alpha or
> beta or dev release - and most important without the suffix,
so it's
> extra hard to identify if one should take action or not.
>
> And even when using the "devtool upgrade" patch it will run a
build
> attempt, which will immediately fail, as the reported version is
> present, due to the suffix being trimmed during the process.
>
> What I could imagine is to ignore those releases by default
using an
> inverted group like (?P<pver>(\d+[\.\-_]*)+(?![a-z0-9]+)*) to
filter
> out
> those kind of releases.
>
> What do you think?
>
> On 09.05.20 06:56, Tim Orling wrote:
> > We should only be updating to releases, not dev or alpha
or any
> other
> > non-released state. That is why the regex is they way it is.
> >
> > On Fri, May 8, 2020 at 4:37 AM Konrad Weihmann
> <[email protected] <mailto:[email protected]>
<mailto:[email protected] <mailto:[email protected]>>
> > <mailto:[email protected]
<mailto:[email protected]> <mailto:[email protected]
<mailto:[email protected]>>>> wrote:
> >
> > Some pypi packages do have suffixes like dev, or a0 or b1.
> > When doing a version check on these, the version will
get falsely
> > trimmed down to a version without the suffix.
> >
> > E.g. 3.8.0a1 will become 3.8.0 which then also means that
> > a version upgrade from 3.8.0a1 to 3.8.0a2 will not be
detected.
> >
> > Fix that by inserting an optional suffix group with
alphanumeric
> > charset.
> >
> > Signed-off-by: Konrad Weihmann <[email protected]
<mailto:[email protected]>
> <mailto:[email protected] <mailto:[email protected]>>
> > <mailto:[email protected]
<mailto:[email protected]> <mailto:[email protected]
<mailto:[email protected]>>>>
> > ---
> > meta/classes/pypi.bbclass | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/pypi.bbclass
> b/meta/classes/pypi.bbclass
> > index e5d7ab3ce1..7d0f367a02 100644
> > --- a/meta/classes/pypi.bbclass
> > +++ b/meta/classes/pypi.bbclass
> > @@ -23,4 +23,4 @@ SRC_URI += "${PYPI_SRC_URI}"
> > S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}"
> >
> > UPSTREAM_CHECK_URI ?=
> > "https://pypi.python.org/pypi/${PYPI_PACKAGE}/
<https://pypi.python.org/pypi/$%7BPYPI_PACKAGE%7D/>
> <https://pypi.python.org/pypi/$%7BPYPI_PACKAGE%7D/>
> > <https://pypi.python.org/pypi/$%7BPYPI_PACKAGE%7D/>"
> > -UPSTREAM_CHECK_REGEX ?=
> "/${PYPI_PACKAGE}/(?P<pver>(\d+[\.\-_]*)+)"
> > +UPSTREAM_CHECK_REGEX ?=
> > "/${PYPI_PACKAGE}/(?P<pver>(\d+[\.\-_]*)+[a-z0-9]*)"
> > --
> > 2.20.1
> >
> >
> >
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138077):
https://lists.openembedded.org/g/openembedded-core/message/138077
Mute This Topic: https://lists.openembedded.org/mt/74070586/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
