From fd763b953d220540dd188c7248ccf7bd80acc951 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 13 May 2018 10:52:44 +0300
Subject: [PATCH] Update dependencies and remove python 3.5 special casing

---
 ...ee02_update_telethon_update_state_table.py | 43 +++++++++++++++++++
 .../optional.txt => optional-requirements.txt |  0
 requirements/base.txt => requirements.txt     |  1 +
 requirements/3.5.txt                          |  2 -
 requirements/default.txt                      |  2 -
 setup.py                                      |  5 +--
 6 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 alembic/versions/bdadd173ee02_update_telethon_update_state_table.py
 rename requirements/optional.txt => optional-requirements.txt (100%)
 rename requirements/base.txt => requirements.txt (90%)
 delete mode 100644 requirements/3.5.txt
 delete mode 100644 requirements/default.txt

diff --git a/alembic/versions/bdadd173ee02_update_telethon_update_state_table.py b/alembic/versions/bdadd173ee02_update_telethon_update_state_table.py
new file mode 100644
index 00000000..0e1c0018
--- /dev/null
+++ b/alembic/versions/bdadd173ee02_update_telethon_update_state_table.py
@@ -0,0 +1,43 @@
+"""Update telethon update state table
+
+Revision ID: bdadd173ee02
+Revises: eeaf0dae87ce
+Create Date: 2018-05-13 10:42:59.395597
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = 'bdadd173ee02'
+down_revision = 'eeaf0dae87ce'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table("telethon_entities") as batch_op:
+        batch_op.alter_column("id", existing_type=sa.Integer, type_=sa.BigInteger)
+        batch_op.alter_column("hash", existing_type=sa.Integer, type_=sa.BigInteger)
+
+    with op.batch_alter_table("telethon_update_state") as batch_op:
+        batch_op.alter_column("entity_id", existing_type=sa.Integer, type_=sa.BigInteger)
+        batch_op.alter_column("pts", existing_type=sa.Integer, type_=sa.BigInteger)
+        batch_op.alter_column("qts", existing_type=sa.Integer, type_=sa.BigInteger)
+        batch_op.alter_column("date", existing_type=sa.Integer, type_=sa.BigInteger)
+        batch_op.alter_column("seq", existing_type=sa.Integer, type_=sa.BigInteger)
+        batch_op.add_column(sa.Column("unread_count", sa.Integer))
+
+
+def downgrade():
+    with op.batch_alter_table("telethon_entities") as batch_op:
+        batch_op.alter_column("id", existing_type=sa.BigInteger, type_=sa.Integer)
+        batch_op.alter_column("hash", existing_type=sa.BigInteger, type_=sa.Integer)
+
+    with op.batch_alter_table("telethon_update_state") as batch_op:
+        batch_op.alter_column("entity_id", existing_type=sa.BigInteger, type_=sa.Integer)
+        batch_op.alter_column("pts", existing_type=sa.BigInteger, type_=sa.Integer)
+        batch_op.alter_column("qts", existing_type=sa.BigInteger, type_=sa.Integer)
+        batch_op.alter_column("date", existing_type=sa.BigInteger, type_=sa.Integer)
+        batch_op.alter_column("seq", existing_type=sa.BigInteger, type_=sa.Integer)
+        batch_op.drop_column("unread_count")
diff --git a/requirements/optional.txt b/optional-requirements.txt
similarity index 100%
rename from requirements/optional.txt
rename to optional-requirements.txt
diff --git a/requirements/base.txt b/requirements.txt
similarity index 90%
rename from requirements/base.txt
rename to requirements.txt
index 7633fb52..d1c67148 100644
--- a/requirements/base.txt
+++ b/requirements.txt
@@ -6,4 +6,5 @@ SQLAlchemy
 alembic
 Markdown
 future-fstrings
+telethon-aio
 telethon-session-sqlalchemy
diff --git a/requirements/3.5.txt b/requirements/3.5.txt
deleted file mode 100644
index c8848418..00000000
--- a/requirements/3.5.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r base.txt
-git+https://github.com/tulir/telethon-asyncio@asyncio-3.5#egg=telethon
diff --git a/requirements/default.txt b/requirements/default.txt
deleted file mode 100644
index 7eb92737..00000000
--- a/requirements/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r base.txt
-telethon-aio
diff --git a/setup.py b/setup.py
index 914fc7fe..32450688 100644
--- a/setup.py
+++ b/setup.py
@@ -33,12 +33,9 @@ setuptools.setup(
         "ruamel.yaml>=0.15.35,<0.16",
         "future-fstrings>=0.4.2",
         "python-magic>=0.4.15,<0.5",
-        "telethon-aio==0.18.3" if sys.version_info >= (3, 6) else "telethon-aio-git",
+        "telethon-aio>=0.19.0,<0.19.1",
         "telethon-session-sqlalchemy>=0.1.2,<0.3",
     ],
-    dependency_links=[
-        "https://github.com/tulir/telethon-asyncio/tarball/bcdc4d77ea6edd6049497bac9074d0ad4277d1cc#egg=telethon-aio-git-0.18.3+1"
-    ],
     extras_require=extras,
 
     classifiers=[