Skip to content

Commit

Permalink
Upgrade to py12 (#1354)
Browse files Browse the repository at this point in the history
* Upgrade to py12 compatible aiohttp beta version

* Fix uvloop deprecation warning causing pytest not to run

* Fix test due to asyncio task scheduling race condition

* Fix test_state_in_unknown_class for Python 3.12+ due to PEP 678 changes

* Add Python 3.12 support in GitHub Actions and project configurations

* Add changelog entry

---------

Co-authored-by: Alex Root Junior <jroot.junior@gmail.com>
  • Loading branch information
Nachtalb and JrooTJunior committed Nov 18, 2023
1 parent c208bcf commit c1bafea
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
- '3.9'
- '3.10'
- '3.11'
- '3.12'
- 'pypy3.8'
- 'pypy3.9'

Expand Down
1 change: 1 addition & 0 deletions CHANGES/1354.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Introduce Python 3.12 support
4 changes: 3 additions & 1 deletion aiogram/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@

with suppress(ImportError):
import uvloop as _uvloop
import asyncio

asyncio.set_event_loop_policy(_uvloop.EventLoopPolicy())

_uvloop.install() # type: ignore[attr-defined,unused-ignore]

F = MagicFilter()
flags = FlagGenerator()
Expand Down
7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Software Development :: Libraries :: Application Frameworks",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Communications :: Chat",
]
dependencies = [
"magic-filter>=1.0.12,<1.1",
"aiohttp~=3.8.5",
"aiohttp~=3.9.0",
"pydantic>=2.4.1,<2.6",
"aiofiles~=23.2.1",
"certifi>=2023.7.22",
Expand Down Expand Up @@ -144,7 +145,7 @@ features = [
serve = "sphinx-autobuild --watch aiogram/ --watch CHANGELOG.rst --watch README.rst docs/ docs/_build/ {args}"

[tool.hatch.envs.dev]
python = "3.11"
python = "3.12"
features = [
"dev",
"fast",
Expand Down Expand Up @@ -185,7 +186,7 @@ view-cov = "google-chrome-stable reports/py{matrix:python}/coverage/index.html"


[[tool.hatch.envs.test.matrix]]
python = ["38", "39", "310", "311"]
python = ["38", "39", "310", "311", "312"]

[tool.ruff]
line-length = 99
Expand Down
19 changes: 16 additions & 3 deletions tests/test_fsm/test_state.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import pytest
import sys

from aiogram.fsm.state import State, StatesGroup, any_state

PY312_OR_GREATER = sys.version_info >= (3, 12)


class TestState:
def test_empty(self):
Expand Down Expand Up @@ -72,10 +75,20 @@ def test_filter(self, state, check, result):
assert state(None, check) is result

def test_state_in_unknown_class(self):
with pytest.raises(RuntimeError):
if PY312_OR_GREATER:
# Python 3.12+ does not wrap __set_name__ exceptions with RuntimeError anymore as part
# of PEP 678. See "Other Language Changes" in the changelogs:
# https://docs.python.org/3/whatsnew/3.12.html
with pytest.raises(ValueError):

class MyClass:
state1 = State()
class MyClass:
state1 = State()

else:
with pytest.raises(RuntimeError):

class MyClass:
state1 = State()


class TestStatesGroup:
Expand Down
10 changes: 10 additions & 0 deletions tests/test_webhook/test_aiohtt_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,20 @@ def handle_message(msg: Message):
"aiogram.dispatcher.dispatcher.Dispatcher.silent_call_request",
new_callable=AsyncMock,
) as mocked_silent_call_request:
method_called_event = asyncio.Event()
mocked_silent_call_request.side_effect = (
lambda *args, **kwargs: method_called_event.set()
)

handler_event.clear()
resp = await self.make_reqest(client=client)
assert resp.status == 200
await asyncio.wait_for(handler_event.wait(), timeout=1)
await asyncio.wait_for(method_called_event.wait(), timeout=1)
# Python 3.12 had some changes to asyncio which make it quite a bit faster. But
# probably because of that the assert_awaited call is consistently scheduled before the
# silent_call_request call - failing the test. So we wait for the method to be called
# before asserting if it has been awaited.
mocked_silent_call_request.assert_awaited()
result = await resp.json()
assert not result
Expand Down

0 comments on commit c1bafea

Please sign in to comment.