[pull] master from aio-libs:master

.github/workflows/ci-cd.yml

@@ -41,7 +41,7 @@ jobs:
         submodules: true
     - name: >-
         Verify that `requirements/runtime-deps.in`
-        is in sync with `setup.cfg`
+        is in sync with `pyproject.toml`
       run: |
         set -eEuo pipefail
         make sync-direct-runtime-deps

CHANGES.rst

@@ -10,6 +10,40 @@
 
 .. towncrier release notes start
 
+3.13.2 (2025-10-28)
+===================
+
+Bug fixes
+---------
+
+- Fixed cookie parser to continue parsing subsequent cookies when encountering a malformed cookie that fails regex validation, such as Google's ``g_state`` cookie with unescaped quotes -- by :user:`bdraco`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`11632`.
+
+
+
+- Fixed loading netrc credentials from the default :file:`~/.netrc` (:file:`~/_netrc` on Windows) location when the :envvar:`NETRC` environment variable is not set -- by :user:`bdraco`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`11713`, :issue:`11714`.
+
+
+
+- Fixed WebSocket compressed sends to be cancellation safe. Tasks are now shielded during compression to prevent compressor state corruption. This ensures that the stateful compressor remains consistent even when send operations are cancelled -- by :user:`bdraco`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`11725`.
+
+
+
+
+----
+
+
 3.13.1 (2025-10-17)
 ===================
 

CHANGES/11643.packaging.rst

@@ -0,0 +1,2 @@
+Moved dependency metadata from :file:`setup.cfg` to :file:`pyproject.toml` per :pep:`621`
+-- by :user:`cdce8p`.

Makefile

@@ -184,5 +184,5 @@ install-dev: .develop
 
 .PHONY: sync-direct-runtime-deps
 sync-direct-runtime-deps:
-	@echo Updating 'requirements/runtime-deps.in' from 'setup.cfg'... >&2
+	@echo Updating 'requirements/runtime-deps.in' from 'pyproject.toml'... >&2
 	@python requirements/sync-direct-runtime-deps.py

pyproject.toml

@@ -32,12 +32,27 @@ classifiers = [
   "Topic :: Internet :: WWW/HTTP",
 ]
 requires-python = ">= 3.10"
+dependencies = [
+  "aiohappyeyeballs >= 2.5.0",
+  "aiosignal >= 1.4.0",
+  "async-timeout >= 4.0, < 6.0 ; python_version < '3.11'",
+  "frozenlist >= 1.1.1",
+  "multidict >=4.5, < 7.0",
+  "propcache >= 0.2.0",
+  "yarl >= 1.17.0, < 2.0",
+]
 dynamic = [
-  "dependencies",
-  "optional-dependencies",
   "version",
 ]
 
+[project.optional-dependencies]
+speedups = [
+  "aiodns >= 3.3.0",
+  "Brotli; platform_python_implementation == 'CPython'",
+  "brotlicffi; platform_python_implementation != 'CPython'",
+  "backports.zstd; platform_python_implementation == 'CPython' and python_version < '3.14'",
+]
+
 [[project.maintainers]]
 name = "aiohttp team"
 email = "[email protected]"

requirements/runtime-deps.in

@@ -1,10 +1,10 @@
-# Extracted from `setup.cfg` via `make sync-direct-runtime-deps`
+# Extracted from `pyproject.toml` via `make sync-direct-runtime-deps`
 
 aiodns >= 3.3.0
 aiohappyeyeballs >= 2.5.0
 aiosignal >= 1.4.0
-async-timeout >= 4.0, < 6.0 ; python_version < "3.11"
-backports.zstd; platform_python_implementation == 'CPython' and python_version < "3.14"
+async-timeout >= 4.0, < 6.0 ; python_version < '3.11'
+backports.zstd; platform_python_implementation == 'CPython' and python_version < '3.14'
 Brotli; platform_python_implementation == 'CPython'
 brotlicffi; platform_python_implementation != 'CPython'
 frozenlist >= 1.1.1

requirements/sync-direct-runtime-deps.py

@@ -1,16 +1,22 @@
 #!/usr/bin/env python
-"""Sync direct runtime dependencies from setup.cfg to runtime-deps.in."""
+"""Sync direct runtime dependencies from pyproject.toml to runtime-deps.in."""
 
-from configparser import ConfigParser
+import sys
 from pathlib import Path
 
-cfg = ConfigParser()
-cfg.read(Path("setup.cfg"))
-reqs = cfg["options"]["install_requires"] + cfg.items("options.extras_require")[0][1]
-reqs = sorted(reqs.split("\n"), key=str.casefold)
-reqs.remove("")
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    raise RuntimeError("Use Python 3.11+ to run 'make sync-direct-runtime-deps'")
+
+data = tomllib.loads(Path("pyproject.toml").read_text())
+reqs = (
+    data["project"]["dependencies"]
+    + data["project"]["optional-dependencies"]["speedups"]
+)
+reqs = sorted(reqs, key=str.casefold)
 
 with open(Path("requirements", "runtime-deps.in"), "w") as outfile:
-    header = "# Extracted from `setup.cfg` via `make sync-direct-runtime-deps`\n\n"
+    header = "# Extracted from `pyproject.toml` via `make sync-direct-runtime-deps`\n\n"
     outfile.write(header)
     outfile.write("\n".join(reqs) + "\n")

setup.cfg

@@ -1,20 +1,3 @@
-[options]
-install_requires =
-  aiohappyeyeballs >= 2.5.0
-  aiosignal >= 1.4.0
-  async-timeout >= 4.0, < 6.0 ; python_version < "3.11"
-  frozenlist >= 1.1.1
-  multidict >=4.5, < 7.0
-  propcache >= 0.2.0
-  yarl >= 1.17.0, < 2.0
-
-[options.extras_require]
-speedups =
-  aiodns >= 3.3.0
-  Brotli; platform_python_implementation == 'CPython'
-  brotlicffi; platform_python_implementation != 'CPython'
-  backports.zstd; platform_python_implementation == 'CPython' and python_version < "3.14"
-
 [pep8]
 max-line-length=79