version bump

since telethon api has been stable in the past months, experimentally remove version restriction
removed obsolete deps of sqlalchemy and alembic
movded asyncpg to required deps
added optional deps of aiosqlite and phonenumbers
removed editing of now-gone alembic files
removed pre-execution of alembic db update from the service

3 files changed, 19 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84f997f74ed0..842d55a5f37e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mautrix-telegram
 	pkgdesc = A Matrix-Telegram hybrid puppeting/relaybot bridge.
-	pkgver = 0.10.2
+	pkgver = 0.11.0
 	pkgrel = 1
 	url = https://github.com/tulir/mautrix-telegram
 	install = mautrix-telegram.install
@@ -9,17 +9,15 @@ pkgbase = mautrix-telegram
 	makedepends = python-setuptools
 	makedepends = python-pytest-runner
 	depends = python
-	depends = python-sqlalchemy
-	depends = python-alembic
+	depends = python-asyncpg
 	depends = python-ruamel-yaml
 	depends = python-magic-ahupp
 	depends = python-commonmark
 	depends = python-aiohttp
 	depends = python-yarl
-	depends = python-mautrix>=0.10.4
-	depends = python-mautrix<0.13
-	depends = python-telethon>=1.24
-	depends = python-telethon<1.25
+	depends = python-mautrix>=0.14.0
+	depends = python-mautrix<0.15
+	depends = python-telethon
 	depends = python-telethon-session-sqlalchemy
 	optdepends = python-cryptg: faster encryption
 	optdepends = python-cchardet: faster encoding detection
@@ -28,20 +26,20 @@ pkgbase = mautrix-telegram
 	optdepends = python-pillow: webp conversion and qr code login
 	optdepends = python-qrcode: qr code login
 	optdepends = python-moviepy: high quality thumbnails
+	optdepends = python-phonenumbers: formatted numbers
 	optdepends = python-prometheus_client: metrics upload
-	optdepends = python-psycopg2: postgresql database support
-	optdepends = python-asyncpg: end-to-bridge encryption support
 	optdepends = python-olm: end-to-bridge encryption support
 	optdepends = python-pycryptodome: end-to-bridge encryption support
 	optdepends = python-unpaddedbase64: end-to-bridge encryption support
+	optdepends = python-aiosqlite: sqlite database support
 	backup = etc/mautrix-telegram/config.yaml
 	backup = etc/mautrix-telegram/registration.yaml
-	source = mautrix-telegram-0.10.2::https://github.com/tulir/mautrix-telegram/archive/v0.10.2.tar.gz
+	source = mautrix-telegram-0.11.0::https://github.com/tulir/mautrix-telegram/archive/v0.11.0.tar.gz
 	source = mautrix-telegram.service
 	source = mautrix-telegram.sysusers
 	source = mautrix-telegram.tmpfiles
-	sha256sums = 6c55dd22d71dc8c78a3069acabcd66d8c181c795688f37bfc88fc461e99f5e25
-	sha256sums = a419168bff80e469f2f4e26279afae77d92e6ae86c2457696e1ca9fc6ba1cb12
+	sha256sums = ad3e3a83e0eec0acb2a4f7af54fa7ba2ff0b89a9112fd34d7a40e02def43caad
+	sha256sums = 278ebd5fc931bbf87e442c774cb8e5f4d17ef8b553066531a3d66810d76a471e
 	sha256sums = 83dc721df0451c199d23ea74b60a065d92f98e9026dd779aca30d25195b88cf9
 	sha256sums = 2f5c45f6b0a9d1ae5237a91bdcb527609d262bc27cb7fa1dc736b4103ee230e5
 
diff --git a/PKGBUILD b/PKGBUILD
index 861c7d052819..1cc1a24589fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,13 @@
 # Maintainer: BrainDamage
 pkgname=mautrix-telegram
-pkgver=0.10.2
+pkgver=0.11.0
 pkgrel=1
 pkgdesc="A Matrix-Telegram hybrid puppeting/relaybot bridge."
 url="https://github.com/tulir/mautrix-telegram"
