Attachment #231284 for bug #261430

Lines 3-8 Link Here

(-)b/net-im/py-matrix-synapse/Makefile (+1 lines)
3	PORTNAME= matrix-synapse	3	PORTNAME= matrix-synapse
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.49.2	5	DISTVERSION= 1.49.2
		6	PORTREVISION= 2
6	CATEGORIES= net-im python	7	CATEGORIES= net-im python
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8		9




--- synapse/python_dependencies.py.orig	2022-01-15 14:42:17 UTC
+++ synapse/python_dependencies.py
@@ -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.
@@ -86,7 +86,7 @@ REQUIREMENTS = [
     "typing-extensions>=3.7.4",
     # We enforce that we have a `cryptography` version that bundles an `openssl`
     # with the latest security patches.
- 
Synapse, et. al.
--
devel/Makefile                        |  1 +
devel/py-matrix-common/Makefile       | 31 +++++++++++++++++++++++++++
devel/py-matrix-common/distinfo       |  3 +++
devel/py-matrix-common/files/setup.py |  3 +++
devel/py-matrix-common/pkg-descr      |  3 +++
5 files changed, 41 insertions(+)
create mode 100644 devel/py-matrix-common/Makefile
create mode 100644 devel/py-matrix-common/distinfo
create mode 100644 devel/py-matrix-common/files/setup.py
create mode 100644 devel/py-matrix-common/pkg-descr

Lines 4766-4771 Link Here

(-)b/devel/Makefile (+1 lines)
4766	SUBDIR += py-marshmallow	4766	SUBDIR += py-marshmallow
4767	SUBDIR += py-marshmallow-enum	4767	SUBDIR += py-marshmallow-enum
4768	SUBDIR += py-matrix-angular-sdk	4768	SUBDIR += py-matrix-angular-sdk
		4769	SUBDIR += py-matrix-common
4769	SUBDIR += py-maturin	4770	SUBDIR += py-maturin
4770	SUBDIR += py-mccabe	4771	SUBDIR += py-mccabe
4771	SUBDIR += py-mdv	4772	SUBDIR += py-mdv




PORTNAME=	matrix-common
DISTVERSIONPREFIX=	v
DISTVERSION=	1.0.0
CATEGORIES=	devel python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	ports@skyforge.at
COMMENT=	Common utilities for Synapse, Sydent and Sygnal

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>19.2.0:devel/py-attrs@${PY_FLAVOR}

TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR}

USES=		python:3.6+
USE_PYTHON=	autoplist concurrent distutils
USE_GITHUB=	yes
GH_ACCOUNT=	matrix-org
GH_PROJECT=	matrix-python-common
NO_ARCH=	yes

post-extract:
	@${CP} ${FILESDIR}/setup.py ${WRKSRC}/

do-test:
	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests

.include <bsd.port.mk>

Added Link Here

(-)b/devel/py-matrix-common/distinfo (+3 lines)
1	TIMESTAMP = 1642580067
2	SHA256 (matrix-org-matrix-python-common-v1.0.0_GH0.tar.gz) = d610357a78caf5141814f055e8b3facabf4dd4863db8594030d58c81b2b2b7fd
3	SIZE (matrix-org-matrix-python-common-v1.0.0_GH0.tar.gz) = 8535

Added Link Here

(-)b/devel/py-matrix-common/files/setup.py (+3 lines)
1	from setuptools import setup
2
3	setup()




Common utilities for Synapse, Sydent and Sygnal.

WWW: https://www.matrix.org
 from the supported python versions
 Removed the test dependency on py-mock in sync with upstream
 requirements
 Added a new dependency on devel/py-matrix-common, a new port that
 provides code shared by most matrix.org projects, inlcuding synapse
--
net-im/py-matrix-synapse/Makefile | 7 +++----
net-im/py-matrix-synapse/distinfo | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)





PORTNAME=	matrix-synapse
DISTVERSIONPREFIX=	v
DISTVERSION=	1.50.1
PORTREVISION=	2
CATEGORIES=	net-im python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}ijson>=3.1:devel/py-ijson@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.7.0:www/py-pyjwt1@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}matrix-common>=1.0.0:devel/py-matrix-common@${PY_FLAVOR} \
		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss

TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}mock>=4.0.0:devel/py-mock@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.0:devel/py-parameterized@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR}

USES=		python:3.7+
USE_GITHUB=	yes
GH_ACCOUNT=	matrix-org
GH_PROJECT=	synapse

Lines 1-3 Link Here

(-)b/net-im/py-matrix-synapse/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1640158042	1	TIMESTAMP = 1642580433
2	SHA256 (matrix-org-synapse-v1.49.2_GH0.tar.gz) = f5b0017e9d77db94fac853fbefbcb4538d879cb80f404b02003930c76f5cafab	2	SHA256 (matrix-org-synapse-v1.50.1_GH0.tar.gz) = cc35b442a4356cf85b2bc4d140d2de0d3b92bcc9176adc1526a46798b3569c86
3	SIZE (matrix-org-synapse-v1.49.2_GH0.tar.gz) = 7637609	3	SIZE (matrix-org-synapse-v1.50.1_GH0.tar.gz) = 7654238
4	-
5	--
6	net-im/py-matrix-synapse/Makefile \| 2 +-	4	net-im/py-matrix-synapse/Makefile \| 2 +-
7	net-im/py-matrix-synapse/distinfo \| 6 +++---	5	net-im/py-matrix-synapse/distinfo \| 6 +++---
8	2 files changed, 4 insertions(+), 4 deletions(-)	6	2 files changed, 4 insertions(+), 4 deletions(-)

Lines 2-8 Link Here

