From 0e5659296646cdfe75369c2abb43c5b1cd5468c5 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 11 Feb 2018 22:39:02 +0200 Subject: [PATCH] Remove Python 3.5 compatibility on master branch --- mautrix_appservice/appservice.py | 1 - mautrix_appservice/errors.py | 1 - mautrix_appservice/intent_api.py | 1 - mautrix_appservice/state_store.py | 1 - mautrix_telegram/__main__.py | 1 - mautrix_telegram/commands.py | 1 - mautrix_telegram/config.py | 1 - mautrix_telegram/db.py | 1 - mautrix_telegram/formatter.py | 1 - mautrix_telegram/matrix.py | 1 - mautrix_telegram/portal.py | 1 - mautrix_telegram/puppet.py | 1 - mautrix_telegram/tgclient.py | 1 - mautrix_telegram/user.py | 1 - requirements.txt | 1 - setup.py | 1 - 16 files changed, 16 deletions(-) diff --git a/mautrix_appservice/appservice.py b/mautrix_appservice/appservice.py index 1d26fbb2..7d25c4d7 100644 --- a/mautrix_appservice/appservice.py +++ b/mautrix_appservice/appservice.py @@ -1,4 +1,3 @@ -# -*- 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 8c09936f..b0834283 100644 --- a/mautrix_appservice/errors.py +++ b/mautrix_appservice/errors.py @@ -1,4 +1,3 @@ -# -*- 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 d7916cbe..395dfe32 100644 --- a/mautrix_appservice/intent_api.py +++ b/mautrix_appservice/intent_api.py @@ -1,4 +1,3 @@ -# -*- 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 1174dcde..5ce32aa1 100644 --- a/mautrix_appservice/state_store.py +++ b/mautrix_appservice/state_store.py @@ -1,4 +1,3 @@ -# -*- 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 a5415f5d..8439dfb0 100644 --- a/mautrix_telegram/__main__.py +++ b/mautrix_telegram/__main__.py @@ -1,4 +1,3 @@ -# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/mautrix_telegram/commands.py b/mautrix_telegram/commands.py index 2046f3e4..e9555b41 100644 --- a/mautrix_telegram/commands.py +++ b/mautrix_telegram/commands.py @@ -1,4 +1,3 @@ -# -*- 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 f2f81426..82817f73 100644 --- a/mautrix_telegram/config.py +++ b/mautrix_telegram/config.py @@ -1,4 +1,3 @@ -# -*- 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 ec6da354..d993b02c 100644 --- a/mautrix_telegram/db.py +++ b/mautrix_telegram/db.py @@ -1,4 +1,3 @@ -# -*- 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 cb920284..ce4a4c7b 100644 --- a/mautrix_telegram/formatter.py +++ b/mautrix_telegram/formatter.py @@ -1,4 +1,3 @@ -# -*- 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 6765a8b7..e631ff4f 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -1,4 +1,3 @@ -# -*- 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 6a4e6fd0..b15ebb6d 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -1,4 +1,3 @@ -# -*- 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 c3736994..8df387b6 100644 --- a/mautrix_telegram/puppet.py +++ b/mautrix_telegram/puppet.py @@ -1,4 +1,3 @@ -# -*- 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 335d8adf..84b6728e 100644 --- a/mautrix_telegram/tgclient.py +++ b/mautrix_telegram/tgclient.py @@ -1,4 +1,3 @@ -# -*- 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 ec0dd468..ba37e1ae 100644 --- a/mautrix_telegram/user.py +++ b/mautrix_telegram/user.py @@ -1,4 +1,3 @@ -# -*- coding: future_fstrings -*- # mautrix-telegram - A Matrix-Telegram puppeting bridge # Copyright (C) 2018 Tulir Asokan # diff --git a/requirements.txt b/requirements.txt index f8664242..c7ee0ddf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,3 @@ alembic -e git+https://github.com/LonamiWebs/Telethon@asyncio#egg=Telethon Markdown Pillow -future-fstrings diff --git a/setup.py b/setup.py index 8c09e023..d9df9d6d 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ 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=[