Merge remote-tracking branch 'origin/master' into cancel-aio-tasks

Author: oremanj

docs/source/history.rst

@@ -5,6 +5,56 @@ Release history
 
 .. towncrier release notes start
 
+trio-asyncio 0.12.0 (2021-01-07)
+--------------------------------
+
+Bugfixes
+~~~~~~~~
+
+- trio-asyncio now cancels any Trio tasks that were started inside a trio-asyncio
+  loop (using e.g. :func:`trio_as_aio`) before it allows the trio-asyncio loop
+  to close. This should resolve some cases of deadlocks and "RuntimeError: Event loop
+  is closed" when an ``async with open_loop():`` block is cancelled. (`#89 <https://github.com/python-trio/trio-asyncio/issues/89>`__)
+- :func:`asyncio.get_running_loop` will now return the trio-asyncio event loop
+  (if running), instead of failing with :exc:`RuntimeError`. (`#99 <https://github.com/python-trio/trio-asyncio/issues/99>`__)
+- On Python versions with native contextvars support (3.7+), a Trio task
+  started from asyncio context (using :func:`trio_as_aio`,
+  :meth:`~BaseTrioEventLoop.trio_as_future`, etc) will now properly
+  inherit the contextvars of its caller.  Also, if the entire
+  trio-asyncio loop is cancelled, such tasks will no longer let
+  `trio.Cancelled` exceptions leak into their asyncio caller. (`#76 <https://github.com/python-trio/trio-asyncio/issues/76>`__)
+- Previously, cancelling the context surrounding an :func:`open_loop`
+  block might cause a deadlock in some cases. The ordering of operations
+  during loop teardown has been improved, so this shouldn't happen
+  anymore. (`#81 <https://github.com/python-trio/trio-asyncio/issues/81>`__)
+
+Deprecations and Removals
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A number of functions deprecated since 0.10.0 are now removed:
+
+================================================= =============================================
+  Removed                                           Replacement
+================================================= =============================================
+``wrap_generator(proc, *args)``                   :func:`aio_as_trio(proc(*args))<aio_as_trio>`
+``run_iterator(aiter)``                           :func:`aio_as_trio(aiter)<aio_as_trio>`
+``trio2aio``                                      :func:`aio_as_trio`
+``aio2trio``                                      :func:`trio_as_aio`
+``run_future`` ``TrioEventLoop.run_future``       :func:`run_aio_future`
+``run_coroutine`` ``TrioEventLoop.run_coroutine`` :func:`run_aio_coroutine`
+``wrap_trio_context(ctx)``                        :func:`trio_as_aio(ctx)<trio_as_aio>`
+``TrioEventLoop.run_trio(proc, *args)``           :func:`trio_as_aio(proc)(*args)<trio_as_aio>`
+``run_asyncio(proc, *args)``                      :func:`aio_as_trio(proc)(*args)<aio_as_trio>`
+================================================= =============================================
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+- ``trio-asyncio`` now requires Trio 0.15. Support for Python < 3.6 has been removed. (`#82 <https://github.com/python-trio/trio-asyncio/issues/82>`__)
+
+- No more ``TrioDeprecationWarning`` about ``trio.hazmat``. (`#82 <https://github.com/python-trio/trio-asyncio/issues/82>`__)
+
+
 trio-asyncio 0.11.0 (2020-03-09)
 --------------------------------
 

newsfragments/76.bugfix.rst

@@ -1,6 +1,32 @@
 [tool.towncrier]
 package = "trio_asyncio"
+title_format = "trio-asyncio {version} ({project_date})"
 filename = "docs/source/history.rst"
 directory = "newsfragments"
 underlines = ["-", "~", "^"]
 issue_format = "`#{issue} <https://github.com/python-trio/trio-asyncio/issues/{issue}>`__"
+
+[[tool.towncrier.type]]
+directory = "feature"
+name = "Features"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "bugfix"
+name = "Bugfixes"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "doc"
+name = "Improved documentation"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "removal"
+name = "Deprecations and removals"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "misc"
+name = "Miscellaneous"
+showcontent = true

newsfragments/80.bugfix.rst

@@ -54,8 +54,8 @@
 
 install_requires = [
     "trio >= 0.15.0",
-    "attrs",
     "outcome",
+    "sniffio",
 ]
 if sys.version_info < (3, 7):
     install_requires.append("contextvars >= 2.1")

