From b8ef01bd970defcba795b5c595ecda025bf988d6 Mon Sep 17 00:00:00 2001
From: stubsabot <>
Date: Thu, 15 Feb 2024 00:10:40 +0000
Subject: [PATCH 1/4] [stubsabot] Bump netaddr to 1.1.*

Release: https://pypi.org/pypi/netaddr/1.1.0
Repository: https://github.com/drkjam/netaddr
Changelog: https://netaddr.readthedocs.io/en/latest/changes.html

If stubtest fails for this PR:
- Leave this PR open (as a reminder, and to prevent stubsabot from opening another PR)
- Fix stubtest failures in another PR, then close this PR

Note that you will need to close and re-open the PR in order to trigger CI
---
 stubs/netaddr/METADATA.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/netaddr/METADATA.toml b/stubs/netaddr/METADATA.toml
index a46a2730e74b..63811c749ab9 100644
--- a/stubs/netaddr/METADATA.toml
+++ b/stubs/netaddr/METADATA.toml
@@ -1,2 +1,2 @@
-version = "1.0.*"
+version = "1.1.*"
 upstream_repository = "https://github.com/drkjam/netaddr"

From fa212b453c69f927e2d1d47b628ea82e25ee13c9 Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Fri, 16 Feb 2024 22:11:27 -0800
Subject: [PATCH 2/4] Fix some stubtest complaints

---
 stubs/netaddr/netaddr/__init__.pyi      | 3 ++-
 stubs/netaddr/netaddr/cli.pyi           | 5 ++++-
 stubs/netaddr/netaddr/strategy/ipv4.pyi | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/stubs/netaddr/netaddr/__init__.pyi b/stubs/netaddr/netaddr/__init__.pyi
index 52782e2e69f9..1c68efd42cab 100644
--- a/stubs/netaddr/netaddr/__init__.pyi
+++ b/stubs/netaddr/netaddr/__init__.pyi
@@ -53,7 +53,7 @@ from netaddr.strategy.eui64 import (
     eui64_unix_expanded as eui64_unix_expanded,
     valid_str as valid_eui64,
 )
-from netaddr.strategy.ipv4 import valid_str as valid_ipv4
+from netaddr.strategy.ipv4 import valid_str as valid_ipv4, expand_partial_ipv4_address as expand_partial_ipv4_address
 from netaddr.strategy.ipv6 import (
     ipv6_compact as ipv6_compact,
     ipv6_full as ipv6_full,
@@ -116,6 +116,7 @@ __all__ = [
     "eui64_bare",
     "valid_eui64",
     "SubnetSplitter",
+    "expand_partial_ipv4_address",
 ]
 
 __version__: str
diff --git a/stubs/netaddr/netaddr/cli.pyi b/stubs/netaddr/netaddr/cli.pyi
index 3c7c5b202996..2092b4243c86 100644
--- a/stubs/netaddr/netaddr/cli.pyi
+++ b/stubs/netaddr/netaddr/cli.pyi
@@ -1,3 +1,6 @@
-from netaddr import *
+from typing import Any
+
+SHELL_NAMESPACE: dict[str, Any]
+ASCII_ART_LOGO: str
 
 def main() -> None: ...
diff --git a/stubs/netaddr/netaddr/strategy/ipv4.pyi b/stubs/netaddr/netaddr/strategy/ipv4.pyi
index b9510c4ed763..aae4045a7482 100644
--- a/stubs/netaddr/netaddr/strategy/ipv4.pyi
+++ b/stubs/netaddr/netaddr/strategy/ipv4.pyi
@@ -37,3 +37,4 @@ def valid_bin(bin_val: str) -> bool: ...
 def int_to_bin(int_val: int) -> str: ...
 def bin_to_int(bin_val: str) -> int: ...
 def expand_partial_address(addr: str) -> str: ...
+def expand_partial_ipv4_address(addr: str) -> str: ...

From 8ce5bdbe633bec06b152d76ea092f0888fe29ec3 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 17 Feb 2024 06:12:14 +0000
Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

---
 stubs/netaddr/netaddr/__init__.pyi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/netaddr/netaddr/__init__.pyi b/stubs/netaddr/netaddr/__init__.pyi
index 1c68efd42cab..5597f6473e4b 100644
--- a/stubs/netaddr/netaddr/__init__.pyi
+++ b/stubs/netaddr/netaddr/__init__.pyi
@@ -53,7 +53,7 @@ from netaddr.strategy.eui64 import (
     eui64_unix_expanded as eui64_unix_expanded,
     valid_str as valid_eui64,
 )
-from netaddr.strategy.ipv4 import valid_str as valid_ipv4, expand_partial_ipv4_address as expand_partial_ipv4_address
+from netaddr.strategy.ipv4 import expand_partial_ipv4_address as expand_partial_ipv4_address, valid_str as valid_ipv4
 from netaddr.strategy.ipv6 import (
     ipv6_compact as ipv6_compact,
     ipv6_full as ipv6_full,

From dc0a401226774919be9621068e2c39314549e5d2 Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Fri, 16 Feb 2024 22:17:03 -0800
Subject: [PATCH 4/4] grumble

---
 stubs/netaddr/netaddr/__init__.pyi      | 2 +-
 stubs/netaddr/netaddr/strategy/ipv4.pyi | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/stubs/netaddr/netaddr/__init__.pyi b/stubs/netaddr/netaddr/__init__.pyi
index 5597f6473e4b..efc922f6964e 100644
--- a/stubs/netaddr/netaddr/__init__.pyi
+++ b/stubs/netaddr/netaddr/__init__.pyi
@@ -53,7 +53,7 @@ from netaddr.strategy.eui64 import (
     eui64_unix_expanded as eui64_unix_expanded,
     valid_str as valid_eui64,
 )
-from netaddr.strategy.ipv4 import expand_partial_ipv4_address as expand_partial_ipv4_address, valid_str as valid_ipv4
+from netaddr.strategy.ipv4 import expand_partial_address as expand_partial_ipv4_address, valid_str as valid_ipv4
 from netaddr.strategy.ipv6 import (
     ipv6_compact as ipv6_compact,
     ipv6_full as ipv6_full,
diff --git a/stubs/netaddr/netaddr/strategy/ipv4.pyi b/stubs/netaddr/netaddr/strategy/ipv4.pyi
index aae4045a7482..b9510c4ed763 100644
--- a/stubs/netaddr/netaddr/strategy/ipv4.pyi
+++ b/stubs/netaddr/netaddr/strategy/ipv4.pyi
@@ -37,4 +37,3 @@ def valid_bin(bin_val: str) -> bool: ...
 def int_to_bin(int_val: int) -> str: ...
 def bin_to_int(bin_val: str) -> int: ...
 def expand_partial_address(addr: str) -> str: ...
-def expand_partial_ipv4_address(addr: str) -> str: ...