From nobody Mon Dec 25 16:16:35 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 4SzNM81G0Cz54wt7; Mon, 25 Dec 2023 16:16:36 +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 4SzNM74LRSz4Kw9; Mon, 25 Dec 2023 16:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703520995; 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=gd5kc1ICi1Hc+SgZBv327c3TvQXsnwk6szU9mbukRjs=; b=itfCG/UouiDFJWalKRtisgeNWyoM42ML8TK7BJwH20PcGEZBCKTqkpuBLNIgsmWI1oFk6u KUrCzLFLpUbY3oi2z1WVnrc9kffAMFp1UXD8AG0aVqxb6O3+FA2Hi7OQdMpOl+Q61nuegW aQxgr/3qB5GHbl8OXzlUS5JecWeUwebGaAAn206bwKM1a1UpU5IC1p5OtknDIZctn9RtLw GVB7Y+0MQSLBuas4saNAsibsYh4sHe2EoCIbJMlUDO75qc0PkYcyC5c9WsW1W/8/Cl9hRV NnE3RDjd8jHxSO8gVVie7W4Luj4eKGqEr9HbWngKwhEwErkTDWbaqmYCbCewDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703520995; a=rsa-sha256; cv=none; b=vgbIZ+c7JiH3JNMusst4dRWjJR2Gq4J3Xf/VFRX+vVQ3d5Be29vb7kr0uIfEEVWfPk5AFB WWKoQGv4aCCFDJvtd8Pg4KoA0Y3WVuUVH8VgxhqkdnDXLUVPR2VlitZwk64FA8QgpG3FDr O+KE3iYLygmP13kGy4pYwShPah9XSo/EcaJIPiY5zuBmx5CiL+u5PlyaajEvOM/bVgo7vQ BEJS6DXAyTEfWU7X92/76ePEl76WK2JXvJVCIUyDyhxDrY0H6UWEOey8FK73J/f75u1gxZ Sv3GdsE0RAgfOlw05dv04n5iDWXBQ19AsCFvQgic/6jYRxu71YWqsko5hOcTfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703520995; 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=gd5kc1ICi1Hc+SgZBv327c3TvQXsnwk6szU9mbukRjs=; b=s/FyAOmr0urV0eppkjDdCs8n9ayMevGrQ5mDrIbAtrViLaBmUtm9+7sKqipjMInmDMe3jB LmoOHJBLYO34xXuxibCaw85LvThF06hI6xaGuFTb3qEmmUwc2oTXe1kB+iSYhxkcASwNaS GddiTOjojYqblzecFCwJ4khQUE7UMDQDwzOhqqabmU/4xJi34BR0Q5mG2MhlRDZQnFZS/3 OUl8z/87fp7czOkSqusgdj/mF+cDGHYcDa81jNYM4m1+OV6FjyeX/XnR1D0ioGeNaNsmyr pI1aXQTHxF1X9FZaTfyl4iXYtLrXnyfVKK/JizY5XyMeeu7xqmW/pwttVpJqDw== 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 4SzNM7382Qz3jk; Mon, 25 Dec 2023 16:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPGGZ10010372; Mon, 25 Dec 2023 16:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPGGZPY010369; Mon, 25 Dec 2023 16:16:35 GMT (envelope-from git) Date: Mon, 25 Dec 2023 16:16:35 GMT Message-Id: <202312251616.3BPGGZPY010369@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: bc3159fcccc2 - main - devel/py-pip-audit: Allow build with py-cyclonedx-python-lib 6.0.0+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc3159fcccc2a679ad4e0ea338c0163dd0f87cdf Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc3159fcccc2a679ad4e0ea338c0163dd0f87cdf commit bc3159fcccc2a679ad4e0ea338c0163dd0f87cdf Author: Po-Chuan Hsieh AuthorDate: 2023-12-25 16:03:18 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-25 16:10:53 +0000 devel/py-pip-audit: Allow build with py-cyclonedx-python-lib 6.0.0+ - Bump PORTREVISION for package change --- devel/py-pip-audit/Makefile | 3 ++- .../py-pip-audit/files/patch-cyclonedx-python-lib | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/devel/py-pip-audit/Makefile b/devel/py-pip-audit/Makefile index 19733efe4ffc..6c7404e8264c 100644 --- a/devel/py-pip-audit/Makefile +++ b/devel/py-pip-audit/Makefile @@ -1,5 +1,6 @@ PORTNAME= pip-audit PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI \ https://github.com/pypa/pip-audit/releases/download/v${PORTVERSION}/ @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.2<4:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.13.0:www/py-cachecontrol@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cyclonedx-python-lib>=4<6:textproc/py-cyclonedx-python-lib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cyclonedx-python-lib>=5<7:textproc/py-cyclonedx-python-lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=1.1:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=23.0.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip-api>=0.0.28:devel/py-pip-api@${PY_FLAVOR} \ diff --git a/devel/py-pip-audit/files/patch-cyclonedx-python-lib b/devel/py-pip-audit/files/patch-cyclonedx-python-lib new file mode 100644 index 000000000000..eb0180333b4c --- /dev/null +++ b/devel/py-pip-audit/files/patch-cyclonedx-python-lib @@ -0,0 +1,24 @@ +Reference: https://github.com/pypa/pip-audit/pull/715 + +--- pip_audit/_format/cyclonedx.py.orig 2023-12-19 03:49:32 UTC ++++ pip_audit/_format/cyclonedx.py +@@ -90,7 +90,7 @@ class CycloneDxFormat(VulnerabilityFormat): + logger.warning("--fix output is unsupported by CycloneDX formats") + + bom = _pip_audit_result_to_bom(result) +- formatter = output.get_instance( ++ formatter = output.make_outputter( + bom=bom, + output_format=self._inner_format.value, + schema_version=output.SchemaVersion.V1_4, +--- pyproject.toml.orig 2023-12-19 03:49:32 UTC ++++ pyproject.toml +@@ -28,7 +28,7 @@ classifiers = [ + ] + dependencies = [ + "CacheControl[filecache] >= 0.13.0", +- "cyclonedx-python-lib >= 4,< 6", ++ "cyclonedx-python-lib >= 5,< 7", + "html5lib>=1.1", + "packaging>=23.0.0", # https://github.com/pypa/pip-audit/issues/464 + "pip-api>=0.0.28",