CVS commit: pkgsrc/chat/matrix-synapse

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/chat/matrix-synapse
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 30 Jan 2022 11:17:10 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 30 11:17:10 UTC 2022

Modified Files:
        pkgsrc/chat/matrix-synapse: Makefile distinfo
        pkgsrc/chat/matrix-synapse/patches:
            patch-synapse_python_dependencies.py

Log Message:
matrix-synapse: fix tests

relax some restrictions

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/chat/matrix-synapse/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/chat/matrix-synapse/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/matrix-synapse/Makefile
diff -u pkgsrc/chat/matrix-synapse/Makefile:1.41 pkgsrc/chat/matrix-synapse/Makefile:1.42
--- pkgsrc/chat/matrix-synapse/Makefile:1.41    Sun Jan 30 10:14:16 2022
+++ pkgsrc/chat/matrix-synapse/Makefile Sun Jan 30 11:17:10 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2022/01/30 10:14:16 js Exp $
+# $NetBSD: Makefile,v 1.42 2022/01/30 11:17:10 wiz Exp $
 
 DISTNAME=      matrix-synapse-1.51.0
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=matrix-org/}
 EGG_NAME=      matrix_synapse-${PKGVERSION_NOREV}
@@ -12,37 +13,40 @@ HOMEPAGE=   https://github.com/matrix-org/
 COMMENT=       Reference homeserver for the Matrix decentralised comms protocol
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
-DEPENDS+=      ${PYPKGPREFIX}-jsonschema>=3.0.0:../../textproc/py-jsonschema
-DEPENDS+=      ${PYPKGPREFIX}-frozendict>=1:../../devel/py-frozendict
-DEPENDS+=      ${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64
-DEPENDS+=      ${PYPKGPREFIX}-canonicaljson>=1.4.0:../../devel/py-canonicaljson
-DEPENDS+=      ${PYPKGPREFIX}-signedjson>=1.1.0:../../security/py-signedjson
-DEPENDS+=      ${PYPKGPREFIX}-nacl>=1.2.1:../../security/py-nacl
-DEPENDS+=      ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
-DEPENDS+=      ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity
-DEPENDS+=      ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted
-DEPENDS+=      ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq
-DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL
-DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
-DEPENDS+=      ${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
 DEPENDS+=      ${PYPKGPREFIX}-asn1-modules>=0.0.7:../../security/py-asn1-modules
+DEPENDS+=      ${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
+DEPENDS+=      ${PYPKGPREFIX}-attrs>=19.2.0:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-bcrypt>=3.1.0:../../security/py-bcrypt
-DEPENDS+=      ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers
+DEPENDS+=      ${PYPKGPREFIX}-bleach>=1.4.3:../../www/py-bleach
+DEPENDS+=      ${PYPKGPREFIX}-canonicaljson>=1.4.0:../../devel/py-canonicaljson
+DEPENDS+=      ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
+DEPENDS+=      ${PYPKGPREFIX}-frozendict>=1:../../devel/py-frozendict
+DEPENDS+=      ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
+DEPENDS+=      ${PYPKGPREFIX}-ijson>=3.0:../../devel/py-ijson
+DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.9:../../textproc/py-jinja2
+DEPENDS+=      ${PYPKGPREFIX}-jsonschema>=3.0.0:../../textproc/py-jsonschema
+DEPENDS+=      ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
 DEPENDS+=      ${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons
+DEPENDS+=      ${PYPKGPREFIX}-matrix-common>=1.0.0:../../chat/py-matrix-common
 DEPENDS+=      ${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack
+DEPENDS+=      ${PYPKGPREFIX}-nacl>=1.2.1:../../security/py-nacl
+DEPENDS+=      ${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr
+DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL
 DEPENDS+=      ${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers
+DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=      ${PYPKGPREFIX}-prometheus_client>=0.4.0:../../net/py-prometheus_client
-DEPENDS+=      ${PYPKGPREFIX}-attrs>=19.2.0:../../devel/py-attrs
-DEPENDS+=      ${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr
-DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.9:../../textproc/py-jinja2
-DEPENDS+=      ${PYPKGPREFIX}-bleach>=1.4.3:../../www/py-bleach
-DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=3.7.4:../../devel/py-typing-extensions
-DEPENDS+=      ${PYPKGPREFIX}-ijson>=3.0:../../devel/py-ijson
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2>=2.7:../../databases/py-psycopg2
-DEPENDS+=      ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
-DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
-DEPENDS+=      ${PYPKGPREFIX}-matrix-common>=1.0.0:../../chat/py-matrix-common
+DEPENDS+=      ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity
+DEPENDS+=      ${PYPKGPREFIX}-signedjson>=1.1.0:../../security/py-signedjson
+DEPENDS+=      ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers
+DEPENDS+=      ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
+DEPENDS+=      ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq
+DEPENDS+=      ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted
+DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=3.7.4:../../devel/py-typing-extensions
+DEPENDS+=      ${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64
+DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
+TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-unpaddedbase64
 
@@ -85,5 +89,10 @@ SUBST_VARS.pl=                       SYNAPSE_DEFAULT_CREATOR
 
 BUILD_DEFS+=                   SYNAPSE_DEFAULT_CREATOR_PL
 
+# test status as of 1.51.0
+# 51 warnings, 1 error
+do-test:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} pytest-${PYVERSSUFFIX}
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/matrix-synapse/distinfo
diff -u pkgsrc/chat/matrix-synapse/distinfo:1.30 pkgsrc/chat/matrix-synapse/distinfo:1.31
--- pkgsrc/chat/matrix-synapse/distinfo:1.30    Sun Jan 30 10:14:16 2022
+++ pkgsrc/chat/matrix-synapse/distinfo Sun Jan 30 11:17:10 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2022/01/30 10:14:16 js Exp $
+$NetBSD: distinfo,v 1.31 2022/01/30 11:17:10 wiz Exp $
 
 BLAKE2s (matrix-synapse-1.51.0.tar.gz) = d29dfd91e95584096ceff17fea2095b1f1aaa7cb9bc88e0a71c5d4ff5cca3689
 SHA512 (matrix-synapse-1.51.0.tar.gz) = 52b96c4ee74894934fdaf683c8a3f0e9f4d6eb227ad916d94aaefd878c70cdc4fc0edbf44082dcbd5de5930fe279501207614a2bd6c28e2b2c64425ce74f137a
 Size (matrix-synapse-1.51.0.tar.gz) = 7665238 bytes
 SHA1 (patch-synapse_handlers_room.py) = f9a62add7171898ec0ea76360f0a4c9969609537
-SHA1 (patch-synapse_python_dependencies.py) = c2e8b13b42ad2904fe985231643a2cd2c0f759aa
+SHA1 (patch-synapse_python_dependencies.py) = ed198e743148c50c2066f2e20310ca6f5e29b19a

Index: pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
diff -u pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py:1.4 pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py:1.5
--- pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py:1.4 Sun Jan 30 10:14:16 2022
+++ pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py     Sun Jan 30 11:17:10 2022
@@ -1,12 +1,23 @@
-$NetBSD: patch-synapse_python_dependencies.py,v 1.4 2022/01/30 10:14:16 js Exp $
+$NetBSD: patch-synapse_python_dependencies.py,v 1.5 2022/01/30 11:17:10 wiz Exp $
 
 Patch out cryptography check: It doesn't need a version this high and it was
 added by upstream as an ugly hack to force a patched OpenSSL, in case it is
 linked statically.
 
+Relax other restrictions since pkgsrc has/will have newer versions.
+
 --- synapse/python_dependencies.py.orig        2022-01-25 11:42:32.000000000 +0000
 +++ synapse/python_dependencies.py
-@@ -84,9 +84,6 @@ REQUIREMENTS = [
+@@ -51,7 +51,7 @@ REQUIREMENTS = [
+     # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0
+     "jsonschema>=3.0.0",
+     # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41
+-    "frozendict>=1,<2.1.2",
++    "frozendict>=1",
+     "unpaddedbase64>=1.1.0",
+     "canonicaljson>=1.4.0",
+     # we use the type definitions added in signedjson 1.1.
+@@ -84,11 +84,8 @@ REQUIREMENTS = [
      "Jinja2>=2.9",
      "bleach>=1.4.3",
      "typing-extensions>=3.7.4",
@@ -14,5 +25,8 @@ linked statically.
 -    # with the latest security patches.
 -    "cryptography>=3.4.7",
      "ijson>=3.1",
-     "matrix-common==1.0.0",
+-    "matrix-common==1.0.0",
++    "matrix-common",
  ]
+ 
+ CONDITIONAL_REQUIREMENTS = {

Prev by Date: CVS commit: pkgsrc/devel/py-frozendict
Next by Date: CVS commit: pkgsrc/print/poppler
Previous by Thread: CVS commit: pkgsrc/devel/py-frozendict
Next by Thread: CVS commit: pkgsrc/print/poppler
Indexes:

Home | Main Index | Thread Index | Old Index