Skip to content

Commit 3d07471

Browse files
Bump aiodns from 3.6.1 to 4.0.0 (#11945)
Bumps [aiodns](https://github.com/saghul/aiodns) from 3.6.1 to 4.0.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/aio-libs/aiodns/blob/master/ChangeLog">aiodns's changelog</a>.</em></p> <blockquote> <h1>4.0.0</h1> <ul> <li><strong>Breaking change</strong>: Requires pycares &gt;= 5.0.0</li> <li>Added new <code>query_dns()</code> method returning native pycares 5.x <code>DNSResult</code> types</li> <li>Deprecated <code>query()</code> method - still works with backward-compatible result types</li> <li>Deprecated <code>gethostbyname()</code> method - use <code>getaddrinfo()</code> instead</li> <li>Added compatibility layer for pycares 4.x result types to ease migration</li> <li>Updated dependencies <ul> <li>Bumped pycares from 4.11.0 to 5.0.1 (<a href="https://redirect.github.com/saghul/aiodns/issues/220">#220</a>)</li> <li>Bumped pytest from 8.4.2 to 9.0.2 (<a href="https://redirect.github.com/saghul/aiodns/issues/224">#224</a>)</li> <li>Bumped pytest-asyncio from 1.2.0 to 1.3.0 (<a href="https://redirect.github.com/saghul/aiodns/issues/223">#223</a>)</li> <li>Bumped mypy from 1.19.0 to 1.19.1 (<a href="https://redirect.github.com/saghul/aiodns/issues/219">#219</a>)</li> <li>Bumped winloop from 0.3.1 to 0.4.0 (<a href="https://redirect.github.com/saghul/aiodns/issues/210">#210</a>)</li> <li>Bumped actions/upload-artifact from 5 to 6 (<a href="https://redirect.github.com/saghul/aiodns/issues/222">#222</a>)</li> <li>Bumped actions/download-artifact from 6.0.0 to 7.0.0 (<a href="https://redirect.github.com/saghul/aiodns/issues/221">#221</a>)</li> </ul> </li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/aio-libs/aiodns/commit/738b54fcec50912465eb73d5b61ef7289675fda7"><code>738b54f</code></a> Release 4.0.0 (<a href="https://redirect.github.com/saghul/aiodns/issues/225">#225</a>)</li> <li><a href="https://github.com/aio-libs/aiodns/commit/98c1db84de9d6597ae5cbd1c98eea5ebbd5c0f2e"><code>98c1db8</code></a> Bump pytest from 8.4.2 to 9.0.2 (<a href="https://redirect.github.com/saghul/aiodns/issues/224">#224</a>)</li> <li><a href="https://github.com/aio-libs/aiodns/commit/d32e6da349d958dd73428f273ca6bd6182a908b1"><code>d32e6da</code></a> Bump pytest-asyncio from 1.2.0 to 1.3.0 (<a href="https://redirect.github.com/saghul/aiodns/issues/223">#223</a>)</li> <li><a href="https://github.com/aio-libs/aiodns/commit/85776406ef44b6c83dedec55e7a33746f0cc46b1"><code>8577640</code></a> Bump pycares from 4.11.0 to 5.0.1 (<a href="https://redirect.github.com/saghul/aiodns/issues/220">#220</a>)</li> <li><a href="https://github.com/aio-libs/aiodns/commit/2a65ab2110d0abea6dc71ddd525ad20e79bf02aa"><code>2a65ab2</code></a> Add pycares 5.0 support with backward-compatible result types (<a href="https://redirect.github.com/saghul/aiodns/issues/218">#218</a>)</li> <li><a href="https://github.com/aio-libs/aiodns/commit/0fd88aa6ceeb35be2ee45b0767511425bf7b1cde"><code>0fd88aa</code></a> Bump actions/upload-artifact from 5 to 6 (<a href="https://redirect.github.com/saghul/aiodns/issues/222">#222</a>)</li> <li><a href="https://github.com/aio-libs/aiodns/commit/2d26acefc0e1e79e4ae60a2867e0f4c8b2038cd7"><code>2d26ace</code></a> Bump actions/download-artifact from 6.0.0 to 7.0.0 (<a href="https://redirect.github.com/saghul/aiodns/issues/221">#221</a>)</li> <li><a href="https://github.com/aio-libs/aiodns/commit/c2d2c9ef781c26ff6611126e3c6dacc14680bf23"><code>c2d2c9e</code></a> Bump mypy from 1.19.0 to 1.19.1 (<a href="https://redirect.github.com/saghul/aiodns/issues/219">#219</a>)</li> <li>See full diff in <a href="https://github.com/saghul/aiodns/compare/v3.6.1...v4.0.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=aiodns&package-manager=pip&previous-version=3.6.1&new-version=4.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: J. Nick Koston <nick@home-assistant.io>
1 parent b919e9d commit 3d07471

9 files changed

Lines changed: 19 additions & 20 deletions

File tree

aiohttp/resolver.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ async def resolve(
118118
hosts: list[ResolveResult] = []
119119
for node in resp.nodes:
120120
address: tuple[bytes, int] | tuple[bytes, int, int, int] = node.addr
121-
family = node.family
122-
if family == socket.AF_INET6:
121+
if node.family == socket.AF_INET6:
123122
if len(address) > 3 and address[3]:
124123
# This is essential for link-local IPv6 addresses.
125124
# LL IPv6 is a VERY rare case. Strictly speaking, we should use
@@ -133,15 +132,15 @@ async def resolve(
133132
resolved_host = address[0].decode("ascii")
134133
port = address[1]
135134
else: # IPv4
136-
assert family == socket.AF_INET
135+
assert node.family == socket.AF_INET
137136
resolved_host = address[0].decode("ascii")
138137
port = address[1]
139138
hosts.append(
140139
ResolveResult(
141140
hostname=host,
142141
host=resolved_host,
143142
port=port,
144-
family=family,
143+
family=node.family,
145144
proto=0,
146145
flags=_NUMERIC_SOCKET_FLAGS,
147146
)

requirements/base-ft.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/base-ft.txt --strip-extras requirements/base-ft.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via -r requirements/runtime-deps.in
99
aiohappyeyeballs==2.6.1
1010
# via -r requirements/runtime-deps.in
@@ -36,7 +36,7 @@ propcache==0.4.1
3636
# via
3737
# -r requirements/runtime-deps.in
3838
# yarl
39-
pycares==4.11.0
39+
pycares==5.0.1
4040
# via aiodns
4141
pycparser==2.23
4242
# via cffi

requirements/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/base.txt --strip-extras requirements/base.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via -r requirements/runtime-deps.in
99
aiohappyeyeballs==2.6.1
1010
# via -r requirements/runtime-deps.in
@@ -36,7 +36,7 @@ propcache==0.4.1
3636
# via
3737
# -r requirements/runtime-deps.in
3838
# yarl
39-
pycares==4.11.0
39+
pycares==5.0.1
4040
# via aiodns
4141
pycparser==2.23
4242
# via cffi

requirements/constraints.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/constraints.txt --strip-extras requirements/constraints.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via
99
# -r requirements/lint.in
1010
# -r requirements/runtime-deps.in
@@ -152,7 +152,7 @@ proxy-py==2.4.10
152152
# via
153153
# -r requirements/lint.in
154154
# -r requirements/test-common.in
155-
pycares==4.11.0
155+
pycares==5.0.1
156156
# via aiodns
157157
pycparser==2.23
158158
# via cffi

requirements/dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/dev.txt --strip-extras requirements/dev.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via
99
# -r requirements/lint.in
1010
# -r requirements/runtime-deps.in
@@ -149,7 +149,7 @@ proxy-py==2.4.10
149149
# via
150150
# -r requirements/lint.in
151151
# -r requirements/test-common.in
152-
pycares==4.11.0
152+
pycares==5.0.1
153153
# via aiodns
154154
pycparser==2.23
155155
# via cffi

requirements/lint.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/lint.txt --strip-extras requirements/lint.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via -r requirements/lint.in
99
annotated-types==0.7.0
1010
# via pydantic
@@ -67,7 +67,7 @@ pre-commit==4.5.1
6767
# via -r requirements/lint.in
6868
proxy-py==2.4.10
6969
# via -r requirements/lint.in
70-
pycares==4.11.0
70+
pycares==5.0.1
7171
# via aiodns
7272
pycparser==2.23
7373
# via cffi

requirements/runtime-deps.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/runtime-deps.txt --strip-extras requirements/runtime-deps.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via -r requirements/runtime-deps.in
99
aiohappyeyeballs==2.6.1
1010
# via -r requirements/runtime-deps.in
@@ -32,7 +32,7 @@ propcache==0.4.1
3232
# via
3333
# -r requirements/runtime-deps.in
3434
# yarl
35-
pycares==4.11.0
35+
pycares==5.0.1
3636
# via aiodns
3737
pycparser==2.23
3838
# via cffi

requirements/test-ft.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/test-ft.txt --strip-extras requirements/test-ft.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via -r requirements/runtime-deps.in
99
aiohappyeyeballs==2.6.1
1010
# via -r requirements/runtime-deps.in
@@ -87,7 +87,7 @@ propcache==0.4.1
8787
# yarl
8888
proxy-py==2.4.10
8989
# via -r requirements/test-common.in
90-
pycares==4.11.0
90+
pycares==5.0.1
9191
# via aiodns
9292
pycparser==2.23
9393
# via cffi

requirements/test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/test.txt --strip-extras requirements/test.in
66
#
7-
aiodns==3.6.1
7+
aiodns==4.0.0
88
# via -r requirements/runtime-deps.in
99
aiohappyeyeballs==2.6.1
1010
# via -r requirements/runtime-deps.in
@@ -87,7 +87,7 @@ propcache==0.4.1
8787
# yarl
8888
proxy-py==2.4.10
8989
# via -r requirements/test-common.in
90-
pycares==4.11.0
90+
pycares==5.0.1
9191
# via aiodns
9292
pycparser==2.23
9393
# via cffi

0 commit comments

Comments
 (0)