newsfragments/82.misc.rst

@@ -1,7 +1,6 @@
 from tests import aiotest
 import signal
 import pytest
-from .. import utils as test_utils
 
 
 class TestCallback(aiotest.TestCase):
@@ -32,7 +31,7 @@ def append_result(loop, result, value):
         loop.call_soon(func, result, loop)
         await loop.wait_stopped()
         # http://bugs.python.org/issue22875: Ensure that call_soon() does not
-        # call append_result() immediatly, but when control returns to the
+        # call append_result() immediately, but when control returns to the
         # event loop, when func() is done.
         assert result == ['[]', 'yes']
 
@@ -51,10 +50,6 @@ async def test():
         func = lambda: False
         coro = test()
         try:
-            # no longer depends on the loop
-            # with pytest.raises(RuntimeError):
-            #    fut = config.asyncio.Future(loop=loop)
-            #    await loop.run_future(fut)
             with pytest.raises(RuntimeError, match='not a sync loop'):
                 loop.run_until_complete(None)
             with pytest.raises(RuntimeError):
@@ -71,9 +66,6 @@ async def test():
                 loop.run_in_executor(None, func)
             with pytest.raises(RuntimeError, match='Event loop is closed'):
                 await loop.run_aio_coroutine(coro)
-            with test_utils.deprecate(self):
-                with pytest.raises(RuntimeError, match='Event loop is closed'):
-                    await loop.run_coroutine(coro)
             with pytest.raises(RuntimeError, match='Event loop is closed'):
                 loop.add_signal_handler(signal.SIGTERM, func)
         finally:

newsfragments/89.bugfix.rst

@@ -1,13 +1,12 @@
 from tests import aiotest
 import trio_asyncio
 import pytest
-from .. import utils as test_utils
 
 
 async def hello_world(asyncio, result, delay, loop):
     result.append("Hello")
     # retrieve the event loop from the policy
-    await asyncio.sleep(delay, loop=loop)
+    await asyncio.sleep(delay)
     result.append('World')
     return "."
 
@@ -17,27 +16,13 @@ class TestCoroutine(aiotest.TestCase):
     async def test_hello_world(self, loop, config):
         result = []
         coro = hello_world(config.asyncio, result, 0.001, loop)
-        await loop.run_aio_coroutine(config.asyncio.ensure_future(coro, loop=loop))
-        assert result == ['Hello', 'World']
-
-    @pytest.mark.trio
-    async def test_hello_world_depr(self, loop, config):
-        result = []
-        coro = hello_world(config.asyncio, result, 0.001, loop)
-        with test_utils.deprecate(self):
-            await loop.run_coroutine(config.asyncio.ensure_future(coro, loop=loop))
-        assert result == ['Hello', 'World']
-
-    @pytest.mark.trio
-    async def run_hello_world(self, loop, config):
-        result = []
-        await loop.run_asyncio(hello_world, config.asyncio, result, 0.001, loop)
+        await loop.run_aio_coroutine(config.asyncio.ensure_future(coro))
         assert result == ['Hello', 'World']
 
     @pytest.mark.trio
     async def test_waiter(self, loop, config):
         async def waiter(asyncio, hello_world, result):
-            fut = asyncio.Future(loop=loop)
+            fut = asyncio.Future()
             loop.call_soon(fut.set_result, "Future")
 
             value = await fut
@@ -49,20 +34,3 @@ async def waiter(asyncio, hello_world, result):
         result = []
         await trio_asyncio.aio_as_trio(waiter)(config.asyncio, hello_world, result)
         assert result == ['Future', 'Hello', 'World', '.']
-
-    @pytest.mark.trio
-    async def test_waiter_depr(self, loop, config):
-        async def waiter(asyncio, hello_world, result):
-            fut = asyncio.Future(loop=loop)
-            loop.call_soon(fut.set_result, "Future")
-
-            value = await fut
-            result.append(value)
-
-            value = await hello_world(asyncio, result, 0.001, loop)
-            result.append(value)
-
-        result = []
-        with test_utils.deprecate(self):
-            await loop.run_asyncio(waiter, config.asyncio, hello_world, result)
-        assert result == ['Future', 'Hello', 'World', '.']