Upgrade architecture + 5.0 Bot API (#469)

Upgrade architecture + 5.0 Bot API (#469) * Moved `methods`, `types` and `client` to root package * Removed update handler from routers to dispatcher * Reworked events propagation mechanism to handlers * Reworked inner middlewares logic (very small change) * Updated to Bot API 5.0 * Initial migration from MkDocs to Sphinx + config for readthedocs
aiogram · Jan 26, 2021 · 4008a31 · 4008a31
1 parent 566b7ff
commit 4008a31
Show file tree

Hide file tree

Showing 608 changed files with 12,527 additions and 6,417 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip poetry==1.0
+          python -m pip install --upgrade pip poetry==1.1.4
           poetry install
           mkdir -p reports
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,6 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 6
+      fail-fast: false
       matrix:
         os:
           - ubuntu-latest
@@ -21,6 +22,7 @@ jobs:
         python-version:
           - 3.7
           - 3.8
+          - 3.9
 
     steps:
       - uses: actions/checkout@master
@@ -32,7 +34,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip poetry==1.0
+          python -m pip install --upgrade pip poetry==1.1.4
           poetry install
 
       - name: Lint code

diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,12 @@
 .idea/
+.vscode/
 
 __pycache__/
 *.py[cod]
 
 env/
 build/
+_build/
 dist/
 site/
 *.egg-info/

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,14 @@
+version: 2
+
+sphinx:
+  configuration: docs2/conf.py
+
+formats: all
+
+python:
+  version: 3.8
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
diff --git a/Makefile b/Makefile
@@ -70,7 +70,7 @@ clean:
 
 .PHONY: isort
 isort:
-	$(py) isort -rc aiogram tests
+	$(py) isort aiogram tests
 
 .PHONY: black
 black:

diff --git a/aiogram/__init__.py b/aiogram/__init__.py
@@ -1,6 +1,5 @@
-from .api import methods, types
-from .api.client import session
-from .api.client.bot import Bot
+from .client import session
+from .client.bot import Bot
 from .dispatcher import filters, handler
 from .dispatcher.dispatcher import Dispatcher
 from .dispatcher.middlewares.base import BaseMiddleware
@@ -28,5 +27,5 @@
     "handler",
 )
 
-__version__ = "3.0.0a5"
-__api_version__ = "4.9"
+__version__ = "3.0.0a6"
+__api_version__ = "5.0"
diff --git a/aiogram/api/client/session/__init__.py b/aiogram/api/client/session/__init__.py
diff --git a/aiogram/api/client/telegram.py b/aiogram/api/client/telegram.py
diff --git a/aiogram/api/methods/answer_callback_query.py b/aiogram/api/methods/answer_callback_query.py
diff --git a/aiogram/api/methods/answer_pre_checkout_query.py b/aiogram/api/methods/answer_pre_checkout_query.py
diff --git a/aiogram/api/methods/edit_message_caption.py b/aiogram/api/methods/edit_message_caption.py
diff --git a/aiogram/api/methods/edit_message_live_location.py b/aiogram/api/methods/edit_message_live_location.py
diff --git a/aiogram/api/methods/edit_message_text.py b/aiogram/api/methods/edit_message_text.py
diff --git a/aiogram/api/methods/export_chat_invite_link.py b/aiogram/api/methods/export_chat_invite_link.py