From nobody Sat Jan 14 01:32:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nv13n4J60z2sWq0; Sat, 14 Jan 2023 01:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nv13n3kS4z3L1g; Sat, 14 Jan 2023 01:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673659925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RtL9/8hpZS4Eb3u97J1uqfIIViXGl/KLRe8etADI4ok=; b=spruUNYzCgXwyFE2gM1vDwxMr9mxfvdFrB7Juvidpn0Ikc7DcGHXWhRn8PCkjkN3zDjSVn wN6rHRRNIatVzmYVqfCVkWjYQlwnkoIIQcbNZTQ8iBqeeTg3iFfuhQIAz4XZBHsNlBdOF6 AQI5se9U5A+ab8ZZS6frJ6NYTYCPSh2c4lEPPqsyKu8lsCzsmv6YqfEIAPkD6HKDCYwwPR g6vIXXK1O/kHUiM6UK7UceUN1ZwkkUJrEuX+KKTeqwThYo20iDxTs92SvgmZ7L1qRTFeow MQBoN/rwsCc+QKrFJwjIXgGE0JO3l9vgAkd9HUcpqnfd+XE4ac4CRSuyA4tptg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673659925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RtL9/8hpZS4Eb3u97J1uqfIIViXGl/KLRe8etADI4ok=; b=SVIXK9xxND8udvUONqtmPzFVgVEJRrUH6iHcoRkmMYNDxoF1pvqLwBOuz2rme1ePNbiQtR v4iVRGEU0XU8CdVcfFwfdpcPxU6DzLdcGcXhn3bVSgKXG8ToqzqyZ3Ks+INgQLCsVO0yGN q2e6VUua5ty0ZPXwpc+uNbsS+9ZGs03uXD0tucywAHj4hL1Wf7+C6de9BKz2FNy8E5o9cH /o5TnOMRSxdDexBtRRMDKL8uQq1kGSZLwY5KkCjqeqPKuSyShmRSuUGOucAzShHxoSAJOM T4OVv6z7ihIuLNWtxsYihV+LP8dK3Qrw5zZa2+e/0GK/aBb1bTuWHEE3/W+Sxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673659925; a=rsa-sha256; cv=none; b=XCqdXfpTJeOji2IoLJWg6gGbQY1lYmFvtBndfXi5ZoR7Es0HHf4DbyFnsp5EoDknxE252l 0cq80PJLdN65g+Pb7xf1+usGPzAYB096OPLE6pPgHRBazQdblE8cbuYvpLia42rsSJfXXb JL+x6tjdfHaPoD2Sh9QvbWQuUYy1yj4JWY5LQEybEE5DqVCz8B5Ol1YLhOzEnK1VQMpSfU yPj2aL4YsrjDLuaYdqa5aLSzqjtJlYKpjVrJlvgSzyU6FPxyWf/c3h26TUH96SeLpBZ/Cg 3yXt/WhiIKNXnSqoG0OKVFRlYIQUUDleWN14dHFzte8AbS1bt0cUolom53+1gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nv13n2nGZzV7N; Sat, 14 Jan 2023 01:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30E1W5BE097868; Sat, 14 Jan 2023 01:32:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30E1W5uQ097867; Sat, 14 Jan 2023 01:32:05 GMT (envelope-from git) Date: Sat, 14 Jan 2023 01:32:05 GMT Message-Id: <202301140132.30E1W5uQ097867@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 952e0dba497e - main - python.mk: normalise wheel filename arguments in PEP517_INSTALL_CMD List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 952e0dba497e276c99d0ffb78cecb77a65349832 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=952e0dba497e276c99d0ffb78cecb77a65349832 commit 952e0dba497e276c99d0ffb78cecb77a65349832 Author: Charlie Li AuthorDate: 2023-01-13 04:12:01 +0000 Commit: Charlie Li CommitDate: 2023-01-14 01:31:41 +0000 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. [0] https://packaging.python.org/en/latest/specifications/binary-distribution-format/ Reported by: amdmi3 Tested by: yasu, rhurlin PR: 268893 With hat: python Approved by: mentors (implicit) --- Mk/Uses/python.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 5f9bf0455f0a..0aa9b44f75d2 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 @@ -857,7 +857,7 @@ do-install: @${SED} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \ -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \ -e 's|\,.*$$||' \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} . endif . endif # defined(_PYTHON_FEATURE_PEP517)