Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] synapse: update to 1.58.0.
@ 2022-05-03 12:34 TinfoilSubmarine
  2022-05-04  8:35 ` [PR REVIEW] " freshprince
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-03 12:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/36973

synapse: update to 1.58.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36973.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-36973.patch --]
[-- Type: text/x-diff, Size: 5646 bytes --]

From 0e47d46bb2400e0ccea5aa083c8cc6b010943860 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:13:14 -0400
Subject: [PATCH 1/4] python3-frozendict: update to 2.3.2.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3946c2ee05b1..4badb45e2d89 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
+checksum=7fac4542f0a13fbe704db4942f41ba3abffec5af8b100025973e59dff6a09d0d
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 9b29eb87ff5667a71248bfab1c6b9737b9917757 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:14:03 -0400
Subject: [PATCH 2/4] python3-phonenumbers: update to 8.12.47.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 0a952e920922..5b4179baaacf 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.46
+version=8.12.47
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133
+checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522

From e443925f4997bea42960559a1a48cb0446af835a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 3 May 2022 07:58:38 -0400
Subject: [PATCH 3/4] python3-canonicaljson: update to 1.6.1.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index b9535436442b..2124a48c545b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427
+checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824

From 702b7599d5e896db4cad7f91ce71938f8a0554f3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:17:05 -0400
Subject: [PATCH 4/4] synapse: update to 1.58.0.

upstream dropped support for setup.py
---
 srcpkgs/synapse/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 22ad01847677..a59157b56b6e 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.57.0
+version=1.58.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target=tests
-hostmakedepends="python3-setuptools"
+make_install_target="matrix_synapse-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
@@ -14,14 +15,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson python3-matrix-common
  python3-packaging"
-checkdepends="$depends python3-parameterized python3-pytest"
+checkdepends="$depends python3-parameterized python3-pytest unzip"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
+checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -31,6 +32,12 @@ make_dirs="
 	/etc/synapse 755 synapse synapse
 	/var/log/synapse 0755 synapse synapse"
 
+do_check() {
+	mkdir -p test
+	unzip ${make_install_target} -d test
+	PYTHONPATH=test pytest3 ${make_check_target}
+}
+
 post_install() {
 	vsv synapse
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
@ 2022-05-04  8:35 ` freshprince
  2022-05-04  8:39 ` paper42
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: freshprince @ 2022-05-04  8:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New review comment by freshprince on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r864578544

Comment:
an easier way to make check work would be to add `synapse` to `checkdepends` (wich makes `$depends` no longer necessary)

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
  2022-05-04  8:35 ` [PR REVIEW] " freshprince
@ 2022-05-04  8:39 ` paper42
  2022-05-04  9:00 ` freshprince
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-05-04  8:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r864582082

Comment:
That would create a build cycle which is not acceptable.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
  2022-05-04  8:35 ` [PR REVIEW] " freshprince
  2022-05-04  8:39 ` paper42
@ 2022-05-04  9:00 ` freshprince
  2022-05-04  9:08 ` paper42
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: freshprince @ 2022-05-04  9:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New review comment by freshprince on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r864600267

Comment:
I see

maybe this then?

```
pre_check() {
	pip install ${make_install_target}
}
```

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2022-05-04  9:00 ` freshprince
@ 2022-05-04  9:08 ` paper42
  2022-05-04  9:27 ` freshprince
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-05-04  9:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r864606486

Comment:
That would pollute the masterdir and wouldn't clean up

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (3 preceding siblings ...)
  2022-05-04  9:08 ` paper42
@ 2022-05-04  9:27 ` freshprince
  2022-05-04 12:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: freshprince @ 2022-05-04  9:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

New review comment by freshprince on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r864629866

Comment:
true... hmm.

my last suggestion:

```
pre_check() {
	pip install -t ./ --no-deps ${make_install_target}
}
```

this produces some warnings because some directories already exist but won't pollute masterdir.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (4 preceding siblings ...)
  2022-05-04  9:27 ` freshprince
@ 2022-05-04 12:38 ` TinfoilSubmarine
  2022-05-04 12:39 ` [PR REVIEW] " TinfoilSubmarine
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-04 12:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/36973

synapse: update to 1.58.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36973.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-36973.patch --]
[-- Type: text/x-diff, Size: 5590 bytes --]

