All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Konrad Weihmann" <kweihmann@outlook.com>
To: openembedded-core@lists.openembedded.org
Cc: Konrad Weihmann <kweihmann@outlook.com>
Subject: [PATCH] pypi.bbclass: mind package suffix on version check
Date: Fri,  8 May 2020 13:37:20 +0200	[thread overview]
Message-ID: <AM7PR05MB6881F29B1FAD006F027D07FEA8A20@AM7PR05MB6881.eurprd05.prod.outlook.com> (raw)

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 <kweihmann@outlook.com>
---
 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}/"
-UPSTREAM_CHECK_REGEX ?= "/${PYPI_PACKAGE}/(?P<pver>(\d+[\.\-_]*)+)"
+UPSTREAM_CHECK_REGEX ?= "/${PYPI_PACKAGE}/(?P<pver>(\d+[\.\-_]*)+[a-z0-9]*)"
-- 
2.20.1


             reply	other threads:[~2020-05-08 11:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-08 11:37 Konrad Weihmann [this message]
2020-05-09  4:56 ` [OE-core] [PATCH] pypi.bbclass: mind package suffix on version check Tim Orling
2020-05-09  6:55   ` Konrad Weihmann
2020-05-09  7:38     ` Alexander Kanavin
2020-05-09  7:45       ` Konrad Weihmann
2020-05-09  8:03         ` Alexander Kanavin
2020-05-09 10:42           ` Konrad Weihmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AM7PR05MB6881F29B1FAD006F027D07FEA8A20@AM7PR05MB6881.eurprd05.prod.outlook.com \
    --to=kweihmann@outlook.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.