svn commit: r549855 - in branches/2020Q3: devel/py-canonicaljson security/py-signedjson security/py-signedjson/files

[Danilo G. Baio]

Author: dbaio
Date: Wed Sep 23 21:17:30 2020
New Revision: 549855
URL: https://svnweb.freebsd.org/changeset/ports/549855

Log:
  MFH: r542025 r544404
  
  Fix RUN_DEPENDS
  
  - Bump PORTREVISION for dependency change
  
  devel/py-importlib-metadata is not required for python 3.8+.
  
  Update to 1.2.0
  
  Changes:	https://github.com/matrix-org/python-canonicaljson/blob/master/CHANGES.md
  
  MFH: r542200 (partial)
    Update Python requirements for security/py-signedjson (avoid break bulk -a)
  
  PR:		249375
  Approved by:	ports-secteam (fluffy)

Added:
  branches/2020Q3/security/py-signedjson/files/
     - copied from r542025, head/security/py-signedjson/files/
Modified:
  branches/2020Q3/devel/py-canonicaljson/Makefile
  branches/2020Q3/devel/py-canonicaljson/distinfo
  branches/2020Q3/security/py-signedjson/Makefile
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/devel/py-canonicaljson/Makefile
==============================================================================
--- branches/2020Q3/devel/py-canonicaljson/Makefile	Wed Sep 23 21:13:38 2020	(r549854)
+++ branches/2020Q3/devel/py-canonicaljson/Makefile	Wed Sep 23 21:17:30 2020	(r549855)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	canonicaljson
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,12 +14,12 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}frozendict>=1.0:devel/py-frozendict@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python
-USE_PYTHON=	autoplist distutils
+USES=		python:3.5+
+USE_PYTHON=	autoplist concurrent distutils
+
 NO_ARCH=	yes
 
 do-test:

Modified: branches/2020Q3/devel/py-canonicaljson/distinfo
==============================================================================
--- branches/2020Q3/devel/py-canonicaljson/distinfo	Wed Sep 23 21:13:38 2020	(r549854)
+++ branches/2020Q3/devel/py-canonicaljson/distinfo	Wed Sep 23 21:17:30 2020	(r549855)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528219967
-SHA256 (canonicaljson-1.1.4.tar.gz) = 45bce530ff5fd0ca93703f71bfb66de740a894a3b5dd6122398c6d8f18539725
-SIZE (canonicaljson-1.1.4.tar.gz) = 9355
+TIMESTAMP = 1596280080
+SHA256 (canonicaljson-1.2.0.tar.gz) = 99793988a301401c696c432d6636b6d6ef6ba0472ec923e67ec19ab31991d1ea
+SIZE (canonicaljson-1.2.0.tar.gz) = 9983

Modified: branches/2020Q3/security/py-signedjson/Makefile
==============================================================================
--- branches/2020Q3/security/py-signedjson/Makefile	Wed Sep 23 21:13:38 2020	(r549854)
+++ branches/2020Q3/security/py-signedjson/Makefile	Wed Sep 23 21:17:30 2020	(r549855)
@@ -3,6 +3,7 @@
 
 PORTNAME=	signedjson
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	security devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,19 +16,24 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
 		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.5:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3800
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR}
+.endif
+
 do-test:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} -m pytest tests)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>