From 2a64d7741913ad21ffd4daa888eb38c9318a9e76 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:13:14 -0400
Subject: [PATCH 1/4] python3-frozendict: update to 2.3.2.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3946c2ee05b1..4badb45e2d89 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
+checksum=7fac4542f0a13fbe704db4942f41ba3abffec5af8b100025973e59dff6a09d0d
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From b67a26195acc73834e0dabcd2fd092547af25e47 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:14:03 -0400
Subject: [PATCH 2/4] python3-phonenumbers: update to 8.12.47.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 0a952e920922..5b4179baaacf 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.46
+version=8.12.47
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133
+checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522

From 5a4a0d050f9348797285fe86f7b4dd42efa2beb4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 3 May 2022 07:58:38 -0400
Subject: [PATCH 3/4] python3-canonicaljson: update to 1.6.1.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index b9535436442b..2124a48c545b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427
+checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824

From b5269590d57662d3661371676be50bc1c925d164 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:17:05 -0400
Subject: [PATCH 4/4] synapse: update to 1.58.0.

upstream dropped support for setup.py
---
 srcpkgs/synapse/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 22ad01847677..5e23260063e5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.57.0
+version=1.58.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target=tests
-hostmakedepends="python3-setuptools"
+make_install_target="matrix_synapse-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
@@ -14,14 +15,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson python3-matrix-common
  python3-packaging"
-checkdepends="$depends python3-parameterized python3-pytest"
+checkdepends="$depends python3-parameterized python3-pytest unzip"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
+checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -31,6 +32,10 @@ make_dirs="
 	/etc/synapse 755 synapse synapse
 	/var/log/synapse 0755 synapse synapse"
 
