Merge branch 'master' into release-0.5.0

Author: njsmith

pytest_trio/_tests/test_trio_asyncio.py

@@ -3,12 +3,10 @@
 import asyncio
 from async_generator import async_generator, yield_
 
-if sys.version_info < (3, 6):
-    pytestmark = pytest.mark.skip(
-        reason="trio-asyncio doesn't seem to work on 3.5"
-    )
-else:
+try:
     import trio_asyncio
+except ImportError:
+    pytestmark = pytest.mark.skip(reason="trio-asyncio not available")
 
 
 async def use_run_asyncio():

test-requirements.txt

@@ -1,4 +1,4 @@
 pytest !=3.7.0, !=3.7.1  # https://github.com/python-trio/pytest-trio/pull/50#issuecomment-413124393
 pytest-cov
 hypothesis>=3.64
-trio-asyncio
+trio-asyncio; python_version >= "3.5.3"