Remove python 3.5 support (#138)

Closes #112

Author: AutomatedTester

.travis.yml

@@ -6,24 +6,17 @@ git:
 
 jobs:
   include:
-    - python: 3.5
-      env: REQUIREMENTS=requirements-dev-3.5.txt
     - python: 3.6
-      env: REQUIREMENTS=requirements-dev.txt
     - python: 3.7
-      env: REQUIREMENTS=requirements-dev.txt
     - python: 3.8
-      env: REQUIREMENTS=requirements-dev.txt
     - python: 3.9
-      env: REQUIREMENTS=requirements-dev.txt
     - python: pypy3
-      env: REQUIREMENTS=requirements-dev.txt
     - name: "latest deps"
       python: 3.9
-      env: REQUIREMENTS=requirements-dev.txt UPGRADE="pip install --upgrade trio wsproto"
+      env: UPGRADE="pip install --upgrade trio wsproto"
 
 install:
-  - pip install -r $REQUIREMENTS
+  - pip install -r requirements-dev.txt
   - $UPGRADE
   - pip install -e .
 

README.md

@@ -29,7 +29,7 @@ same port is straightforward.  There has yet to be a performance comparison.
 
 ## Installation
 
-This library requires Python 3.5 or greater. To install from PyPI:
+This library requires Python 3.6 or greater. To install from PyPI:
 
     pip install trio-websocket
 

requirements-dev-3.5.txt

@@ -28,15 +28,14 @@
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     keywords='websocket client server trio',
     packages=find_packages(exclude=['docs', 'examples', 'tests']),
     install_requires=[

setup.py

@@ -37,7 +37,6 @@
 import pytest
 import trio
 import trustme
-from async_generator import async_generator, yield_
 from trio.testing import memory_stream_pair
 from wsproto.events import CloseConnection
 
@@ -78,24 +77,22 @@
 
 
 @pytest.fixture
-@async_generator
 async def echo_server(nursery):
     ''' A server that reads one message, sends back the same message,
     then closes the connection. '''
     serve_fn = partial(serve_websocket, echo_request_handler, HOST, 0,
         ssl_context=None)
     server = await nursery.start(serve_fn)
-    await yield_(server)
+    yield server
 
 
 @pytest.fixture
-@async_generator
 async def echo_conn(echo_server):
     ''' Return a client connection instance that is connected to an echo
     server. '''
     async with open_websocket(HOST, echo_server.port, RESOURCE,
             use_ssl=False) as conn:
-        await yield_(conn)
+        yield conn
 
 
 async def echo_request_handler(request):

tests/test_connection.py

@@ -9,7 +9,7 @@
 import struct
 import urllib.parse
 
-from async_generator import async_generator, yield_, asynccontextmanager
+from async_generator import asynccontextmanager
 import trio
 import trio.abc
 from wsproto import ConnectionType, WSConnection
@@ -65,7 +65,6 @@ def remove_cancels(exc):
 
 
 @asynccontextmanager
-@async_generator
 async def open_websocket(host, port, resource, *, use_ssl, subprotocols=None,
     extra_headers=None,
     message_queue_size=MESSAGE_QUEUE_SIZE, max_message_size=MAX_MESSAGE_SIZE,
@@ -115,7 +114,7 @@ async def open_websocket(host, port, resource, *, use_ssl, subprotocols=None,
         except OSError as e:
             raise HandshakeError from e
         try:
-            await yield_(connection)
+            yield connection
         finally:
             try:
                 with trio.fail_after(disconnect_timeout):