+pre_check() {
+	unzip ${make_install_target} "*.dist-info/*"
+}
+
 post_install() {
 	vsv synapse
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (5 preceding siblings ...)
  2022-05-04 12:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-05-04 12:39 ` TinfoilSubmarine
  2022-05-04 12:58 ` TinfoilSubmarine
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-04 12:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r864781001

Comment:
For posterity, I just copied this from https://github.com/void-linux/void-packages/blob/b79b3d30270b315301507ff715bb137bdf499d98/srcpkgs/python3-quart/template#L20-L28

I pushed (IMO) a better solution which only extracts the dist-info, which is all that is required.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (6 preceding siblings ...)
  2022-05-04 12:39 ` [PR REVIEW] " TinfoilSubmarine
@ 2022-05-04 12:58 ` TinfoilSubmarine
  2022-05-04 14:11 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-04 12:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#issuecomment-1117282389

Comment:
@paper42, I think the new `make_check_pre` is breaking this.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (7 preceding siblings ...)
  2022-05-04 12:58 ` TinfoilSubmarine
@ 2022-05-04 14:11 ` TinfoilSubmarine
  2022-05-04 14:13 ` TinfoilSubmarine
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-04 14:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/36973

synapse: update to 1.58.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36973.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-36973.patch --]
[-- Type: text/x-diff, Size: 6606 bytes --]

From 946c1dfa81cbf055394858deff70565c8480e915 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 4 May 2022 10:09:59 -0400
Subject: [PATCH 1/5] build-style/python3-module.sh: fix PYTHONPATH with
 make_check_pre

---
 common/build-style/python3-module.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index 8daf40e69219..43f1f663b6ef 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -25,8 +25,8 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \
-			python3 -m pytest ${make_check_args} ${make_check_target}
+		PYTHONPATH="$(cd build/lib* && pwd)"
+		${make_check_pre} python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
 		if [ -z "$make_check_target" ]; then

From da8a3370778c7a9e38b55d5d3884444e7945d42d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:13:14 -0400
Subject: [PATCH 2/5] python3-frozendict: update to 2.3.2.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3946c2ee05b1..4badb45e2d89 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
+checksum=7fac4542f0a13fbe704db4942f41ba3abffec5af8b100025973e59dff6a09d0d
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 2db820bdb682d325a9d40e16dbba3424d0380ef2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:14:03 -0400
Subject: [PATCH 3/5] python3-phonenumbers: update to 8.12.47.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 0a952e920922..5b4179baaacf 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.46
+version=8.12.47
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133
+checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522

From 387105039c8a388dc483cd3dbbaf6ae0fa2c94a7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 3 May 2022 07:58:38 -0400
Subject: [PATCH 4/5] python3-canonicaljson: update to 1.6.1.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index b9535436442b..2124a48c545b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427
+checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824

From 36f14245bf251674fe73551b00978262bcdb6c3a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:17:05 -0400
Subject: [PATCH 5/5] synapse: update to 1.58.0.

upstream dropped support for setup.py
---
 srcpkgs/synapse/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 22ad01847677..5e23260063e5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.57.0
+version=1.58.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target=tests
-hostmakedepends="python3-setuptools"
+make_install_target="matrix_synapse-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
@@ -14,14 +15,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson python3-matrix-common
  python3-packaging"
-checkdepends="$depends python3-parameterized python3-pytest"
+checkdepends="$depends python3-parameterized python3-pytest unzip"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
+checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -31,6 +32,10 @@ make_dirs="
 	/etc/synapse 755 synapse synapse
 	/var/log/synapse 0755 synapse synapse"
 
+pre_check() {
+	unzip ${make_install_target} "*.dist-info/*"
+}
+
 post_install() {
 	vsv synapse
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (8 preceding siblings ...)
  2022-05-04 14:11 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-05-04 14:13 ` TinfoilSubmarine
  2022-05-07 21:34 ` [PR REVIEW] " paper42
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-04 14:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#issuecomment-1117364795

Comment:
I moved the `PYTHONPATH=...` to a separate line, this will fix it as long as `make_check_pre` doesn't clear environment. It could also be left inside, but done as...
```
${make_check_pre} export PYTHONPATH=$(cd build/lib* && pwd)"; python3 -m pytest ${make_check_args} $make_check_target}
```

if there were concerns about make_check_pre clearing/changing the envvars.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (9 preceding siblings ...)
  2022-05-04 14:13 ` TinfoilSubmarine
@ 2022-05-07 21:34 ` paper42
  2022-05-07 21:35 ` TinfoilSubmarine
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-05-07 21:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r867397194

Comment:
```suggestion
		PYTHONPATH="$(cd build/lib* && pwd)" \
			${make_check_pre} python3 -m pytest ${make_check_args} ${make_check_target}
```
Thanks for noticing this

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (10 preceding siblings ...)
  2022-05-07 21:34 ` [PR REVIEW] " paper42
@ 2022-05-07 21:35 ` TinfoilSubmarine
  2022-05-07 21:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-07 21:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#issuecomment-1117364795

Comment:
I moved the `PYTHONPATH=...` to a separate line, this will fix it as long as `make_check_pre` doesn't clear environment. ~~It could also be left inside, but done as...~~

~~${make_check_pre} export PYTHONPATH=$(cd build/lib* && pwd)"; python3 -m pytest ${make_check_args} $make_check_target}~~


~~if there were concerns about make_check_pre clearing/changing the envvars.~~

EDIT: Don't know what I was thinking when I wrote that other suggestion, brain wasn't fully awake I guess.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (11 preceding siblings ...)
  2022-05-07 21:35 ` TinfoilSubmarine
@ 2022-05-07 21:38 ` TinfoilSubmarine
  2022-05-09  8:41 ` paper42
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-05-07 21:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/36973

synapse: update to 1.58.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36973.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-36973.patch --]
[-- Type: text/x-diff, Size: 6609 bytes --]

From 795257be43692ed71c589f174ccba96103c6c69a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 4 May 2022 10:09:59 -0400
Subject: [PATCH 1/5] build-style/python3-module.sh: fix PYTHONPATH with
 make_check_pre

---
 common/build-style/python3-module.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index 8daf40e69219..019720869259 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -25,8 +25,8 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \
-			python3 -m pytest ${make_check_args} ${make_check_target}
+		PYTHONPATH="$(cd build/lib* && pwd)" \
+			${make_check_pre} python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
 		if [ -z "$make_check_target" ]; then

From bd12481c0df5d428b043218747b5ebf3735faa81 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:13:14 -0400
Subject: [PATCH 2/5] python3-frozendict: update to 2.3.2.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3946c2ee05b1..4badb45e2d89 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
+checksum=7fac4542f0a13fbe704db4942f41ba3abffec5af8b100025973e59dff6a09d0d
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 9d28e2f48baeca2d5f216d983a3780d348af26b2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:14:03 -0400
Subject: [PATCH 3/5] python3-phonenumbers: update to 8.12.47.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 0a952e920922..5b4179baaacf 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.46
+version=8.12.47
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133
+checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522

From 481cc721618a292398953b4e2da568b7364e9d17 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 3 May 2022 07:58:38 -0400
Subject: [PATCH 4/5] python3-canonicaljson: update to 1.6.1.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index b9535436442b..2124a48c545b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427
+checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824

From ac6a6677d8499c61fe6eacdd86cd772188c7fc77 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:17:05 -0400
Subject: [PATCH 5/5] synapse: update to 1.58.0.

upstream dropped support for setup.py
---
 srcpkgs/synapse/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 22ad01847677..5e23260063e5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.57.0
+version=1.58.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target=tests
-hostmakedepends="python3-setuptools"
+make_install_target="matrix_synapse-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
@@ -14,14 +15,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson python3-matrix-common
  python3-packaging"
-checkdepends="$depends python3-parameterized python3-pytest"
+checkdepends="$depends python3-parameterized python3-pytest unzip"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
+checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -31,6 +32,10 @@ make_dirs="
 	/etc/synapse 755 synapse synapse
 	/var/log/synapse 0755 synapse synapse"
 
+pre_check() {
+	unzip ${make_install_target} "*.dist-info/*"
+}
+
 post_install() {
 	vsv synapse
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (12 preceding siblings ...)
  2022-05-07 21:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-05-09  8:41 ` paper42
  2022-05-09  9:03 ` [PR REVIEW] " paper42
  2022-05-09  9:04 ` [PR PATCH] [Merged]: " paper42
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-05-09  8:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/36973

synapse: update to 1.58.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36973.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-36973.patch --]
[-- Type: text/x-diff, Size: 5590 bytes --]

