diff --git a/mautrix_appservice/appservice.py b/mautrix_appservice/appservice.py index 7d25c4d7..1d26fbb2 100644 --- a/mautrix_appservice/appservice.py +++ b/mautrix_appservice/appservice.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # matrix-appservice-python - A Matrix Application Service framework written in Python. # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_appservice/errors.py b/mautrix_appservice/errors.py index b0834283..8c09936f 100644 --- a/mautrix_appservice/errors.py +++ b/mautrix_appservice/errors.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_appservice/intent_api.py b/mautrix_appservice/intent_api.py index 94591002..06f16494 100644 --- a/mautrix_appservice/intent_api.py +++ b/mautrix_appservice/intent_api.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_appservice/state_store.py b/mautrix_appservice/state_store.py index 5ce32aa1..1174dcde 100644 --- a/mautrix_appservice/state_store.py +++ b/mautrix_appservice/state_store.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # matrix-appservice-python - A Matrix Application Service framework written in Python. # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/__main__.py b/mautrix_telegram/__main__.py index 8439dfb0..a5415f5d 100644 --- a/mautrix_telegram/__main__.py +++ b/mautrix_telegram/__main__.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/commands/auth.py b/mautrix_telegram/commands/auth.py index ceaeeca5..6c114785 100644 --- a/mautrix_telegram/commands/auth.py +++ b/mautrix_telegram/commands/auth.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/commands/clean_rooms.py b/mautrix_telegram/commands/clean_rooms.py index 23ee4bf9..96a2154c 100644 --- a/mautrix_telegram/commands/clean_rooms.py +++ b/mautrix_telegram/commands/clean_rooms.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/commands/handler.py b/mautrix_telegram/commands/handler.py index 030298d4..0e06e3a4 100644 --- a/mautrix_telegram/commands/handler.py +++ b/mautrix_telegram/commands/handler.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/commands/meta.py b/mautrix_telegram/commands/meta.py index 2fb310f7..6ffff94f 100644 --- a/mautrix_telegram/commands/meta.py +++ b/mautrix_telegram/commands/meta.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/commands/telegram.py b/mautrix_telegram/commands/telegram.py index ea5d6950..f77c2110 100644 --- a/mautrix_telegram/commands/telegram.py +++ b/mautrix_telegram/commands/telegram.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/config.py b/mautrix_telegram/config.py index 82817f73..f2f81426 100644 --- a/mautrix_telegram/config.py +++ b/mautrix_telegram/config.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/db.py b/mautrix_telegram/db.py index 0b6341d8..b8a4b372 100644 --- a/mautrix_telegram/db.py +++ b/mautrix_telegram/db.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/formatter.py b/mautrix_telegram/formatter.py index 741a8018..2faa1146 100644 --- a/mautrix_telegram/formatter.py +++ b/mautrix_telegram/formatter.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index cbca6d09..f5f36adf 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index 928455cc..68b3ad84 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/puppet.py b/mautrix_telegram/puppet.py index 8df387b6..c3736994 100644 --- a/mautrix_telegram/puppet.py +++ b/mautrix_telegram/puppet.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/tgclient.py b/mautrix_telegram/tgclient.py index 84b6728e..335d8adf 100644 --- a/mautrix_telegram/tgclient.py +++ b/mautrix_telegram/tgclient.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py index 7ff16cb0..98969a32 100644 --- a/mautrix_telegram/user.py +++ b/mautrix_telegram/user.py @@ -1,3 +1,4 @@ +# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/requirements/3.5.txt b/requirements/3.5.txt new file mode 100644 index 00000000..c9b2ce0c --- /dev/null +++ b/requirements/3.5.txt @@ -0,0 +1,2 @@ +-r base.txt +-e git+https://github.com/tulir/Telethon@asyncio-3.5#egg=Telethon diff --git a/requirements.txt b/requirements/base.txt similarity index 50% rename from requirements.txt rename to requirements/base.txt index c7ee0ddf..bfa7bdde 100644 --- a/requirements.txt +++ b/requirements/base.txt @@ -3,6 +3,6 @@ ruamel.yaml python-magic SQLAlchemy alembic --e git+https://github.com/LonamiWebs/Telethon@asyncio#egg=Telethon Markdown Pillow +future-fstrings diff --git a/requirements/default.txt b/requirements/default.txt new file mode 100644 index 00000000..1158be21 --- /dev/null +++ b/requirements/default.txt @@ -0,0 +1,2 @@ +-r base.txt +-e git+https://github.com/LonamiWebs/Telethon@asyncio#egg=Telethon diff --git a/setup.py b/setup.py index d9df9d6d..b219a252 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ import setuptools +import sys import mautrix_telegram setuptools.setup( @@ -21,10 +22,14 @@ setuptools.setup( "Markdown>=2.6.11,<3", "ruamel.yaml>=0.15.35,<0.16", "Pillow>=5.0.0,<6", + "future-fstrings>=0.4.1", "python-magic>=0.4.15,<0.5", ], dependency_links=[ - "https://github.com/LonamiWebs/Telethon/tarball/7da092894b306d720cc60c04daa2bfba58f81946#egg=Telethon" + ( + "https://github.com/LonamiWebs/Telethon/tarball/7da092894b306d720cc60c04daa2bfba58f81946#egg=Telethon" + if sys.version_info.major > 3 or sys.version_info.minor > 5 + else "https://github.com/tulir/Telethon/tarball/ac46abc9680c5a74897fe6dbe9e585ad2577b1fa#egg=Telethon") ], classifiers=[