Skip to content

[pull] master from aio-libs:master #433

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.

Sign up for GitHub

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

Merged
pull merged 5 commits into from
Jan 11, 2026
Merged

[pull] master from aio-libs:master #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b919e9d
Bump pathspec from 1.0.2 to 1.0.3 (#11946)
dependabot[bot] Jan 10, 2026
3d07471
Bump aiodns from 3.6.1 to 4.0.0 (#11945)
dependabot[bot] Jan 10, 2026
e306f5e
Bump python-on-whales from 0.79.0 to 0.80.0 (#11948)
dependabot[bot] Jan 10, 2026
7a7f7af
Bump filelock from 3.20.2 to 3.20.3 (#11954)
dependabot[bot] Jan 11, 2026
de258a1
Bump virtualenv from 20.36.0 to 20.36.1 (#11951)
dependabot[bot] Jan 11, 2026
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: 3 additions & 4 deletions aiohttp/resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ async def resolve(
hosts: list[ResolveResult] = []
for node in resp.nodes:
address: tuple[bytes, int] | tuple[bytes, int, int, int] = node.addr
family = node.family
if family == socket.AF_INET6:
if node.family == socket.AF_INET6:
if len(address) > 3 and address[3]:
# This is essential for link-local IPv6 addresses.
# LL IPv6 is a VERY rare case. Strictly speaking, we should use
Expand All @@ -133,15 +132,15 @@ async def resolve(
resolved_host = address[0].decode("ascii")
port = address[1]
else: # IPv4
assert family == socket.AF_INET
assert node.family == socket.AF_INET
resolved_host = address[0].decode("ascii")
port = address[1]
hosts.append(
ResolveResult(
hostname=host,
host=resolved_host,
port=port,
family=family,
family=node.family,
proto=0,
flags=_NUMERIC_SOCKET_FLAGS,
)
Expand Down
4 changes: 2 additions & 2 deletions requirements/base-ft.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/base-ft.txt --strip-extras requirements/base-ft.in
#
aiodns==3.6.1
aiodns==4.0.0
# via -r requirements/runtime-deps.in
aiohappyeyeballs==2.6.1
# via -r requirements/runtime-deps.in
Expand Down Expand Up @@ -36,7 +36,7 @@ propcache==0.4.1
# via
# -r requirements/runtime-deps.in
# yarl
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/base.txt --strip-extras requirements/base.in
#
aiodns==3.6.1
aiodns==4.0.0
# via -r requirements/runtime-deps.in
aiohappyeyeballs==2.6.1
# via -r requirements/runtime-deps.in
Expand Down Expand Up @@ -36,7 +36,7 @@ propcache==0.4.1
# via
# -r requirements/runtime-deps.in
# yarl
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand Down
12 changes: 6 additions & 6 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/constraints.txt --strip-extras requirements/constraints.in
#
aiodns==3.6.1
aiodns==4.0.0
# via
# -r requirements/lint.in
# -r requirements/runtime-deps.in
Expand Down Expand Up @@ -69,7 +69,7 @@ exceptiongroup==1.3.1
# via pytest
execnet==2.1.2
# via pytest-xdist
filelock==3.20.2
filelock==3.20.3
# via virtualenv
forbiddenfruit==0.1.4
# via blockbuster
Expand Down Expand Up @@ -130,7 +130,7 @@ packaging==25.0
# pytest
# sphinx
# wheel
pathspec==1.0.2
pathspec==1.0.3
# via mypy
pip-tools==7.5.2
# via -r requirements/dev.in
Expand All @@ -152,7 +152,7 @@ proxy-py==2.4.10
# via
# -r requirements/lint.in
# -r requirements/test-common.in
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand Down Expand Up @@ -193,7 +193,7 @@ pytest-xdist==3.8.0
# via -r requirements/test-common.in
python-dateutil==2.9.0.post0
# via freezegun
python-on-whales==0.79.0
python-on-whales==0.80.0
# via
# -r requirements/lint.in
# -r requirements/test-common.in
Expand Down Expand Up @@ -275,7 +275,7 @@ uvloop==0.21.0 ; platform_system != "Windows"
# -r requirements/lint.in
valkey==6.1.1
# via -r requirements/lint.in
virtualenv==20.36.0
virtualenv==20.36.1
# via pre-commit
wait-for-it==2.3.0
# via -r requirements/test-common.in
Expand Down
12 changes: 6 additions & 6 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/dev.txt --strip-extras requirements/dev.in
#
aiodns==3.6.1
aiodns==4.0.0
# via
# -r requirements/lint.in
# -r requirements/runtime-deps.in
Expand Down Expand Up @@ -67,7 +67,7 @@ exceptiongroup==1.3.1
# via pytest
execnet==2.1.2
# via pytest-xdist
filelock==3.20.2
filelock==3.20.3
# via virtualenv
forbiddenfruit==0.1.4
# via blockbuster
Expand Down Expand Up @@ -127,7 +127,7 @@ packaging==25.0
# pytest
# sphinx
# wheel
pathspec==1.0.2
pathspec==1.0.3
# via mypy
pip-tools==7.5.2
# via -r requirements/dev.in
Expand All @@ -149,7 +149,7 @@ proxy-py==2.4.10
# via
# -r requirements/lint.in
# -r requirements/test-common.in
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand Down Expand Up @@ -188,7 +188,7 @@ pytest-xdist==3.8.0
# via -r requirements/test-common.in
python-dateutil==2.9.0.post0
# via freezegun
python-on-whales==0.79.0
python-on-whales==0.80.0
# via
# -r requirements/lint.in
# -r requirements/test-common.in
Expand Down Expand Up @@ -265,7 +265,7 @@ uvloop==0.21.0 ; platform_system != "Windows" and implementation_name == "cpytho
# -r requirements/lint.in
valkey==6.1.1
# via -r requirements/lint.in
virtualenv==20.36.0
virtualenv==20.36.1
# via pre-commit
wait-for-it==2.3.0
# via -r requirements/test-common.in
Expand Down
12 changes: 6 additions & 6 deletions requirements/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/lint.txt --strip-extras requirements/lint.in
#
aiodns==3.6.1
aiodns==4.0.0
# via -r requirements/lint.in
annotated-types==0.7.0
# via pydantic
Expand All @@ -29,7 +29,7 @@ distlib==0.4.0
# via virtualenv
exceptiongroup==1.3.1
# via pytest
filelock==3.20.2
filelock==3.20.3
# via virtualenv
forbiddenfruit==0.1.4
# via blockbuster
Expand Down Expand Up @@ -57,7 +57,7 @@ nodeenv==1.10.0
# via pre-commit
packaging==25.0
# via pytest
pathspec==1.0.2
pathspec==1.0.3
# via mypy
platformdirs==4.5.1
# via virtualenv
Expand All @@ -67,7 +67,7 @@ pre-commit==4.5.1
# via -r requirements/lint.in
proxy-py==2.4.10
# via -r requirements/lint.in
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand All @@ -90,7 +90,7 @@ pytest-mock==3.15.1
# via -r requirements/lint.in
python-dateutil==2.9.0.post0
# via freezegun
python-on-whales==0.79.0
python-on-whales==0.80.0
# via -r requirements/lint.in
pyyaml==6.0.3
# via pre-commit
Expand Down Expand Up @@ -123,7 +123,7 @@ uvloop==0.21.0 ; platform_system != "Windows"
# via -r requirements/lint.in
valkey==6.1.1
# via -r requirements/lint.in
virtualenv==20.36.0
virtualenv==20.36.1
# via pre-commit
zlib-ng==1.0.0
# via -r requirements/lint.in
4 changes: 2 additions & 2 deletions requirements/runtime-deps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/runtime-deps.txt --strip-extras requirements/runtime-deps.in
#
aiodns==3.6.1
aiodns==4.0.0
# via -r requirements/runtime-deps.in
aiohappyeyeballs==2.6.1
# via -r requirements/runtime-deps.in
Expand Down Expand Up @@ -32,7 +32,7 @@ propcache==0.4.1
# via
# -r requirements/runtime-deps.in
# yarl
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand Down
4 changes: 2 additions & 2 deletions requirements/test-common.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ mypy-extensions==1.1.0
# via mypy
packaging==25.0
# via pytest
pathspec==1.0.2
pathspec==1.0.3
# via mypy
pkgconfig==1.5.5
# via -r requirements/test-common.in
Expand Down Expand Up @@ -83,7 +83,7 @@ pytest-xdist==3.8.0
# via -r requirements/test-common.in
python-dateutil==2.9.0.post0
# via freezegun
python-on-whales==0.79.0
python-on-whales==0.80.0
# via -r requirements/test-common.in
rich==14.2.0
# via pytest-codspeed
Expand Down
8 changes: 4 additions & 4 deletions requirements/test-ft.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/test-ft.txt --strip-extras requirements/test-ft.in
#
aiodns==3.6.1
aiodns==4.0.0
# via -r requirements/runtime-deps.in
aiohappyeyeballs==2.6.1
# via -r requirements/runtime-deps.in
Expand Down Expand Up @@ -73,7 +73,7 @@ packaging==25.0
# via
# gunicorn
# pytest
pathspec==1.0.2
pathspec==1.0.3
# via mypy
pkgconfig==1.5.5
# via -r requirements/test-common.in
Expand All @@ -87,7 +87,7 @@ propcache==0.4.1
# yarl
proxy-py==2.4.10
# via -r requirements/test-common.in
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand Down Expand Up @@ -116,7 +116,7 @@ pytest-xdist==3.8.0
# via -r requirements/test-common.in
python-dateutil==2.9.0.post0
# via freezegun
python-on-whales==0.79.0
python-on-whales==0.80.0
# via -r requirements/test-common.in
rich==14.2.0
# via pytest-codspeed
Expand Down
8 changes: 4 additions & 4 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --allow-unsafe --output-file=requirements/test.txt --strip-extras requirements/test.in
#
aiodns==3.6.1
aiodns==4.0.0
# via -r requirements/runtime-deps.in
aiohappyeyeballs==2.6.1
# via -r requirements/runtime-deps.in
Expand Down Expand Up @@ -73,7 +73,7 @@ packaging==25.0
# via
# gunicorn
# pytest
pathspec==1.0.2
pathspec==1.0.3
# via mypy
pkgconfig==1.5.5
# via -r requirements/test-common.in
Expand All @@ -87,7 +87,7 @@ propcache==0.4.1
# yarl
proxy-py==2.4.10
# via -r requirements/test-common.in
pycares==4.11.0
pycares==5.0.1
# via aiodns
pycparser==2.23
# via cffi
Expand Down Expand Up @@ -116,7 +116,7 @@ pytest-xdist==3.8.0
# via -r requirements/test-common.in
python-dateutil==2.9.0.post0
# via freezegun
python-on-whales==0.79.0
python-on-whales==0.80.0
# via -r requirements/test-common.in
rich==14.2.0
# via pytest-codspeed
Expand Down
Loading