Drop py3.5

Author: smurfix

.appveyor.yml

@@ -4,8 +4,6 @@ os: Visual Studio 2015
 
 environment:
   matrix:
-    #- PYTHON: "C:\\Python35"
-    #- PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python36-x64"
     - PYTHON: "C:\\Python37"

.travis.yml

@@ -3,7 +3,6 @@ dist: xenial
 
 matrix:
   include:
-    - python: 3.5
     - python: 3.6
     - python: 3.7
     - python: 3.7-dev

README.rst

@@ -26,8 +26,8 @@
 **trio-asyncio** is a re-implementation of the ``asyncio`` mainloop on top of
 Trio.
 
-trio-asyncio requires at least Python 3.5.3. It is tested on recent versions of
-3.5, 3.6, 3.7, 3.8, and nightly.
+Trio-Asyncio requires at least Python 3.6. It is tested on recent versions of
+3.6, 3.7, 3.8, and nightly.
 
 +++++++++++
  Rationale

docs/source/index.rst

@@ -51,7 +51,7 @@ asyncio libraries such as ``home-assistant``.
 Helpful facts:
 
 * Supported environments: Linux, MacOS, or Windows running some kind of Python
-  3.5.3-or-better (either CPython or PyPy3 is fine). \*BSD and illumOS likely
+  3.6-or-better (either CPython or PyPy3 is fine). \*BSD and illumOS likely
   work too, but are untested.
 
 * Install: ``python3 -m pip install -U trio-asyncio`` (or on Windows, maybe

setup.py

@@ -43,7 +43,7 @@
 code (asyncio: ~8000) but passes the complete Python 3.6 test suite with no
 errors.
 
-``trio_asyncio`` requires Python 3.5.3 or better.
+``trio_asyncio`` requires Python 3.6 or better.
 
 Author
 ======
@@ -53,12 +53,12 @@
 """
 
 install_requires = [
-    "trio >= 0.12.0",
-    "async_generator >= 1.6",
+    "trio >= 0.13.0",
     "outcome",
 ]
 if sys.version_info < (3, 7):
     install_requires.append("contextvars >= 2.1")
+    install_requires.append("async_generator >= 1.6")
 
 setup(
     name="trio_asyncio",
@@ -74,7 +74,7 @@
     # This means, just install *everything* you see under trio/, even if it
     # doesn't look like a source file, so long as it appears in MANIFEST.in:
     include_package_data=True,
-    python_requires=">=3.5.2",  # temporary, for RTD
+    python_requires=">=3.6",  # temporary, for RTD
     keywords=["async", "io", "trio", "asyncio", "trio-asyncio"],
     setup_requires=['pytest-runner'],
     tests_require=['pytest', 'outcome'],

tests/conftest.py

@@ -2,7 +2,6 @@
 import asyncio
 import trio_asyncio
 import inspect
-from async_generator import async_generator, yield_
 
 # Hacks for <3.7
 if not hasattr(asyncio, 'run'):
@@ -45,11 +44,10 @@ def create_task(coro):
 
 
 @pytest.fixture
-@async_generator
 async def loop():
     async with trio_asyncio.open_loop() as loop:
         try:
-            await yield_(loop)
+            yield loop
         finally:
             await loop.stop().wait()
 

tests/interop/test_adapter.py

@@ -1,5 +1,4 @@
 import pytest
-from async_generator import async_generator, yield_
 from trio_asyncio import aio_as_trio, trio_as_aio, allow_asyncio
 from trio_asyncio import aio2trio, trio2aio
 import asyncio
@@ -8,7 +7,10 @@
 from tests import aiotest
 import sys
 import warnings
-from async_generator import asynccontextmanager
+try:
+    from contextlib import asynccontextmanager
+except ImportError:
+    from async_generator import asynccontextmanager
 from .. import utils as test_utils
 from trio_asyncio import TrioAsyncioDeprecationWarning
 
@@ -74,43 +76,39 @@ async def dly_asyncio(self, do_test=True):
         self.flag |= 1
         return 4
 
-    @async_generator
     async def iter_asyncio(self, do_test=True):
         if do_test and sys.version_info >= (3, 7):
             assert sniffio.current_async_library() == "asyncio"
         await asyncio.sleep(0.01, loop=self.loop)
-        await yield_(1)
+        yield 1
         await asyncio.sleep(0.01, loop=self.loop)
-        await yield_(2)
+        yield 2
         await asyncio.sleep(0.01, loop=self.loop)
         self.flag |= 1
 
-    @async_generator
     async def iter_trio(self):
         if sys.version_info >= (3, 7):
             assert sniffio.current_async_library() == "trio"
         await trio.sleep(0.01)
-        await yield_(1)
+        yield 1
         await trio.sleep(0.01)
-        await yield_(2)
+        yield 2
         await trio.sleep(0.01)
         self.flag |= 1
 
     @asynccontextmanager
-    @async_generator
     async def ctx_asyncio(self):
         await asyncio.sleep(0.01, loop=self.loop)
         self.flag |= 1
-        await yield_(self)
+        yield self
         await asyncio.sleep(0.01, loop=self.loop)
         self.flag |= 2
 
     @asynccontextmanager
-    @async_generator
     async def ctx_trio(self):
         await trio.sleep(0.01)
         self.flag |= 1
-        await yield_(self)
+        yield self
         await trio.sleep(0.01)
         self.flag |= 2
 

tests/interop/test_calls.py

@@ -2,7 +2,6 @@
 import asyncio
 import trio
 import sniffio
-from async_generator import async_generator, yield_
 from trio_asyncio import aio_as_trio, trio_as_aio
 from tests import aiotest
 from functools import partial
@@ -526,23 +525,21 @@ def err_asyncio():
 
     @pytest.mark.trio
     async def test_trio_asyncio_generator(self, loop):
-        @async_generator
         async def dly_asyncio():
-            await yield_(1)
+            yield 1
             await asyncio.sleep(0.01, loop=loop)
-            await yield_(2)
+            yield 2
 
         with test_utils.deprecate(self):
             res = await async_gen_to_list(loop.wrap_generator(dly_asyncio))
         assert res == [1, 2]
 
     @pytest.mark.trio
     async def test_trio_asyncio_generator_with_error(self, loop):
-        @async_generator
         async def dly_asyncio():
-            await yield_(1)
+            yield 1
             raise RuntimeError("I has an owie")
-            await yield_(2)
+            yield 2
 
         with test_utils.deprecate(self):
             with pytest.raises(RuntimeError) as err:
@@ -551,9 +548,8 @@ async def dly_asyncio():
 
     @pytest.mark.trio
     async def test_trio_asyncio_generator_with_cancellation(self, loop):
-        @async_generator
         async def dly_asyncio(hold, seen):
-            await yield_(1)
+            yield 1
             seen.flag |= 1
             await hold.wait()
 
@@ -573,11 +569,10 @@ async def cancel_soon(nursery):
 
     @pytest.mark.trio
     async def test_trio_asyncio_iterator(self, loop):
-        @async_generator
         async def slow_nums():
             for n in range(1, 6):
                 await asyncio.sleep(0.01, loop=loop)
-                await yield_(n)
+                yield n
 
         sum = 0
         async for n in aio_as_trio(slow_nums()):
@@ -586,11 +581,10 @@ async def slow_nums():
 
     @pytest.mark.trio
     async def test_trio_asyncio_iterator_depr(self, loop):
-        @async_generator
         async def slow_nums():
             for n in range(1, 6):
                 await asyncio.sleep(0.01, loop=loop)
-                await yield_(n)
+                yield n
 
         sum = 0
         # with test_utils.deprecate(self): ## not yet

tests/python/conftest.py

@@ -124,7 +124,7 @@ def skip(rel_id):
 
         # These fail with ConnectionResetError on Pythons <= 3.7.x
         # for some unknown x. (3.7.1 fails, 3.7.5 and 3.7.6 pass;
-        # older 3.6.x also affected, and older-or-all 3.5.x)
+        # older 3.6.x also affected)
         if sys.platform != "win32" and sys.version_info < (3, 8):
             import selectors
 

tox.ini

@@ -0,0 +1,44 @@
+[tox]
+envlist = py36,py37
+
+[sphinx-vars]
+build_dir = build
+input_dir = docs/source
+sphinxopts = -a -W -b html
+autosphinxopts = -i *~ -i *.sw* -i Makefile*
+sphinxbuilddir = {[sphinx-vars]build_dir}/sphinx/html
+allsphinxopts = -d {[sphinx-vars]build_dir}/sphinx/doctrees {[sphinx-vars]sphinxopts} docs
+
+[testenv]
+deps =
+  pytest
+  outcome
+commands =
+  pytest -xvvv --full-trace
+
+[testenv:pylint]
+deps =
+  pylint
+commands =
+  pylint trio_asyncio
+
+[testenv:flake8]
+deps =
+    flake8
+commands =
+    flake8 trio_asyncio tests
+
+[testenv:doc]
+deps =
+  sphinx
+  sphinx-rtd-theme
+  sphinxcontrib-trio
+commands =
+  sphinx-build -a {[sphinx-vars]input_dir} {[sphinx-vars]build_dir}
+
+[testenv:livehtml]
+deps =
+  sphinx
+  sphinx-autobuild
+commands =
+  sphinx-autobuild {[sphinx-vars]autosphinxopts} {[sphinx-vars]allsphinxopts} {[sphinx-vars]sphinxbuilddir}

trio_asyncio/_loop.py

@@ -8,7 +8,10 @@
 import threading
 from contextvars import ContextVar
 
-from async_generator import async_generator, yield_, asynccontextmanager
+try:
+    from contextlib import asynccontextmanager
+except ImportError:
+    from async_generator import asynccontextmanager
 
 from ._util import run_aio_future, run_aio_generator
 from ._async import TrioEventLoop
@@ -368,7 +371,6 @@ def __exit__(self, *tb):
 
 
 @asynccontextmanager
-@async_generator
 async def open_loop(queue_len=None):
     """Returns a Trio-flavored async context manager which provides
     an asyncio event loop running on top of Trio.
@@ -396,7 +398,7 @@ async def async_main(*args):
             loop._closed = False
             await loop._main_loop_init(nursery)
             await nursery.start(loop._main_loop)
-            await yield_(loop)
+            yield loop
         finally:
             try:
                 await loop._main_loop_exit()

trio_asyncio/_util.py

@@ -6,7 +6,6 @@
 import sys
 import outcome
 import sniffio
-from async_generator import async_generator, yield_
 
 
 async def run_aio_future(future):
@@ -59,7 +58,6 @@ def abort_cb(raise_cancel_arg):
 STOP = object()
 
 
-@async_generator
 async def run_aio_generator(loop, async_generator):
     """Return a Trio-flavored async iterator which wraps the given
     asyncio-flavored async iterator (usually an async generator, but
@@ -116,7 +114,7 @@ def abort_cb(raise_cancel_arg):
 
             if item is STOP:
                 break
-            await yield_(item)
+            yield item
 
     except asyncio.CancelledError as exc:
         if raise_cancel is not None:
@@ -130,7 +128,6 @@ def abort_cb(raise_cancel_arg):
             raise
 
 
-@async_generator
 async def run_trio_generator(loop, async_generator):
     """Run a Trio generator from within asyncio"""
     while True:
@@ -140,7 +137,7 @@ async def run_trio_generator(loop, async_generator):
         except StopAsyncIteration:
             break
         else:
-            await yield_(item)
+            yield item
 
 
 # Copied from Trio: