From: AluminumTank <AluminumTank@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] synapse: update to 1.37.1
Date: Thu, 01 Jul 2021 19:29:03 +0200 [thread overview]
Message-ID: <20210701172903.VGmvBN2lXXO4uA4ldcYocmn5rwkkcSQ1wNdsM-DsfUk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31263@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]
There is an updated pull request by AluminumTank against master on the void-packages repository
https://github.com/AluminumTank/void-packages synapse
https://github.com/void-linux/void-packages/pull/31263
synapse: update to 1.37.1
<!-- Mark items with [x] where applicable -->
New dependency `python3-ijson` needed.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/31263.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-31263.patch --]
[-- Type: text/x-diff, Size: 4523 bytes --]
From 1c75bfd140b4c386263d0234d3fe974049035441 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@thebeckmeyers.xyz>
Date: Wed, 2 Jun 2021 13:03:05 -0400
Subject: [PATCH] synapse: update to 1.37.1
---
.../patches/remove-yajl-backend-test.patch | 19 ++++++++++++++
srcpkgs/python3-ijson/template | 26 +++++++++++++++++++
srcpkgs/synapse/files/synapse/log/run | 1 +
srcpkgs/synapse/template | 6 ++---
4 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch
create mode 100644 srcpkgs/python3-ijson/template
create mode 120000 srcpkgs/synapse/files/synapse/log/run
diff --git a/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch b/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch
new file mode 100644
index 000000000000..c99bafee8362
--- /dev/null
+++ b/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch
@@ -0,0 +1,19 @@
+# this patch removes testing of the `yajl` backend which depends on yajl 1.x
+--- a/test/test_base.py 2021-06-29 12:52:48.720874344 -0400
++++ b/test/test_base.py 2021-06-29 12:53:18.342495467 -0400
+@@ -593,7 +593,7 @@
+
+ def generate_backend_specific_tests(module, classname_prefix, method_suffix,
+ *bases, **kwargs):
+- for backend in ['python', 'yajl', 'yajl2', 'yajl2_cffi', 'yajl2_c']:
++ for backend in ['python', 'yajl2', 'yajl2_cffi', 'yajl2_c']:
+ try:
+ classname = '%s%sTests' % (
+ ''.join(p.capitalize() for p in backend.split('_')),
+@@ -628,4 +628,4 @@
+ 'handles_incomplete_json_tokens': name != 'yajl'
+ }
+ return generate_backend_specific_tests(module, classname, method_suffix,
+- members=members, *_bases)
+\ No newline at end of file
++ members=members, *_bases)
diff --git a/srcpkgs/python3-ijson/template b/srcpkgs/python3-ijson/template
new file mode 100644
index 000000000000..bd9fda6fc054
--- /dev/null
+++ b/srcpkgs/python3-ijson/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-ijson'
+pkgname=python3-ijson
+version=3.1.4
+revision=1
+wrksrc="ijson-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="yajl-devel python3-devel"
+checkdepends="python3-cffi"
+short_desc="Iterative JSON parser with Pythonic interfaces"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/ICRAR/ijson"
+distfiles="${PYPI_SITE}/i/ijson/ijson-${version}.tar.gz"
+checksum=1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea
+
+post_patch() {
+ # yajl.py is the backend for yajl 1.x, while void-packages only includes the
+ # latest version of yajl (2.x), which can be used via several other included
+ # backends (yajl2, yajl2_c, yajl2_cffi)
+ rm ijson/backends/yajl.py
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/synapse/files/synapse/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 24dd39948aa5..5d522ae7a221 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.33.2
+version=1.37.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,14 +12,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
python3-attrs python3-netaddr python3-setuptools python3-bleach
python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq
python3-txacme python3-macaroons python3-sortedcontainers
- python3-typing_extensions"
+ python3-typing_extensions python3-ijson"
short_desc="Matrix reference homeserver"
maintainer="Pete <pete@port22.co.uk>"
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=5e0a934dba5994ec102e94ba323e88746b9aec6ccaae03ba2c94780a6dbfeb97
+checksum=1c2e9acbc52c55585d864e708f6299b0fda23e70ab7a01a0f6e01c3944889dc5
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
next prev parent reply other threads:[~2021-07-01 17:29 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 17:34 [PR PATCH] synapse: update to 1.35.0 AluminumTank
2021-06-02 17:41 ` [PR PATCH] [Updated] " AluminumTank
2021-06-03 3:15 ` FollieHiyuki
2021-06-03 12:40 ` [PR PATCH] [Updated] " AluminumTank
2021-06-03 12:45 ` AluminumTank
2021-06-03 14:42 ` [PR PATCH] [Updated] " AluminumTank
2021-06-03 14:50 ` synapse: update to 1.35.1 AluminumTank
2021-06-15 19:04 ` [PR PATCH] [Updated] " AluminumTank
2021-06-15 19:07 ` synapse: update to 1.36.0 AluminumTank
2021-06-15 19:08 ` [PR PATCH] [Updated] " AluminumTank
2021-06-15 19:10 ` [PR REVIEW] " ericonr
2021-06-15 19:11 ` ericonr
2021-06-16 21:47 ` [PR PATCH] [Updated] " AluminumTank
2021-06-17 3:00 ` [PR REVIEW] " ericonr
2021-06-17 3:00 ` ericonr
2021-06-17 3:21 ` AluminumTank
2021-06-17 18:25 ` [PR PATCH] [Updated] " AluminumTank
2021-06-29 16:15 ` AluminumTank
2021-06-29 16:19 ` AluminumTank
2021-06-29 16:59 ` AluminumTank
2021-06-30 19:33 ` [PR PATCH] [Updated] synapse: update to 1.37.0 AluminumTank
2021-07-01 4:08 ` [PR REVIEW] synapse: update to 1.37.1 ericonr
2021-07-01 17:29 ` AluminumTank [this message]
2021-07-02 13:16 ` [PR PATCH] [Updated] " AluminumTank
2021-07-02 13:21 ` AluminumTank
2021-07-02 14:18 ` ericonr
2021-07-02 14:43 ` [PR PATCH] [Updated] " AluminumTank
2021-07-02 14:46 ` AluminumTank
2021-07-02 15:07 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701172903.VGmvBN2lXXO4uA4ldcYocmn5rwkkcSQ1wNdsM-DsfUk@z \
--to=aluminumtank@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).