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

2020-08-16 Thread Johannes Löthberg via arch-commits 
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
===
--- PKGBUILD2020-08-16 14:21:26 UTC (rev 681537)
+++ PKGBUILD2020-08-16 14:21:28 UTC (rev 681538)
@@ -2,7 +2,7 @@
 # Contributor: Ivan Shapovalov 
 
 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",

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

2020-06-10 Thread Johannes Löthberg via arch-commits 
Date: Wednesday, June 10, 2020 @ 14:49:55
  Author: demize
Revision: 641511

Bump prometheus_client requirement

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

+
 PKGBUILD   |   13 ++---
 prometheus-client-bound-bump.patch |   11 +++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-10 14:46:54 UTC (rev 641510)
+++ PKGBUILD2020-06-10 14:49:55 UTC (rev 641511)
@@ -3,7 +3,7 @@
 
 pkgname=matrix-synapse
 pkgver=1.14.0
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Matrix reference homeserver"
 url="https://github.com/matrix-org/synapse;
@@ -32,16 +32,23 @@
 
source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz;
 'synapse.service'
 'sysusers-synapse.conf'
-'tmpfiles-synapse.conf')
+'tmpfiles-synapse.conf'
+'prometheus-client-bound-bump.patch')
 
 md5sums=('ebd30eefc1d35db030099448d4b068b4'
  'fb196dee4f38a4b19e0a160f45574032'
  'ecd9f66fb57fe1a2e1e2df07a460a35b'
- 'e961c9ecad84a70345a57a7e9e6d5b09')
+ 'e961c9ecad84a70345a57a7e9e6d5b09'
+ 'SKIP')
 
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install
 
+prepare() {
+   cd synapse-$pkgver
+   patch -p1 <"$srcdir"/prometheus-client-bound-bump.patch
+}
+
 build() {
cd synapse-$pkgver
python setup.py build

Added: prometheus-client-bound-bump.patch
===
--- prometheus-client-bound-bump.patch  (rev 0)
+++ prometheus-client-bound-bump.patch  2020-06-10 14:49:55 UTC (rev 641511)
@@ -0,0 +1,11 @@
+--- 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",

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

2019-07-26 Thread Johannes Löthberg via arch-commits 
Date: Friday, July 26, 2019 @ 14:55:54
  Author: demize
Revision: 492864

upgpkg: matrix-synapse 1.2.1-1

Modified:
  matrix-synapse/trunk/PKGBUILD
Deleted:
  matrix-synapse/trunk/0001-Bump-python_dependencies.patch

-+
 0001-Bump-python_dependencies.patch |   29 -
 PKGBUILD|   15 ---
 2 files changed, 4 insertions(+), 40 deletions(-)

Deleted: 0001-Bump-python_dependencies.patch
===
--- 0001-Bump-python_dependencies.patch 2019-07-26 13:06:30 UTC (rev 492863)
+++ 0001-Bump-python_dependencies.patch 2019-07-26 14:55:54 UTC (rev 492864)
@@ -1,29 +0,0 @@
-From c1a7db468d4dbb3958f5b480fcde760566962ba4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= 
-Date: Tue, 8 Jan 2019 20:09:50 +0100
-Subject: [PATCH] Bump python_dependencies
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Johannes Löthberg 

- synapse/python_dependencies.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index f71e21ff4..b49873781 100644
 a/synapse/python_dependencies.py
-+++ b/synapse/python_dependencies.py
-@@ -62,7 +62,7 @@ REQUIREMENTS = [
- "six>=1.10",
- # prometheus_client 0.4.0 changed the format of counter metrics
- # (cf https://github.com/matrix-org/synapse/issues/4001)
--"prometheus_client>=0.0.18,<0.4.0",
-+"prometheus_client>=0.0.18,<0.7.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",
--- 
-2.21.0
-

Modified: PKGBUILD
===
--- PKGBUILD2019-07-26 13:06:30 UTC (rev 492863)
+++ PKGBUILD2019-07-26 14:55:54 UTC (rev 492864)
@@ -2,7 +2,7 @@
 # Contributor: Ivan Shapovalov 
 
 pkgname=matrix-synapse
-pkgver=1.1.0
+pkgver=1.2.1
 pkgrel=1
 
 pkgdesc="Matrix reference homeserver"
@@ -30,22 +30,15 @@
 
 
source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz;
 'synapse.service'
-'sysusers-synapse.conf'
-'0001-Bump-python_dependencies.patch')
+'sysusers-synapse.conf')
 
-md5sums=('e5ad1e0be0173cde3b8fdbdf86584eb8'
+md5sums=('e6e005ec360ccd1fa27ff33e15eb78ab'
  '276a99050f40601089255ea168bb7620'
- 'ecd9f66fb57fe1a2e1e2df07a460a35b'
- '81df2055170953f1fcd7883621406484')
+ 'ecd9f66fb57fe1a2e1e2df07a460a35b')
 
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install
 
