From 44bad0bf2be689ac3682dd58cf3485497ee68b50 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Feb 2018 23:47:36 +0200 Subject: [PATCH] Make Python 3.5 support mergeable to master --- requirements/3.5.txt | 2 ++ requirements.txt => requirements/base.txt | 1 - requirements/default.txt | 2 ++ setup.py | 6 +++++- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 requirements/3.5.txt rename requirements.txt => requirements/base.txt (56%) create mode 100644 requirements/default.txt 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 56% rename from requirements.txt rename to requirements/base.txt index d40b82f5..bfa7bdde 100644 --- a/requirements.txt +++ b/requirements/base.txt @@ -3,7 +3,6 @@ ruamel.yaml python-magic SQLAlchemy alembic --e git+https://github.com/tulir/Telethon@asyncio-3.5#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 b007c318..c43e5c3a 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ import setuptools +import sys import mautrix_telegram setuptools.setup( @@ -25,7 +26,10 @@ setuptools.setup( "python-magic>=0.4.15,<0.5", ], dependency_links=[ - "https://github.com/tulir/Telethon/tarball/ac46abc9680c5a74897fe6dbe9e585ad2577b1fa#egg=Telethon" + ( + "https://github.com/LonamiWebs/Telethon/tarball/7da092894b306d720cc60c04daa2bfba58f81946#egg=Telethon" + if sys.version_info.major > 3 or sys.version_info.minor > 6 + else "https://github.com/tulir/Telethon/tarball/ac46abc9680c5a74897fe6dbe9e585ad2577b1fa#egg=Telethon") ], classifiers=[