modernize

Author: Kriechi

.github/workflows/ci.yml

@@ -8,21 +8,20 @@ on:
 
 jobs:
   tox:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
-      max-parallel: 5
       matrix:
         python-version:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
         - "3.13"
-        - "pypy3.9"
+        - "3.14"
+        - "pypy3.11"
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install tox

.readthedocs.yaml

@@ -1,10 +1,16 @@
+# Read the Docs configuration file for Sphinx projects
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.13"
+    python: "3.14"
+  jobs:
+    install:
+      - pip install -U pip
+      - pip install --group 'docs' .
 
 sphinx:
   configuration: docs/source/conf.py

CHANGELOG.rst

@@ -8,8 +8,8 @@ Release History
 - Fix "Upgrade" header value to match RFC.
 - Add reason "Switching Protocols" to handshake response.
 - Add docs for `wsproto.Connection`
-- Add support for Python 3.12 and 3.13.
-- Drop support for Python 3.7 and 3.8.
+- Add support for Python 3.12, 3.13, and 3.14.
+- Drop support for Python 3.7, 3.8, and 3.9.
 - Various linting, styling, and packaging improvements.
 
 1.2.0 (2022-08-23)

pyproject.toml

@@ -2,7 +2,7 @@
 # https://packaging.python.org/en/latest/specifications/pyproject-toml/
 
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=77"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -18,7 +18,7 @@ maintainers = [
   { name = "Thomas Kriechbaumer", email = "thomas@kriechbaumer.name" },
 ]
 
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
   "h11>=0.16.0,<1",
 ]
@@ -31,11 +31,11 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
@@ -62,21 +62,21 @@ testing = [
 ]
 
 linting = [
-  "ruff>=0.8.0,<1",
-  "mypy>=1.13.0,<2",
-  "typing_extensions>=4.12.2",
+  "ruff>=0.14.4,<1",
+  "mypy>=1.18.2,<2",
+  "typing_extensions>=4.15.0",
 ]
 
 packaging = [
-  "check-manifest==0.50",
+  "check-manifest==0.51",
   "readme-renderer==44.0",
-  "build>=1.2.2,<2",
-  "twine>=6.1.0,<7",
-  "wheel>=0.45.0,<1",
+  "build>=1.3.0,<2",
+  "twine>=6.2.0,<7",
+  "wheel>=0.45.1,<1",
 ]
 
 docs = [
-  "sphinx>=7.4.7,<9",
+  "sphinx>=8.2.3,<9",
 ]
 
 [tool.setuptools.packages.find]
@@ -107,6 +107,7 @@ lint.ignore = [
   "CPY",     # not required
   "D101",    # docs readability
   "D102",    # docs readability
+  "D103",    # docs readability
   "D105",    # docs readability
   "D107",    # docs readability
   "D200",    # docs readability
@@ -135,6 +136,7 @@ lint.ignore = [
   "ARG001",  # readability
   "ARG002",  # readability
   "PLR0913",  # readability
+  "FBT003",  # readability
 ]
 lint.isort.required-imports = [ "from __future__ import annotations" ]
 
@@ -143,6 +145,13 @@ warn_unused_configs = true
 show_error_codes = true
 strict = true
 
+[[tool.mypy.overrides]]
+module = [
+  "h11",
+  "h11._headers",
+]
+ignore_missing_imports = true
+
 [tool.pytest.ini_options]
 testpaths = [ "tests" ]
 
@@ -168,16 +177,16 @@ source = [
 
 [tool.tox]
 min_version = "4.23.2"
-env_list = [ "py39", "py310", "py311", "py312", "py313", "pypy3", "lint", "docs", "packaging" ]
+env_list = [ "py310", "py311", "py312", "py313", "py314", "pypy311", "lint", "docs", "packaging" ]
 
 [tool.tox.gh-actions]
 python = """
-  3.9: py39, lint, docs, packaging
-  3.10: py310
+  3.10: py310, lint, docs, packaging
   3.11: py311
   3.12: py312
   3.13: py313
-  pypy3: pypy3
+  3.14: py314
+  pypy3.11: pypy311
 """
 
 [tool.tox.env_run_base]
@@ -186,12 +195,6 @@ commands = [
   ["python", "-bb", "-m", "pytest", "--cov-report=xml", "--cov-report=term", "--cov=wsproto", { replace = "posargs", extend = true }]
 ]
 
-[tool.tox.env.pypy3]
-# temporarily disable coverage testing on PyPy due to performance problems
-commands = [
-  ["pytest", { replace = "posargs", extend = true }]
-]
-
 [tool.tox.env.lint]
 dependency_groups = ["linting"]
 commands = [
@@ -209,7 +212,7 @@ commands = [
 ]
 
 [tool.tox.env.packaging]
-base_python = ["python39"]
+base_python = ["python3.10"]
 dependency_groups = ["packaging"]
 allowlist_externals = ["rm"]
 commands = [
@@ -220,7 +223,7 @@ commands = [
 ]
 
 [tool.tox.env.publish]
-base_python = ["python39"]
+base_python = ["python3.10"]
 dependency_groups = ["packaging"]
 commands = [
     ["python", "-m", "build", "--outdir", "dist/"],

src/wsproto/__init__.py

@@ -6,7 +6,7 @@
 """
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from .connection import Connection, ConnectionState, ConnectionType
 from .handshake import H11Handshake

src/wsproto/extensions.py

@@ -122,8 +122,8 @@ def enabled(self) -> bool:
 
     def offer(self) -> bool | str:
         parameters = [
-            "client_max_window_bits=%d" % self.client_max_window_bits,
-            "server_max_window_bits=%d" % self.server_max_window_bits,
+            f"client_max_window_bits={self.client_max_window_bits}",
+            f"server_max_window_bits={self.server_max_window_bits}",
         ]
 
         if self.client_no_context_takeover:
@@ -181,10 +181,10 @@ def accept(self, offer: str) -> bool | None | str:
             parameters.append("server_no_context_takeover")
         try:
             if client_max_window_bits is not None:
-                parameters.append("client_max_window_bits=%d" % client_max_window_bits)
+                parameters.append(f"client_max_window_bits={client_max_window_bits}")
                 self.client_max_window_bits = client_max_window_bits
             if server_max_window_bits is not None:
-                parameters.append("server_max_window_bits=%d" % server_max_window_bits)
+                parameters.append(f"server_max_window_bits={server_max_window_bits}")
                 self.server_max_window_bits = server_max_window_bits
         except ValueError:
             return None
@@ -303,10 +303,10 @@ def frame_outbound(
         return (rsv, data)
 
     def __repr__(self) -> str:
-        descr = ["client_max_window_bits=%d" % self.client_max_window_bits]
+        descr = [f"client_max_window_bits={self.client_max_window_bits}"]
         if self.client_no_context_takeover:
             descr.append("client_no_context_takeover")
-        descr.append("server_max_window_bits=%d" % self.server_max_window_bits)
+        descr.append(f"server_max_window_bits={self.server_max_window_bits}")
         if self.server_no_context_takeover:
             descr.append("server_no_context_takeover")