From c83fdab502fe597e577c70f371556872c56aa1e3 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 22 Mar 2020 00:51:10 +0200 Subject: [PATCH] Update to mautrix-python 0.5.0 --- mautrix_telegram/__main__.py | 1 + example-config.yaml => mautrix_telegram/example-config.yaml | 0 requirements.txt | 2 +- setup.py | 3 ++- 4 files changed, 4 insertions(+), 2 deletions(-) rename example-config.yaml => mautrix_telegram/example-config.yaml (100%) diff --git a/mautrix_telegram/__main__.py b/mautrix_telegram/__main__.py index 2880dcea..3d69241d 100644 --- a/mautrix_telegram/__main__.py +++ b/mautrix_telegram/__main__.py @@ -44,6 +44,7 @@ except ImportError: class TelegramBridge(Bridge): + module = "mautrix_telegram" name = "mautrix-telegram" command = "python -m mautrix-telegram" description = "A Matrix-Telegram puppeting bridge." diff --git a/example-config.yaml b/mautrix_telegram/example-config.yaml similarity index 100% rename from example-config.yaml rename to mautrix_telegram/example-config.yaml diff --git a/requirements.txt b/requirements.txt index 80692a8d..4941f95a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ ruamel.yaml>=0.15.35,<0.17 python-magic>=0.4,<0.5 commonmark>=0.8,<0.10 aiohttp>=3,<4 -mautrix>=0.4.1,<0.5 +mautrix==0.5.0.beta4 telethon>=1.10,<1.12 telethon-session-sqlalchemy>=0.2.14,<0.3 diff --git a/setup.py b/setup.py index a484cbc0..ae8b0708 100644 --- a/setup.py +++ b/setup.py @@ -71,9 +71,10 @@ setuptools.setup( """, package_data={"mautrix_telegram": [ "web/public/*.mako", "web/public/*.png", "web/public/*.css", + "example-config.yaml", ]}, data_files=[ - (".", ["example-config.yaml", "alembic.ini"]), + (".", ["alembic.ini"]), ("alembic", ["alembic/env.py"]), ("alembic/versions", glob.glob("alembic/versions/*.py")) ],