From 951fdc8bdd6c0f28444fc39a1c9178e993a1e1e7 Mon Sep 17 00:00:00 2001 From: Gilles Boccon-Gibod Date: Sun, 12 May 2024 12:07:05 -0700 Subject: [PATCH 1/2] add python 3.12 to GH actions --- .github/workflows/code-check.yml | 2 +- .github/workflows/python-build-test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml index fabdf88..37fb816 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] fail-fast: false steps: diff --git a/.github/workflows/python-build-test.yml b/.github/workflows/python-build-test.yml index f1a8105..230779f 100644 --- a/.github/workflows/python-build-test.yml +++ b/.github/workflows/python-build-test.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] fail-fast: false steps: @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.8", "3.9", "3.10", "3.11" ] + python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] rust-version: [ "1.76.0", "stable" ] fail-fast: false steps: From 2005b4a11b1084012a732db30158deb96f66ae28 Mon Sep 17 00:00:00 2001 From: Gilles Boccon-Gibod Date: Sun, 12 May 2024 12:54:52 -0700 Subject: [PATCH 2/2] python 3.12 compatibility --- setup.cfg | 6 +++--- tests/device_test.py | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 129ae51..6065cc6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -81,7 +81,7 @@ console_scripts = build = build >= 0.7 test = - pytest >= 8.0 + pytest >= 8.2 pytest-asyncio >= 0.23.5 pytest-html >= 3.2.0 coverage >= 6.4 @@ -89,9 +89,9 @@ development = black == 24.3 grpcio-tools >= 1.62.1 invoke >= 1.7.3 - mypy == 1.8.0 + mypy == 1.10.0 nox >= 2022 - pylint == 2.15.8 + pylint == 3.1.0 pyyaml >= 6.0 types-appdirs >= 1.4.3 types-invoke >= 1.7.3 diff --git a/tests/device_test.py b/tests/device_test.py index 5d87282..4fc6372 100644 --- a/tests/device_test.py +++ b/tests/device_test.py @@ -214,6 +214,12 @@ async def test_device_connect_parallel(): d1.host.set_packet_sink(Sink(d1_flow())) d2.host.set_packet_sink(Sink(d2_flow())) + d1_accept_task = asyncio.create_task(d1.accept(peer_address=d0.public_address)) + d2_accept_task = asyncio.create_task(d2.accept()) + + # Ensure that the accept tasks have started. + await async_barrier() + [c01, c02, a10, a20] = await asyncio.gather( *[ asyncio.create_task( @@ -222,8 +228,8 @@ async def test_device_connect_parallel(): asyncio.create_task( d0.connect(d2.public_address, transport=BT_BR_EDR_TRANSPORT) ), - asyncio.create_task(d1.accept(peer_address=d0.public_address)), - asyncio.create_task(d2.accept()), + d1_accept_task, + d2_accept_task, ] )