git: 42bd893bfda9 - main - security/py-signedjson: Update to 1.1.4

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=42bd893bfda9b48d51dad4eb06a1b5122f9a1f10

commit 42bd893bfda9b48d51dad4eb06a1b5122f9a1f10
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-04-16 03:58:29 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-04-16 04:19:27 +0000

    security/py-signedjson: Update to 1.1.4
    
    Changes:        https://github.com/matrix-org/python-signedjson/blob/master/CHANGELOG.md
                    https://github.com/matrix-org/python-signedjson/commits/main
---
 security/py-signedjson/Makefile                          |  9 ++++-----
 security/py-signedjson/distinfo                          |  6 +++---
 security/py-signedjson/files/patch-setup.py              | 13 -------------
 .../py-signedjson/files/patch-signedjson-__init__.py     | 16 ----------------
 4 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile
index 9d93f25a0a48..28fc6f861d6a 100644
--- a/security/py-signedjson/Makefile
+++ b/security/py-signedjson/Makefile
@@ -1,8 +1,7 @@
 # Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net>
 
 PORTNAME=	signedjson
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.4
 CATEGORIES=	security devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +15,6 @@ 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}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
-		${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}
 
@@ -28,10 +26,11 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.5:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 do-test:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} -m pytest tests)
+	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.post.mk>
diff --git a/security/py-signedjson/distinfo b/security/py-signedjson/distinfo
index b8713bececec..e379f1ac9b61 100644
--- a/security/py-signedjson/distinfo
+++ b/security/py-signedjson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586269364
-SHA256 (signedjson-1.1.1.tar.gz) = 350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009
-SIZE (signedjson-1.1.1.tar.gz) = 10906
+TIMESTAMP = 1649423838
+SHA256 (signedjson-1.1.4.tar.gz) = cd91c56af53f169ef032c62e9c4a3292dc158866933318d0592e3462db3d6492
+SIZE (signedjson-1.1.4.tar.gz) = 13565
diff --git a/security/py-signedjson/files/patch-setup.py b/security/py-signedjson/files/patch-setup.py
deleted file mode 100644
index d66a932f919f..000000000000
--- a/security/py-signedjson/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-Obtained from:  https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5
-
---- setup.py.orig	2020-03-27 19:41:34 UTC
-+++ setup.py
-@@ -41,7 +41,7 @@ setup(
-         "pynacl>=0.3.0",
-         "typing_extensions>=3.5",
-         'typing>=3.5;python_version<"3.5"',
--        "importlib_metadata",
-+        'importlib_metadata;python_version<"3.8"',
-     ],
-     long_description=read_file(("README.rst",)),
-     keywords="json",
diff --git a/security/py-signedjson/files/patch-signedjson-__init__.py b/security/py-signedjson/files/patch-signedjson-__init__.py
deleted file mode 100644
index 039fce0399ed..000000000000
--- a/security/py-signedjson/files/patch-signedjson-__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-Obtained from:  https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5
-
---- signedjson/__init__.py.orig	2020-03-27 19:41:34 UTC
-+++ signedjson/__init__.py
-@@ -12,7 +12,10 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--from importlib_metadata import version, PackageNotFoundError
-+try:
-+    from importlib.metadata import version, PackageNotFoundError
-+except ImportError:  # pragma: nocover
-+    from importlib_metadata import version, PackageNotFoundError
- 
- try:
-     __version__ = version(__name__)