[arch-commits] Commit in matrix-synapse/trunk (2 files)

[Johannes Löthberg]

    Date: Sunday, August 16, 2020 @ 14:21:28
  Author: demize
Revision: 681538

upgpkg: matrix-synapse 1.18.0-1

Modified:
  matrix-synapse/trunk/PKGBUILD
Deleted:
  matrix-synapse/trunk/prometheus-client-bound-bump.patch

------------------------------------+
 PKGBUILD                           |   28 ++++++++++------------------
 prometheus-client-bound-bump.patch |   11 -----------
 2 files changed, 10 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-16 14:21:26 UTC (rev 681537)
+++ PKGBUILD	2020-08-16 14:21:28 UTC (rev 681538)
@@ -2,7 +2,7 @@
 # Contributor: Ivan Shapovalov <intelfx at intelfx.name>
 
 pkgname=matrix-synapse
-pkgver=1.15.2
+pkgver=1.18.0
 pkgrel=1
 
 pkgdesc="Matrix reference homeserver"
@@ -10,7 +10,7 @@
 arch=('any')
 license=('Apache')
 
-depends=('python-jsonschema' 'python-twisted' 'python-service-identity'
+depends=('libwebp' 'python-jsonschema' 'python-twisted' 'python-service-identity'
          'python-pyopenssl' 'python-yaml' 'python-pyasn1' 'python-pynacl'
          'python-daemonize' 'python-bcrypt' 'python-frozendict'
          'python-pillow' 'python-ujson'
@@ -22,7 +22,7 @@
          'python-attrs' 'python-netaddr' 'python-sortedcontainers'
          'python-treq' 'python-idna' 'python-jinja'
          'python-bleach' 'python-typing_extensions' 'systemd')
-checkdepends=('python-lxml' 'python-mock' 'python-parameterized')
+checkdepends=('python-authlib' 'python-pyjwt' 'python-lxml' 'python-mock' 'python-parameterized')
 optdepends=('perl: sync_room_to_group.pl'
             'python-psycopg2: PostgreSQL support'
             'python-lxml: URL previewing'
@@ -32,34 +32,26 @@
 source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz"
         'synapse.service'
         'sysusers-synapse.conf'
-        'tmpfiles-synapse.conf'
-        'prometheus-client-bound-bump.patch')
+        'tmpfiles-synapse.conf')
 
-md5sums=('cc2029c5fcce3258af9a497d51aa5b8e'
+md5sums=('d8a58e52822ef5e4e823036c212af5d9'
          'fb196dee4f38a4b19e0a160f45574032'
          'ecd9f66fb57fe1a2e1e2df07a460a35b'
-         'e961c9ecad84a70345a57a7e9e6d5b09'
-         '4cb91413c521e8e25216249040d3a2db')
+         'e961c9ecad84a70345a57a7e9e6d5b09')
 
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install
 
-prepare() {
+build() {
 	cd synapse-$pkgver
-	patch -p1 <"$srcdir"/prometheus-client-bound-bump.patch
+	python setup.py build
 }
 
-build() {
+check() {
 	cd synapse-$pkgver
-	python setup.py build
+	PYTHONPATH=. trial3 tests
 }
 
-## OIDC test is unconditionally run but requires authlib which isn't packaged yet, and trial doesn't have a way to specify tests to skip.
-#check() {
-#	cd synapse-$pkgver
-#	PYTHONPATH=. trial3 tests
-#}
-
 package() {
 	install -Dm644 synapse.service "$pkgdir"/usr/lib/systemd/system/synapse.service
 

Deleted: prometheus-client-bound-bump.patch
===================================================================
--- prometheus-client-bound-bump.patch	2020-08-16 14:21:26 UTC (rev 681537)
+++ prometheus-client-bound-bump.patch	2020-08-16 14:21:28 UTC (rev 681538)
@@ -1,11 +0,0 @@
---- a/synapse/python_dependencies.py
-+++ b/synapse/python_dependencies.py
-@@ -67,7 +67,7 @@ REQUIREMENTS = [
-     "msgpack>=0.5.2",
-     "phonenumbers>=8.2.0",
-     "six>=1.10",
--    "prometheus_client>=0.0.18,<0.8.0",
-+    "prometheus_client>=0.0.18,<0.9.0",
-     # we use attr.s(slots), which arrived in 16.0.0
-     # Twisted 18.7.0 requires attrs>=17.4.0
-     "attrs>=17.4.0",