-prepare() {
-   cd synapse-$pkgver
-   patch -p1 <"$srcdir"/0001-Bump-python_dependencies.patch
-}
-
 build() {
cd synapse-$pkgver
python setup.py build

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

2019-07-06 Thread Johannes Löthberg via arch-commits 
Date: Saturday, July 6, 2019 @ 20:24:51
  Author: demize
Revision: 487547

upgpkg: matrix-synapse 1.1.0-1

Modified:
  matrix-synapse/trunk/0001-Bump-python_dependencies.patch
  matrix-synapse/trunk/PKGBUILD

-+
 0001-Bump-python_dependencies.patch |2 +-
 PKGBUILD|   17 -
 2 files changed, 9 insertions(+), 10 deletions(-)

Modified: 0001-Bump-python_dependencies.patch
===
--- 0001-Bump-python_dependencies.patch 2019-07-06 20:05:17 UTC (rev 487546)
+++ 0001-Bump-python_dependencies.patch 2019-07-06 20:24:51 UTC (rev 487547)
@@ -21,9 +21,9 @@
  # (cf https://github.com/matrix-org/synapse/issues/4001)
 -"prometheus_client>=0.0.18,<0.4.0",
 +"prometheus_client>=0.0.18,<0.7.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",
 -- 
 2.21.0
 

Modified: PKGBUILD
===
--- PKGBUILD2019-07-06 20:05:17 UTC (rev 487546)
+++ PKGBUILD2019-07-06 20:24:51 UTC (rev 487547)
@@ -2,7 +2,7 @@
 # Contributor: Ivan Shapovalov 
 
 pkgname=matrix-synapse
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=1
 
 pkgdesc="Matrix reference homeserver"
@@ -20,14 +20,13 @@
  'python-service-identity' 'python-msgpack'
  'python-phonenumbers' 'python-prometheus_client'
  'python-attrs' 'python-netaddr' 'python-sortedcontainers'
- 'python-treq' 'python-psutil' 'python-idna'
- 'systemd')
-checkdepends=('python-lxml' 'python-jinja' 'python-bleach' 'python-mock' 
'python-parameterized')
+ 'python-treq' 'python-psutil' 'python-idna' 'python-jinja'
+ 'python-bleach' 'systemd')
+checkdepends=('python-lxml' 'python-mock' 'python-parameterized')
 optdepends=('python-psycopg2: PostgreSQL support'
 'python-lxml: URL previewing'
-'python-jinja: e-mail notifications'
-'python-bleach: e-mail notifications'
-'python-psutil: metrics')
+'python-psutil: metrics'
+'python-pyjwt: jwt')
 
 
source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz;
 'synapse.service'
@@ -34,10 +33,10 @@
 'sysusers-synapse.conf'
 '0001-Bump-python_dependencies.patch')
 
-md5sums=('cfb7afff9560ee30fb5d0ad68bf140e2'
+md5sums=('e5ad1e0be0173cde3b8fdbdf86584eb8'
  '276a99050f40601089255ea168bb7620'
  'ecd9f66fb57fe1a2e1e2df07a460a35b'
- 'ad2900abb04351778e577175cedf6edc')
+ '81df2055170953f1fcd7883621406484')
 
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install

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

2019-03-22 Thread Johannes Löthberg via arch-commits 
Date: Friday, March 22, 2019 @ 18:42:17
  Author: demize
Revision: 443187

upgpkg: matrix-synapse 0.99.2-2

Modified:
  matrix-synapse/trunk/0001-Bump-python_dependencies.patch
  matrix-synapse/trunk/PKGBUILD

-+
 0001-Bump-python_dependencies.patch |8 
 PKGBUILD|4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: 0001-Bump-python_dependencies.patch
===
--- 0001-Bump-python_dependencies.patch 2019-03-22 18:32:26 UTC (rev 443186)
+++ 0001-Bump-python_dependencies.patch 2019-03-22 18:42:17 UTC (rev 443187)
@@ -1,4 +1,4 @@
-From 0ffec97c70515e3ea3c2717a8eaa657fdd8fdf18 Mon Sep 17 00:00:00 2001
+From c1a7db468d4dbb3958f5b480fcde760566962ba4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= 
 Date: Tue, 8 Jan 2019 20:09:50 +0100
 Subject: [PATCH] Bump python_dependencies
