From nobody Sat Mar 04 12:00:34 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 4PTNhM3C9dz3vxKw; Sat, 4 Mar 2023 12:00:35 +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 4PTNhM1hgDz4G4F; Sat, 4 Mar 2023 12:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677931235; 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=+sfbAKG7CllA6fDtNJrsDVGJyaGKWcPeRjm0BlPWP90=; b=YHe9BZ2bM3tNkAH915p3sLHZptcYh/WB0Dqo+6L5Kq9NqrYP9zikoOPEBJghvP4xyTQ5Uq 4T9wlgLbjlCxs7diUmII6+9gsiVwQUBuBmXbOk3U84f1/HRd79M8BWnPt98pBBQ/5sYZSw Mt5dXhAQJ1UjB4FeR0Dh+odJMGFJg8Rk9EvHlUkXuLbg9MzkKEGg/P+323ZYiY5vWQVXyi DvZgvR9/1Y/3gnvoJjWmfFQyfDReWhAVFgpeehmsaFaG797TciYGKcVta5o3Vioj+B/HeH GAovOMuwZQuR43NCbHfUPRHwWVFp35TSukbIrertDNRy5Ghu5DqKIpW1Mfh57g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677931235; 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=+sfbAKG7CllA6fDtNJrsDVGJyaGKWcPeRjm0BlPWP90=; b=OcGYFCTybR+Pi0ggWvKyHHi4m1mi8nCEqF6JYZHv2QvaE+OnlLu6LH1FSHpHPxS3ndn1x5 2l7pfq5X5Af4WyPg2GrwzxEI5V9Iw/odZN6E2DW1nqCTRfCaG5pdOs/g/9UL3oz7zuhANu BpaHXO5+1luMkoYwZOotcb2FlxYm0HR1mdd3/uxaK5KXyfdxjDZzmQuGwRc5AUkmQer7BM SNNtBh1N8UpPD/Yx56mauHrW9pfARy/GPXAHOA66V8OrscX7YIyET3QDuQPsoEZjVgEkar MZ4p8NL02+CXULTEnf8/hPkc/Mg4X2go+kIOc9lPhHiE4WG1YH9KfDbHzAr9yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677931235; a=rsa-sha256; cv=none; b=WByeHdhBtXpUCLPXO7Ysx25r+/s6YKmfQSoxxecLgSjgC4BhR7PMSgBMWxklixJJII03ao 0nzjHL5D9URAjb0dMaOm09WcxBS+u+iFBbTaUoMBmUnbWu+dIQ/FN+vxnymWPdHQ/VPgb1 RqUgnLGFgglSnR5eZn9t4c4zCcE/sIT22qJ65cNAeLW+p/W6qPk3TLmZitEaNFXGJ9x/1+ 0fiTGyzAs9kb04HFx59sTkyrmMca1weuUY7PXEvD8RrQQFUjO4lvBDLS0jQSj5wuHw8cv6 qSWWVZvFNfNFVz6GN0IPCCr/QnlJbrTcoOp9kbjl/DPryEUoWtnvIU476R8hGA== 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 4PTNhM0fG7zfTP; Sat, 4 Mar 2023 12:00:35 +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 324C0Y2N052330; Sat, 4 Mar 2023 12:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324C0YjR052329; Sat, 4 Mar 2023 12:00:34 GMT (envelope-from git) Date: Sat, 4 Mar 2023 12:00:34 GMT Message-Id: <202303041200.324C0YjR052329@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: f4bc59d50389 - main - devel/py-virtualenv: unbreak DOCS build with non-default python (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4bc59d5038987d8cf798e2d193fb8f85c9b208e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4bc59d5038987d8cf798e2d193fb8f85c9b208e commit f4bc59d5038987d8cf798e2d193fb8f85c9b208e Author: Dima Panov AuthorDate: 2023-03-04 11:58:58 +0000 Commit: Dima Panov CommitDate: 2023-03-04 11:58:58 +0000 devel/py-virtualenv: unbreak DOCS build with non-default python (+) We should always use versioned python-related stuff Approved by: portmgr blanket Sponsored by: Serenity Cybersecurity, LLC --- devel/py-virtualenv/Makefile | 4 +++- devel/py-virtualenv/files/patch-docs_conf.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index 9bdab9d5188e..36b7a1531c9c 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -74,7 +74,9 @@ DOCS_PORTDOCS= * .buildinfo VIRTUALENV_WHEEL= ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}-py${PYTHON_MAJOR_VER}-none-any.whl post-patch: - @${SED} -i.bak -e 's,%%VIRTUALENV_WHEEL%%,${VIRTUALENV_WHEEL},1' ${WRKSRC}/docs/conf.py + @${SED} -i.bak -e 's,%%VIRTUALENV_WHEEL%%,${VIRTUALENV_WHEEL},1' \ + -e 's,%%PYTHON_VER%%,${PYTHON_VER},1' \ + ${WRKSRC}/docs/conf.py post-install: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} diff --git a/devel/py-virtualenv/files/patch-docs_conf.py b/devel/py-virtualenv/files/patch-docs_conf.py index a29883882f74..a21be0c69da2 100644 --- a/devel/py-virtualenv/files/patch-docs_conf.py +++ b/devel/py-virtualenv/files/patch-docs_conf.py @@ -14,7 +14,7 @@ here = Path(__file__).parent root, exe = here.parent, Path(sys.executable) - towncrier = exe.with_name(f"towncrier{exe.suffix}") -+ towncrier = exe.with_name(f"towncrier") ++ towncrier = exe.with_name(f"towncrier-%%PYTHON_VER%%") cmd = [str(towncrier), "build", "--draft", "--version", "NEXT"] new = subprocess.check_output(cmd, cwd=root, text=True, stderr=subprocess.DEVNULL) (root / "docs" / "_draft.rst").write_text("" if "No significant changes" in new else new)