py-cyclonedx-python-lib: update to 2.5.1.

2.5.1 Fix Add missing Vulnerability comparator for sorting (#246) (c3f3d0d) 2.5.0 Feature Use SortedSet in model to improve reproducibility - this will provide predictable ordering of various items in generated CycloneDX documents - thanks to @RodneyRichardson (8a1c404) Documentation Fix typo "This is out" -> "This is our" (ef0278a) 2.4.0 Feature deps: Remove unused typing-extensions constraints (2ce358a)
TritonDataCenter · Jun 13, 2022 · 4433aec · 4433aec
1 parent 28af03d
commit 4433aec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/security/py-cyclonedx-python-lib/Makefile b/security/py-cyclonedx-python-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2022/04/20 21:29:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/06/13 09:59:01 wiz Exp $
 
-DISTNAME=	cyclonedx-python-lib-2.3.0
+DISTNAME=	cyclonedx-python-lib-2.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cyclonedx-python-lib/}
@@ -12,9 +12,8 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-packageurl>=0.9:../../devel/py-packageurl
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=47.0.0:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=2.4.0:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-toml>=0.10.0:../../textproc/py-toml
-DEPENDS+=	${PYPKGPREFIX}-types-setuptools>=57.0.0:../../devel/py-types-setuptools
-DEPENDS+=	${PYPKGPREFIX}-types-toml>=0.10.0:../../devel/py-types-toml
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
@@ -23,7 +22,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .if ${PYPKGPREFIX} == "py37"
 DEPENDS+=	${PYPKGPREFIX}-importlib-metadata>=3.4:../../devel/py-importlib-metadata
-DEPENDS+=	${PYPKGPREFIX}-typing-extensions>=3.10:../../devel/py-typing-extensions
 .endif
 
 .include "../../lang/python/egg.mk"

diff --git a/security/py-cyclonedx-python-lib/distinfo b/security/py-cyclonedx-python-lib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2022/04/20 21:29:08 wiz Exp $
+$NetBSD: distinfo,v 1.5 2022/06/13 09:59:01 wiz Exp $
 
-BLAKE2s (cyclonedx-python-lib-2.3.0.tar.gz) = 0d20c1ae835cf5187e2794b3b0b04323e4be92f9ff1ff80162c3738905be5659
-SHA512 (cyclonedx-python-lib-2.3.0.tar.gz) = 926d45710f5d88969b7b72837958ce3bcd3c5e1508fff5a189020fe0cc29e0bdad8e77e618a3514f73573c35d2db959db89058bc6a011692de8d13c5e5316a3d
-Size (cyclonedx-python-lib-2.3.0.tar.gz) = 158611 bytes
-SHA1 (patch-setup.py) = 3033f49a66cee7048c4c91d2122591684b46bb8c
+BLAKE2s (cyclonedx-python-lib-2.5.1.tar.gz) = 6b379e8b82044a84328be269687786922aa9844af25dea41f3c5ab4177067d4f
+SHA512 (cyclonedx-python-lib-2.5.1.tar.gz) = e7a3c69e8c6e5ad34eadf61da284bece592269c0997191b81ec4abf169c61657e4affee22c414a744ad964d3f89058a6ff406efeb8f90b973ba408977f9525ec
+Size (cyclonedx-python-lib-2.5.1.tar.gz) = 159660 bytes
+SHA1 (patch-setup.py) = f48060c553b57a7943004ef76770d8b4518a80fe
diff --git a/security/py-cyclonedx-python-lib/patches/patch-setup.py b/security/py-cyclonedx-python-lib/patches/patch-setup.py
@@ -1,18 +1,15 @@
-$NetBSD: patch-setup.py,v 1.2 2022/02/20 21:23:44 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2022/06/13 09:59:01 wiz Exp $
 
 Be less restrictive in dependencies.
 
---- setup.py.orig	2022-01-24 13:30:26.931830600 +0000
+--- setup.py.orig	2022-06-10 20:01:07.074393300 +0000
 +++ setup.py
-@@ -15,9 +15,9 @@ package_data = \
- install_requires = \
+@@ -16,7 +16,7 @@ install_requires = \
  ['packageurl-python>=0.9',
   'setuptools>=47.0.0',
-- 'toml>=0.10.0,<0.11.0',
-+ 'toml>=0.10.0',
-  'types-setuptools>=57.0.0',
-- 'types-toml>=0.10.0,<0.11.0']
-+ 'types-toml>=0.10.0']
+  'sortedcontainers>=2.4.0,<3.0.0',
+- 'toml>=0.10.0,<0.11.0']
++ 'toml>=0.10.0']
 
  extras_require = \
- {':python_version < "3.8"': ['importlib-metadata>=3.4',
+ {':python_version < "3.8"': ['importlib-metadata>=3.4']}