pypi.bbclass: mind package suffix on version check
PATCH 1/2 pypi.bbclass: mind package suffix on version check
From: Konrad Weihmann <[email protected]>
Some pypi packages do have suffixes like dev, or a0 or b1. When doing a version check on these, the version will get falsely identified as major release versions.
Add a terminating slash to rule out those false positives
Signed-off-by Konrad Weihmann <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Steve Sakoman <[email protected]>
(cherry picked from commit 0603f6d9f2abfa67b99b1bc39228f6aa16a0370d)
[Yocto bug #13990]
Signed-off-by Armin Kuster <[email protected]>
--- meta/classes/pypi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/pypi.bbclass +1 -1
@@ -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+[\.\-_]*)+)/"
Signature · 1 line
2.17.1
PATCH 2/2 pypi.bbclass: use new pypi UPSTREAM_CHECK_URI
From: Tim Orling <[email protected]>
Upstream https://pypi.python.org/pypi/${PYPI_PACKAGE}/
redirects to https://pypi.org/project/${PYPI_PACKAGE}/
Signed-off-by Tim Orling <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Steve Sakoman <[email protected]>
(cherry picked from commit e5f3f961242d888f3f786af8f793bf1d247fdff0)
[Yocto # 13990]
Signed-off-by Armin Kuster <[email protected]>
--- meta/classes/pypi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/pypi.bbclass +1 -1
@@ -22,5 +22,5 @@ SECTION = "devel/python" SRC_URI += "${PYPI_SRC_URI}" S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" -UPSTREAM_CHECK_URI ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/" +UPSTREAM_CHECK_URI ?= "https://pypi.org/project/${PYPI_PACKAGE}/" UPSTREAM_CHECK_REGEX ?= "/${PYPI_PACKAGE}/(?P<pver>(\d+[\.\-_]*)+)/"
Signature · 1 line
2.17.1