From 415fb4414c635a3df4ff2f23a3d70d4faaa4db1d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 21 Sep 2022 08:24:25 +0300 Subject: [PATCH 1/5] Re-allow newer multidict --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 4a6e3175964..cd279a1fc90 100644 --- a/setup.cfg +++ b/setup.cfg @@ -50,7 +50,7 @@ include_package_data = True install_requires = attrs >= 17.3.0 charset-normalizer >=2.0, < 3.0 - multidict >=4.5, < 6.0 + multidict >=4.5, < 7.0 async_timeout >= 4.0.0a3, < 5.0 asynctest == 0.13.0; python_version<"3.8" yarl >= 1.0, < 2.0 From 1e9724ae8ff962cf723c09a610561ca01ec7c7b3 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 21 Sep 2022 08:43:02 +0300 Subject: [PATCH 2/5] Fix mypy: unused "type: ignore" comment --- aiohttp/web_ws.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aiohttp/web_ws.py b/aiohttp/web_ws.py index c3ddff7173f..0d32a218b52 100644 --- a/aiohttp/web_ws.py +++ b/aiohttp/web_ws.py @@ -196,9 +196,9 @@ def _handshake( accept_val = base64.b64encode( hashlib.sha1(key.encode() + WS_KEY).digest() ).decode() - response_headers = CIMultiDict( # type: ignore[var-annotated] + response_headers = CIMultiDict( { - hdrs.UPGRADE: "websocket", # type: ignore[arg-type] + hdrs.UPGRADE: "websocket", hdrs.CONNECTION: "upgrade", hdrs.SEC_WEBSOCKET_ACCEPT: accept_val, } From 8c711eb38c81ccd34599234b42a74ec2ab5b0c3b Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 21 Sep 2022 10:06:43 +0300 Subject: [PATCH 3/5] Add news fragment --- CHANGES/6950.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/6950.bugfix diff --git a/CHANGES/6950.bugfix b/CHANGES/6950.bugfix new file mode 100644 index 00000000000..b6d8bf4a5b3 --- /dev/null +++ b/CHANGES/6950.bugfix @@ -0,0 +1 @@ +Re-allow multidict version 6 as a dependency. From e05d310573bac7903945c26435b0b9bdc66efeb2 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Wed, 21 Sep 2022 12:25:39 +0200 Subject: [PATCH 4/5] Make the change note verbose --- CHANGES/6950.bugfix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES/6950.bugfix b/CHANGES/6950.bugfix index b6d8bf4a5b3..4229a746762 100644 --- a/CHANGES/6950.bugfix +++ b/CHANGES/6950.bugfix @@ -1 +1,7 @@ -Re-allow multidict version 6 as a dependency. +Increased the upper boundary of the :doc:`multidict:index` dependency +to allow for the version 6 -- by :user:`hugovk`. + +It used to be limited below version 7 in :doc:`aiohttp ` v3.8.1 but +was lowered in v3.8.2 via :pr:`6550` and never brought back, causing +the upgrading users problems with their dependency pins. :doc:`aiohttp +` v3.8.3 fixes that by recovering the original boundary of ``< 7``. From e47747322f1e2787929e052b360cc1bbd40f88c6 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 21 Sep 2022 13:54:45 +0300 Subject: [PATCH 5/5] Adjust news wording --- CHANGES/6950.bugfix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES/6950.bugfix b/CHANGES/6950.bugfix index 4229a746762..02fcdb6312c 100644 --- a/CHANGES/6950.bugfix +++ b/CHANGES/6950.bugfix @@ -3,5 +3,5 @@ to allow for the version 6 -- by :user:`hugovk`. It used to be limited below version 7 in :doc:`aiohttp ` v3.8.1 but was lowered in v3.8.2 via :pr:`6550` and never brought back, causing -the upgrading users problems with their dependency pins. :doc:`aiohttp -` v3.8.3 fixes that by recovering the original boundary of ``< 7``. +problems with dependency pins when upgrading. :doc:`aiohttp ` v3.8.3 +fixes that by recovering the original boundary of ``< 7``.