@@ -12,7 +12,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index 756721e30..f8ee9e53f 100644
+index f71e21ff4..b49873781 100644
 --- a/synapse/python_dependencies.py
 +++ b/synapse/python_dependencies.py
 @@ -62,7 +62,7 @@ REQUIREMENTS = [
@@ -20,10 +20,10 @@
  # prometheus_client 0.4.0 changed the format of counter metrics
  # (cf https://github.com/matrix-org/synapse/issues/4001)
 -"prometheus_client>=0.0.18,<0.4.0",
-+"prometheus_client>=0.0.18,<0.6.0",
++"prometheus_client>=0.0.18,<0.7.0",
  
  # we use attr.s(slots), which arrived in 16.0.0
  # Twisted 18.7.0 requires attrs>=17.4.0
 -- 
-2.20.1
+2.21.0
 

Modified: PKGBUILD
===
--- PKGBUILD2019-03-22 18:32:26 UTC (rev 443186)
+++ PKGBUILD2019-03-22 18:42:17 UTC (rev 443187)
@@ -3,7 +3,7 @@
 
 pkgname=matrix-synapse
 pkgver=0.99.2
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Matrix reference homeserver"
 url="https://github.com/matrix-org/synapse;
@@ -37,7 +37,7 @@
 md5sums=('920a2773497b1487b29d20558a651ed2'
  '276a99050f40601089255ea168bb7620'
  'ecd9f66fb57fe1a2e1e2df07a460a35b'
- '62b94bdcd227ec2d097ba2eb28fe36df')
+ 'ad2900abb04351778e577175cedf6edc')
 
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install

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

2019-02-05 Thread Johannes Löthberg via arch-commits 
Date: Tuesday, February 5, 2019 @ 19:33:03
  Author: demize
Revision: 429665

upgpkg: matrix-synapse 0.99.0-1

Modified:
  matrix-synapse/trunk/0001-Bump-python_dependencies.patch
  matrix-synapse/trunk/PKGBUILD

-+
 0001-Bump-python_dependencies.patch |   20 +++-
 PKGBUILD|8 
 2 files changed, 11 insertions(+), 17 deletions(-)

Modified: 0001-Bump-python_dependencies.patch
===
--- 0001-Bump-python_dependencies.patch 2019-02-05 19:11:21 UTC (rev 429664)
+++ 0001-Bump-python_dependencies.patch 2019-02-05 19:33:03 UTC (rev 429665)
@@ -1,4 +1,4 @@
-From 3afc953a1b7447ae19a563269b316a86afa38215 Mon Sep 17 00:00:00 2001
+From 0ffec97c70515e3ea3c2717a8eaa657fdd8fdf18 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= 
 Date: Tue, 8 Jan 2019 20:09:50 +0100
 Subject: [PATCH] Bump python_dependencies
@@ -8,28 +8,22 @@
 
 Signed-off-by: Johannes Löthberg 
 ---
- synapse/python_dependencies.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ synapse/python_dependencies.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index 69c5f9fe2..68bae2398 100644
+index 756721e30..f8ee9e53f 100644
 --- a/synapse/python_dependencies.py
 +++ b/synapse/python_dependencies.py
-@@ -53,12 +53,12 @@ REQUIREMENTS = [
- "sortedcontainers>=1.4.4",
- "psutil>=2.0.0",
- "pymacaroons-pynacl>=0.9.3",
--"msgpack-python>=0.4.2",
-+"msgpack>=0.4.2",
- "phonenumbers>=8.2.0",
+@@ -62,7 +62,7 @@ REQUIREMENTS = [
  "six>=1.10",
  # prometheus_client 0.4.0 changed the format of counter metrics
  # (cf https://github.com/matrix-org/synapse/issues/4001)
 -"prometheus_client>=0.0.18,<0.4.0",
 +"prometheus_client>=0.0.18,<0.6.0",
+ 
  # we use attr.s(slots), which arrived in 16.0.0
- "attrs>=16.0.0",
- "netaddr>=0.7.18",
+ # Twisted 18.7.0 requires attrs>=17.4.0
 -- 
 2.20.1
 

Modified: PKGBUILD
===
--- PKGBUILD2019-02-05 19:11:21 UTC (rev 429664)
+++ PKGBUILD2019-02-05 19:33:03 UTC (rev 429665)
@@ -2,7 +2,7 @@
 # Contributor: Ivan Shapovalov 
 
 pkgname=matrix-synapse
-pkgver=0.34.1.1
+pkgver=0.99.0
 pkgrel=1
 
 pkgdesc="Matrix reference homeserver"
@@ -16,7 +16,7 @@
  'python-pillow' 'python-ujson'
  'python-pysaml2' 'python-setuptools'
  'python-systemd' 'python-unpaddedbase64' 'python-canonicaljson'
- 'python-signedjson' 'python-pymacaroons-pynacl'
+ 'python-signedjson' 'python-pymacaroons'
  'python-service-identity' 'python-msgpack'
  'python-phonenumbers' 'python-prometheus_client'
  'python-attrs' 'python-netaddr' 'python-sortedcontainers'
@@ -35,10 +35,10 @@
 'sysusers-synapse.conf'
 '0001-Bump-python_dependencies.patch')
 
-md5sums=('629ce375abd1fd20d45039a0debe3e92'
+md5sums=('038d087aa4b813b61ae7a0c0ea27abde'
  '276a99050f40601089255ea168bb7620'
  'ecd9f66fb57fe1a2e1e2df07a460a35b'
- '6a7ed53d1891acd37b13422b78f1cfbb')
+ '62b94bdcd227ec2d097ba2eb28fe36df')
 
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install