Skip to content

Commit 36ca865

Browse files
committed
Final set of cleanups
1 parent 408ddde commit 36ca865

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

newsfragments/121.misc.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
``trio-asyncio`` now requires Trio 0.22 and does not produce deprecation warnings.
2-
Support for Python < 3.7 has been removed. The test suite now passes on CPythons
3-
through 3.12.
2+
Python 3.12 is now supported. Python 3.6 is no longer supported.

tests/python/conftest.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,14 @@ def skip(rel_id):
145145
"test_start_tls_client_reg_proto_1",
146146
):
147147
xfail("test_sslproto.py::SelectorStartTLSTests::{}".format(test))
148-
if sys.version_info < (3, 8) or sys.version_info >= (3, 9):
149-
# This fails due to a trivial difference in how pypy handles IPv6
150-
# addresses (fails in a different way on each of 3.7 and 3.9)
151-
xfail(
152-
"test_base_events.py::BaseEventLoopWithSelectorTests::"
153-
"test_create_connection_ipv6_scope"
154-
)
148+
149+
# This test depends on the name of the loopback interface. On Github Actions
150+
# it fails on macOS always, and on Linux/Windows except on 3.8.
151+
skip(
152+
"test_base_events.py::BaseEventLoopWithSelectorTests::"
153+
"test_create_connection_ipv6_scope"
154+
)
155+
155156
if sys.platform == "darwin":
156157
# https://foss.heptapod.net/pypy/pypy/-/issues/3964 causes infinite loops
157158
for nodeid, item in by_id.items():

trio_asyncio/_sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def stop(self):
4949

5050
def do_stop():
5151
self._stop_pending = False
52-
raise TrioAsyncioExit
52+
raise TrioAsyncioExit("stopping trio-asyncio loop")
5353

5454

5555
# async def stop_me():

0 commit comments

Comments
 (0)