Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase the upper boundary of the multidict dependency allowing v6 #6950

Merged
merged 5 commits into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES/6950.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
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 <index>` 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
<index>` v3.8.3 fixes that by recovering the original boundary of ``< 7``.
webknjaz marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions aiohttp/web_ws.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
webknjaz marked this conversation as resolved.
Show resolved Hide resolved
async_timeout >= 4.0.0a3, < 5.0
asynctest == 0.13.0; python_version<"3.8"
yarl >= 1.0, < 2.0
Expand Down