Attachment 245455 Details for Bug 272771 – (the real) v2

[patch] (the real) v2

0001-python.mk-account-for-SCM-derived-versioning-in-whee.patch (text/plain), 2.67 KB, created by Charlie Li on 2023-10-06 04:03:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Li

Created: 2023-10-06 04:03:26 UTC

Size: 2.67 KB

patch

obsolete

>From 35a692142201847a6eb09920c51c19db04dc9848 Mon Sep 17 00:00:00 2001
>From: Charlie Li <vishwin@FreeBSD.org>
>Date: Thu, 5 Oct 2023 23:40:50 -0400
>Subject: [PATCH] python.mk: account for SCM-derived versioning in wheels
>
>Some ports use setuptools_scm, versioningit et al to derive a version
>string from the SCM in use, for example git-describe(1). Better
>adapt our DISTVERSION-to-PORTVERSION scheme to PEP-440:
>
>* Epoch segment is untouched
>* Release segment is untouched
>* Pre-release segment is untouched
>* Post-release segment is usually untouched, but may be set by a
>  dynamic versioning tool
>* Development release segment may be set by a dynamic versioning
>  tool
>
>For the latter two cases, the hyphen (-) is converted to the
>appropriate segment. DISTVERSIONSUFFIX translates into a local
>version identifier, which is not publicly displayed on either package
>format.
>
>PR: 272771
>---
> Mk/Uses/python.mk | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
>index a3a2b6f03632..9584baddc679 100644
>--- a/Mk/Uses/python.mk
>+++ b/Mk/Uses/python.mk
>@@ -159,7 +159,7 @@
> #			  default: <empty>
> #
> # PEP517_INSTALL_CMD	- Command sequence for a PEP-517 install frontend that installs a wheel.
>-#			  default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
>+#			  default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*-*.whl
> #
> # PEP517_INSTALL_DEPEND	- Port needed to execute ${PEP517_INSTALL_CMD}.
> #			  default: ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR}
>@@ -720,7 +720,15 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
> # PEP-517 support
> PEP517_BUILD_CMD?=	${PYTHON_CMD} -m build --no-isolation --wheel ${PEP517_BUILD_CONFIG_SETTING}
> PEP517_BUILD_DEPEND?=	${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR}
>-PEP517_INSTALL_CMD?=	${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl
>+
>+# wheel installation support
>+# account for snapshots with versions derived from setuptools_scm, versioningit et al
>+.  ifdef DISTVERSIONSUFFIX
>+_WHEEL_VERSION=		${DISTVERSION:S/-/ /:[1]}.*${DISTVERSION:S/-/ /:[2]}${DISTVERSIONSUFFIX:S/-/+/}
>+.  else
>+_WHEEL_VERSION=		${DISTVERSION}*
>+.  endif
>+PEP517_INSTALL_CMD?=	${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${_WHEEL_VERSION}-*.whl
> PEP517_INSTALL_DEPEND?=	${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR}
> 
> # nose support
>-- 
>2.42.0
>

Actions: View | Diff

Attachments on bug 272771: 243662 | 245454 | 245455 | 245456