Attachment 239433 Details for Bug 268893 – python.mk: normalise wheel filename arguments

[patch] python.mk: normalise wheel filename arguments

0001-python.mk-normalise-wheel-filename-arguments-in-PEP5.patch (text/plain), 2.36 KB, created by Charlie Li on 2023-01-13 04:22:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Li

Created: 2023-01-13 04:22:10 UTC

Size: 2.36 KB

patch

obsolete

>From b8c6f28e61fdce3d99d914322df225df73957267 Mon Sep 17 00:00:00 2001
>From: Charlie Li <vishwin@FreeBSD.org>
>Date: Thu, 12 Jan 2023 23:12:01 -0500
>Subject: [PATCH] python.mk: normalise wheel filename arguments in
> PEP517_INSTALL_CMD
>
>The living binary distribution format specification derived from
>PEP-427 [0] prescribes that:
>
>  In distribution names, any run of -_. characters (HYPHEN-MINUS,
>  LOW LINE and FULL STOP) should be replaced with _ (LOW LINE), and
>  uppercase characters should be replaced with corresponding lowercase
>  ones. This is equivalent to PEP 503 normalisation followed by
>  replacing - with _. Tools consuming wheels must be prepared to
>  accept . (FULL STOP) and uppercase letters, however, as these
>  were allowed by an earlier version of this specification.
>
>This fixes staging for packages built under PEP-517 with dashes
>(HYPHEN-MINUS) in their names.
>
>Reported by: amdmi3
>PR: 268893
>---
> Mk/Uses/python.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
>index 5f9bf0455f0a..bbabacd7cac4 100644
>--- a/Mk/Uses/python.mk
>+++ b/Mk/Uses/python.mk
>@@ -185,7 +185,7 @@
> #			  default: ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR}
> #
> # PEP517_INSTALL_CMD	- Command sequence for a PEP-517 install frontend that installs a wheel.
>-#			  default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME}-${PORTVERSION}-*.whl
>+#			  default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
> #
> # PEP517_INSTALL_DEPEND	- Port needed to execute ${PEP517_INSTALL_CMD}.
> #			  default: ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}
>@@ -657,7 +657,7 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
> # PEP-517 support
> PEP517_BUILD_CMD?=	${PYTHON_CMD} -m build -n -w
> PEP517_BUILD_DEPEND?=	${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR}
>-PEP517_INSTALL_CMD?=	${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME}-${PORTVERSION}-*.whl
>+PEP517_INSTALL_CMD?=	${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl
> PEP517_INSTALL_DEPEND?=	${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR}
> 
> # nose support
>-- 
>2.39.0
>

Actions: View | Diff

Attachments on bug 268893: 239408 | 239409 | 239433 | 239434