Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Nov 2023 05:30:38 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1f069eecb7aa - main - devel/py-pip-audit: Allow build with py-cyclonedx-python-lib 5.0.0+
Message-ID:  <202311010530.3A15Ucau004239@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f069eecb7aa9a4a4c6ca23f2d7300ffc6a57c17

commit 1f069eecb7aa9a4a4c6ca23f2d7300ffc6a57c17
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-11-01 05:30:08 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-11-01 05:30:08 +0000

    devel/py-pip-audit: Allow build with py-cyclonedx-python-lib 5.0.0+
    
    - Bump PORTREVISION for package change
    
    Obtained from:  https://github.com/pypa/pip-audit/commit/20e7beece90b117687978205073435f8a54866cc
---
 devel/py-pip-audit/Makefile                   |  3 ++-
 devel/py-pip-audit/files/patch-pyproject.toml | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/devel/py-pip-audit/Makefile b/devel/py-pip-audit/Makefile
index b5cd3438652c..45829c6035a7 100644
--- a/devel/py-pip-audit/Makefile
+++ b/devel/py-pip-audit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pip-audit
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,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.0<5:textproc/py-cyclonedx-python-lib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cyclonedx-python-lib>=4<6: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-pyproject.toml b/devel/py-pip-audit/files/patch-pyproject.toml
new file mode 100644
index 000000000000..923daa62071e
--- /dev/null
+++ b/devel/py-pip-audit/files/patch-pyproject.toml
@@ -0,0 +1,13 @@
+Obtained from:	https://github.com/pypa/pip-audit/commit/20e7beece90b117687978205073435f8a54866cc
+
+--- pyproject.toml.orig	2023-07-24 18:47:23 UTC
++++ pyproject.toml
+@@ -30,7 +30,7 @@ dependencies = [
+     "CacheControl[filecache] >= 0.13.0",
+     # NOTE(ww): Release 2.5.0 is broken, subsequent 2.5.x releases fix it.
+     # See: https://github.com/CycloneDX/cyclonedx-python-lib/issues/245
+-    "cyclonedx-python-lib ~= 4.0",
++    "cyclonedx-python-lib >= 4,< 6",
+     "html5lib>=1.1",
+     "packaging>=23.0.0",               # https://github.com/pypa/pip-audit/issues/464
+     "pip-api>=0.0.28",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311010530.3A15Ucau004239>