Fix CI

.github/workflows/ci.yml

@@ -17,7 +17,8 @@ jobs:
         - 3.8
         - 3.9
         - "3.10"
-        - pypy-3.7
+        - "3.11"
+        - pypy-3.9
 
     steps:
     - uses: actions/checkout@v2
@@ -39,7 +40,7 @@ jobs:
         file: ./coverage.xml
 
   autobahn:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         side: [client, server]

src/wsproto/extensions.py

@@ -6,17 +6,19 @@
 """
 
 import zlib
+from abc import ABC, abstractmethod
 from typing import Optional, Tuple, Union
 
 from .frame_protocol import CloseReason, FrameDecoder, FrameProtocol, Opcode, RsvBits
 
 
-class Extension:
+class Extension(ABC):
     name: str
 
     def enabled(self) -> bool:
         return False
 
+    @abstractmethod
     def offer(self) -> Union[bool, str]:
         pass
 

test/test_extensions.py

@@ -1,41 +1,48 @@
+from typing import Union
+
 from wsproto import extensions as wpext, frame_protocol as fp
 
 
+class ConcreteExtension(wpext.Extension):
+    def offer(self) -> Union[bool, str]:
+        return "myext"
+
+
 class TestExtension:
     def test_enabled(self) -> None:
-        ext = wpext.Extension()
+        ext = ConcreteExtension()
         assert not ext.enabled()
 
     def test_offer(self) -> None:
-        ext = wpext.Extension()
-        assert ext.offer() is None
+        ext = ConcreteExtension()
+        assert ext.offer() == "myext"
 
     def test_accept(self) -> None:
-        ext = wpext.Extension()
+        ext = ConcreteExtension()
         offer = "myext"
         assert ext.accept(offer) is None
 
     def test_finalize(self) -> None:
-        ext = wpext.Extension()
+        ext = ConcreteExtension()
         offer = "myext"
         ext.finalize(offer)
 
     def test_frame_inbound_header(self) -> None:
-        ext = wpext.Extension()
+        ext = ConcreteExtension()
         result = ext.frame_inbound_header(None, None, None, None)  # type: ignore[arg-type]
         assert result == fp.RsvBits(False, False, False)
 
     def test_frame_inbound_payload_data(self) -> None:
-        ext = wpext.Extension()
+        ext = ConcreteExtension()
         data = b""
         assert ext.frame_inbound_payload_data(None, data) == data  # type: ignore[arg-type]
 
     def test_frame_inbound_complete(self) -> None:
-        ext = wpext.Extension()
+        ext = ConcreteExtension()
         assert ext.frame_inbound_complete(None, None) is None  # type: ignore[arg-type]
 
     def test_frame_outbound(self) -> None:
-        ext = wpext.Extension()
+        ext = ConcreteExtension()
         rsv = fp.RsvBits(True, True, True)
         data = b""
         assert ext.frame_outbound(None, None, rsv, data, None) == (  # type: ignore[arg-type]

test/test_frame_protocol.py

@@ -692,6 +692,9 @@ def __init__(self) -> None:
         def enabled(self) -> bool:
             return True
 
+        def offer(self) -> Union[bool, str]:
+            return "fake"
+
         def frame_inbound_header(
             self,
             proto: Union[fp.FrameDecoder, fp.FrameProtocol],

tox.ini

@@ -1,12 +1,13 @@
 [tox]
-envlist = py37, py38, py39, py310, pypy3, lint, docs, packaging
+envlist = py37, py38, py39, py310, py311, pypy3, lint, docs, packaging
 
 [gh-actions]
 python =
     3.7: py37
     3.8: py38
     3.9: py39
-    3.10: py310, lint, docs, packaging
+    3.10: py310
+    3.11: py311, lint, docs, packaging
     pypy3: pypy3
 
 [testenv]
@@ -39,7 +40,7 @@ commands =
 [testenv:docs]
 deps =
     sphinx
-whitelist_externals = make
+allowlist_externals = make
 changedir = {toxinidir}/docs
 commands =
     make clean
@@ -51,7 +52,7 @@ deps =
     check-manifest
     readme-renderer
     twine
-whitelist_externals = rm
+allowlist_externals = rm
 commands =
     rm -rf dist/
     check-manifest
@@ -62,7 +63,7 @@ commands =
 basepython = {[testenv:packaging]basepython}
 deps =
     {[testenv:packaging]deps}
-whitelist_externals = {[testenv:packaging]whitelist_externals}
+allowlist_externals = {[testenv:packaging]allowlist_externals}
 commands =
     {[testenv:packaging]commands}
     twine upload dist/*