-depends=('python' 'python-sqlalchemy' 'python-alembic' 'python-ruamel-yaml'
+depends=('python' 'python-asyncpg' 'python-ruamel-yaml'
 	'python-magic-ahupp' 'python-commonmark' 'python-aiohttp' 'python-yarl'
-	'python-mautrix>=0.10.4' 'python-mautrix<0.13'
-	'python-telethon>=1.24' 'python-telethon<1.25'
-	'python-telethon-session-sqlalchemy')
+	'python-mautrix>=0.14.0' 'python-mautrix<0.15'
+	'python-telethon' 'python-telethon-session-sqlalchemy')
 makedepends=('python-setuptools' 'python-pytest-runner')
 optdepends=('python-cryptg: faster encryption'
 	'python-cchardet: faster encoding detection'
@@ -17,17 +16,17 @@ optdepends=('python-cryptg: faster encryption'
 	'python-pillow: webp conversion and qr code login'
 	'python-qrcode: qr code login'
 	'python-moviepy: high quality thumbnails'
+	'python-phonenumbers: formatted numbers'
 	'python-prometheus_client: metrics upload'
-	'python-psycopg2: postgresql database support'
-	'python-asyncpg: end-to-bridge encryption support'
 	'python-olm: end-to-bridge encryption support'
 	'python-pycryptodome: end-to-bridge encryption support'
-	'python-unpaddedbase64: end-to-bridge encryption support')
+	'python-unpaddedbase64: end-to-bridge encryption support'
+	'python-aiosqlite: sqlite database support')
 license=('AGPLv3')
 arch=('any')
 source=("${pkgname}-${pkgver}::${url}/archive/v${pkgver}.tar.gz" "${pkgname}.service" "${pkgname}.sysusers" "${pkgname}.tmpfiles")
-sha256sums=('6c55dd22d71dc8c78a3069acabcd66d8c181c795688f37bfc88fc461e99f5e25'
-            'a419168bff80e469f2f4e26279afae77d92e6ae86c2457696e1ca9fc6ba1cb12'
+sha256sums=('ad3e3a83e0eec0acb2a4f7af54fa7ba2ff0b89a9112fd34d7a40e02def43caad'
+            '278ebd5fc931bbf87e442c774cb8e5f4d17ef8b553066531a3d66810d76a471e'
             '83dc721df0451c199d23ea74b60a065d92f98e9026dd779aca30d25195b88cf9'
             '2f5c45f6b0a9d1ae5237a91bdcb527609d262bc27cb7fa1dc736b4103ee230e5')
 backup=("etc/${pkgname}/config.yaml" "etc/${pkgname}/registration.yaml")
@@ -69,9 +68,6 @@ package() {
 	install -Dvm 644 "${srcdir}/requirements.txt.orig" "$(find ${pkgdir} -name 'requires.txt' -printf '%h')"
 	install -Dvm 644 "${srcdir}/optional-requirements.txt.orig" "$(find ${pkgdir} -name 'requires.txt' -printf '%h')"
 
-	# adjust alembic script dir location so that by using an abs path it can be used in CWD
-	sed -i -e "s|script_location = alembic|script_location = ${_shared_dir}/alembic/|" "${pkgdir}${_shared_dir}/alembic.ini"
-
 	install -Dvm 644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 	install -Dvm 644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 	install -Dvm 644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
diff --git a/mautrix-telegram.service b/mautrix-telegram.service
index d0241b46f08f..08e1eee11064 100644
--- a/mautrix-telegram.service
+++ b/mautrix-telegram.service
@@ -2,7 +2,6 @@
 Description=Matrix-Telegram hybrid puppeting/relaybot bridge
 
 [Service]
-ExecStartPre=alembic -c /usr/share/mautrix-telegram/alembic.ini -x config=/etc/mautrix-telegram/config.yaml upgrade head
 ExecStart=python -m mautrix_telegram -b /usr/share/mautrix-telegram/example-config.yaml -c /etc/mautrix-telegram/config.yaml -r /etc/mautrix-telegram/registration.yaml
 Restart=on-failure
 User=mautrix-telegram