(-)b/net-im/py-matrix-synapse/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= matrix-synapse	3	PORTNAME= matrix-synapse
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.50.1	5	DISTVERSION= 1.50.2
6	CATEGORIES= net-im python	6	CATEGORIES= net-im python
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8		8

Lines 1-3 Link Here

(-)b/net-im/py-matrix-synapse/distinfo (-4 / +3 lines)
1	TIMESTAMP = 1642580433	1	TIMESTAMP = 1643038555
2	SHA256 (matrix-org-synapse-v1.50.1_GH0.tar.gz) = cc35b442a4356cf85b2bc4d140d2de0d3b92bcc9176adc1526a46798b3569c86	2	SHA256 (matrix-org-synapse-v1.50.2_GH0.tar.gz) = 0e8f52d8a14c5994addda13332c67c6cb8604d090be0dc8f459645f6d1fb48cb
3	SIZE (matrix-org-synapse-v1.50.1_GH0.tar.gz) = 7654238	3	SIZE (matrix-org-synapse-v1.50.2_GH0.tar.gz) = 7654063
4	-

Return to bug 261430

Lines 1-6 Link Here

(-)b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py (-4 / +11 lines)
1	--- synapse/python_dependencies.py.orig 2021-12-17 15:03:44 UTC	1	--- synapse/python_dependencies.py.orig 2022-01-15 14:42:17 UTC
2	+++ synapse/python_dependencies.py	2	+++ synapse/python_dependencies.py
3	@@ -85,7 +85,7 @@ REQUIREMENTS = [	3	@@ -51,7 +51,7 @@ REQUIREMENTS = [
		4	# we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0
		5	"jsonschema>=3.0.0",
		6	# frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41
		7	- "frozendict>=1,<2.1.2",
		8	+ "frozendict>=1",
		9	"unpaddedbase64>=1.1.0",
		10	"canonicaljson>=1.4.0",
		11	# we use the type definitions added in signedjson 1.1.
		12	@@ -86,7 +86,7 @@ REQUIREMENTS = [
4	"typing-extensions>=3.7.4",	13	"typing-extensions>=3.7.4",
5	# We enforce that we have a `cryptography` version that bundles an `openssl`	14	# We enforce that we have a `cryptography` version that bundles an `openssl`
6	# with the latest security patches.	15	# with the latest security patches.
7	-
8	Synapse, et. al.	16	Synapse, et. al.
9	--
10	devel/Makefile \| 1 +	17	devel/Makefile \| 1 +
11	devel/py-matrix-common/Makefile \| 31 +++++++++++++++++++++++++++	18	devel/py-matrix-common/Makefile \| 31 +++++++++++++++++++++++++++
12	devel/py-matrix-common/distinfo \| 3 +++	19	devel/py-matrix-common/distinfo \| 3 +++
13	devel/py-matrix-common/files/setup.py \| 3 +++	20	devel/py-matrix-common/files/setup.py \| 3 +++
14	devel/py-matrix-common/pkg-descr \| 3 +++	21	devel/py-matrix-common/pkg-descr \| 3 +++
15	5 files changed, 41 insertions(+)	22	5 files changed, 41 insertions(+)
16	create mode 100644 devel/py-matrix-common/Makefile	23	create mode 100644 devel/py-matrix-common/Makefile
17	create mode 100644 devel/py-matrix-common/distinfo	24	create mode 100644 devel/py-matrix-common/distinfo
18	create mode 100644 devel/py-matrix-common/files/setup.py	25	create mode 100644 devel/py-matrix-common/files/setup.py
19	create mode 100644 devel/py-matrix-common/pkg-descr	26	create mode 100644 devel/py-matrix-common/pkg-descr

Added Link Here

(-)b/devel/py-matrix-common/Makefile (+31 lines)
1	PORTNAME= matrix-common
2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.0.0
4	CATEGORIES= devel python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6
7	MAINTAINER= ports@skyforge.at
8	COMMENT= Common utilities for Synapse, Sydent and Sygnal
9
10	LICENSE= APACHE20
11	LICENSE_FILE= ${WRKSRC}/LICENSE
12
13	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>19.2.0:devel/py-attrs@${PY_FLAVOR}
14
15	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR}
17
18	USES= python:3.6+
19	USE_PYTHON= autoplist concurrent distutils
20	USE_GITHUB= yes
21	GH_ACCOUNT= matrix-org
22	GH_PROJECT= matrix-python-common
23	NO_ARCH= yes
24
25	post-extract:
26	@${CP} ${FILESDIR}/setup.py ${WRKSRC}/
27
28	do-test:
29	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
30
31	.include <bsd.port.mk>

Added Link Here

(-)b/devel/py-matrix-common/pkg-descr (-5 / +3 lines)
0	-	1	Common utilities for Synapse, Sydent and Sygnal.
1	Updated USES to python:3.7+ since upstream has removed python 3.6	2
		3	WWW: https://www.matrix.org
2	from the supported python versions	4	from the supported python versions
3	Removed the test dependency on py-mock in sync with upstream
4	requirements	5	requirements
5	Added a new dependency on devel/py-matrix-common, a new port that
6	provides code shared by most matrix.org projects, inlcuding synapse	6	provides code shared by most matrix.org projects, inlcuding synapse
7	--
8	net-im/py-matrix-synapse/Makefile \| 7 +++----	7	net-im/py-matrix-synapse/Makefile \| 7 +++----
9	net-im/py-matrix-synapse/distinfo \| 6 +++---	8	net-im/py-matrix-synapse/distinfo \| 6 +++---
10	2 files changed, 6 insertions(+), 7 deletions(-)	9	2 files changed, 6 insertions(+), 7 deletions(-)