From 2e7ec3208b9d923e60059f083bcc999f41ed1628 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:13:14 -0400
Subject: [PATCH 1/4] python3-frozendict: update to 2.3.2.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3946c2ee05b1..4badb45e2d89 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
+checksum=7fac4542f0a13fbe704db4942f41ba3abffec5af8b100025973e59dff6a09d0d
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 4f48e2e8a16b2b5b46b03519525955fecd05c612 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:14:03 -0400
Subject: [PATCH 2/4] python3-phonenumbers: update to 8.12.47.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 0a952e920922..5b4179baaacf 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.46
+version=8.12.47
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133
+checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522

From 6daef018898710ff466322b26bb1a92f09ec6b78 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 3 May 2022 07:58:38 -0400
Subject: [PATCH 3/4] python3-canonicaljson: update to 1.6.1.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index b9535436442b..2124a48c545b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427
+checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824

From 6a8e113f65438e26a6e9528f7d8cb34752464cdd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:17:05 -0400
Subject: [PATCH 4/4] synapse: update to 1.58.0.

upstream dropped support for setup.py
---
 srcpkgs/synapse/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 22ad01847677..5e23260063e5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.57.0
+version=1.58.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target=tests
-hostmakedepends="python3-setuptools"
+make_install_target="matrix_synapse-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
@@ -14,14 +15,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson python3-matrix-common
  python3-packaging"
-checkdepends="$depends python3-parameterized python3-pytest"
+checkdepends="$depends python3-parameterized python3-pytest unzip"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
+checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -31,6 +32,10 @@ make_dirs="
 	/etc/synapse 755 synapse synapse
 	/var/log/synapse 0755 synapse synapse"
 
+pre_check() {
+	unzip ${make_install_target} "*.dist-info/*"
+}
+
 post_install() {
 	vsv synapse
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (13 preceding siblings ...)
  2022-05-09  8:41 ` paper42
@ 2022-05-09  9:03 ` paper42
  2022-05-09  9:04 ` [PR PATCH] [Merged]: " paper42
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-05-09  9:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36973#discussion_r867791582

Comment:
We might want to do something similar in the pep517 build style.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Merged]: synapse: update to 1.58.0.
  2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
                   ` (14 preceding siblings ...)
  2022-05-09  9:03 ` [PR REVIEW] " paper42
@ 2022-05-09  9:04 ` paper42
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-05-09  9:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

There's a merged pull request on the void-packages repository

synapse: update to 1.58.0.
https://github.com/void-linux/void-packages/pull/36973

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2022-05-09  9:04 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-03 12:34 [PR PATCH] synapse: update to 1.58.0 TinfoilSubmarine
2022-05-04  8:35 ` [PR REVIEW] " freshprince
2022-05-04  8:39 ` paper42
2022-05-04  9:00 ` freshprince
2022-05-04  9:08 ` paper42
2022-05-04  9:27 ` freshprince
2022-05-04 12:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-05-04 12:39 ` [PR REVIEW] " TinfoilSubmarine
2022-05-04 12:58 ` TinfoilSubmarine
2022-05-04 14:11 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-05-04 14:13 ` TinfoilSubmarine
2022-05-07 21:34 ` [PR REVIEW] " paper42
2022-05-07 21:35 ` TinfoilSubmarine
2022-05-07 21:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-05-09  8:41 ` paper42
2022-05-09  9:03 ` [PR REVIEW] " paper42
2022-05-09  9:04 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).