ipaddons 0.5.0__tar.gz → 0.6.1__tar.gz

{ipaddons-0.5.0 → ipaddons-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: ipaddons
-Version: 0.5.0
+Version: 0.6.1
 Summary: Additional tools for the ipaddress standard library module
 Project-URL: documentation, https://ipaddons.readthedocs.io/
 Project-URL: homepage, https://gitlab.com/sebastianw/ipaddons/
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Utilities
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{ipaddons-0.5.0 → ipaddons-0.6.1}/pyproject.toml

@@ -20,6 +20,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Topic :: Utilities",
 ]
 dynamic = [ "version" ]
@@ -40,10 +41,10 @@ docs = [
 ]
 
 [tool.hatch]
-build.hooks.vcs.version-file = "src/ipaddons/_version.py"
-build.targets.sdist.only-include = [ "src/ipaddons", "tests" ]
 version.source = "vcs"
 version.raw-options.local_scheme = "no-local-version"
+build.hooks.vcs.version-file = "src/ipaddons/_version.py"
+build.targets.sdist.only-include = [ "src/ipaddons", "tests" ]
 
 [tool.uv]
 [[tool.uv.index]]
@@ -119,16 +120,16 @@ lint.isort.required-imports = [ "from __future__ import annotations" ]
 lint.future-annotations = true
 
 [tool.pyproject-fmt]
-max_supported_python = "3.14"
 column_width = 120
 indent = 4
+max_supported_python = "3.15"
 
 [tool.mypy]
+exclude = [ "^src/[^/]+/_version\\.py$" ]
 disallow_untyped_defs = true
 pretty = true
 show_error_codes = true
-exclude = [ "^src/[^/]+/_version\\.py$" ]
 
 [tool.pytest]
-ini_options.addopts = "--color=yes"
 ini_options.testpaths = [ "tests" ]
+ini_options.addopts = "--color=yes"

{ipaddons-0.5.0 → ipaddons-0.6.1}/src/ipaddons/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.5.0'
-__version_tuple__ = version_tuple = (0, 5, 0)
+__version__ = version = '0.6.1'
+__version_tuple__ = version_tuple = (0, 6, 1)
 
 __commit_id__ = commit_id = None

{ipaddons-0.5.0 → ipaddons-0.6.1}/src/ipaddons/tools.py

@@ -100,9 +100,10 @@ def free_ranges(superrange: NetworkRange, used_ranges: list[NetworkRange]) -> Ge
     :return: An interator for free ranges.
     """
     remaining_superrange = superrange
-    # Make values unique and sort them. This is crucial when interating over them.
+    # Make used ranges unique and sort them. This is crucial when iterating over them, as we always remove them from the
+    # beginning of the (remaining) superrange.
     used_ranges = list(dict.fromkeys(used_ranges))
-    used_ranges = sorted(used_ranges, key=lambda x: (x[0], -x[1]))
+    used_ranges.sort(key=lambda x: (x[0], -x[1]))
     for used_range in used_ranges:
         if not range_overlap(superrange, used_range):
             msg = f"{used_range} does not overlap with {remaining_superrange}"
@@ -114,7 +115,7 @@ def free_ranges(superrange: NetworkRange, used_ranges: list[NetworkRange]) -> Ge
             # Subrange ends below or begins above remaining superrange, ignore.
             continue
         if remaining_superrange[0] == used_range[0]:
-            # Used range is at the beginning of remaining superrange, shrink it.
+            # Used range is at the beginning of remaining superrange, shrink the superrange to exclude the used range.
             remaining_superrange = used_range[1] + 1, remaining_superrange[1]
             continue
         # There is a free range between the beginning of the remaining superrange and the current used range.
@@ -167,14 +168,13 @@ def net_size_iterator(
     supernet_range = int(supernet[0]), int(supernet[-1])
     if used_ranges is None:
         used_ranges = []
-    for free_range in free_ranges(supernet_range, used_ranges):
-        free_range_boundary = (
-            # Large IPv6 integers are tricky...
-            _ceildiv(free_range[0], cidr_size) * cidr_size,
-            free_range[1] // cidr_size * cidr_size - 1,
-        )
-        for s in range(free_range_boundary[0], free_range_boundary[1] + cidr_size, cidr_size):
-            yield s, s + cidr_size - 1
+    for free_range_start, free_range_end in free_ranges(supernet_range, used_ranges):
+        free_net_start = _ceildiv(free_range_start, cidr_size) * cidr_size
+        free_net_end = free_net_start + cidr_size - 1
+        while free_net_end <= free_range_end:
+            yield free_net_start, free_net_end
+            free_net_start += cidr_size
+            free_net_end += cidr_size
 
 
 class _BaseIPAllocation(ABC, Generic[_N]):

{ipaddons-0.5.0 → ipaddons-0.6.1}/tests/test_ip_allocation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ipaddress
-from typing import Any, NamedTuple
+from typing import Any, NamedTuple, overload
 
 import pytest
 
@@ -14,6 +14,14 @@ class Net(NamedTuple):
     range: tuple[int, int]
 
 
+@overload
+def make_nets(input_str: str) -> Net: ...
+
+
+@overload
+def make_nets(input_str: list[str]) -> list[Net]: ...
+
+
 def make_nets(input_str: str | list[str]) -> Net | list[Net]:
     if isinstance(input_str, str):
         single = True
@@ -31,6 +39,14 @@ def make_nets(input_str: str | list[str]) -> Net | list[Net]:
     return ret
 
 
+@overload
+def net_attr(nets: Net, attribute: str) -> Any: ...
+
+
+@overload
+def net_attr(nets: list[Net], attribute: str) -> list[Any]: ...
+
+
 def net_attr(nets: Net | list[Net], attribute: str) -> Any | list[Any]:
     if isinstance(nets, Net):
         return getattr(nets, attribute)
@@ -105,7 +121,7 @@ def test_base_abstract_methods():
         TypeError,
         match=r"Can't instantiate abstract class TestAllocation without an implementation for abstract methods '_max_prefixlen', '_network_class', '_version'",
     ):
-        TestAllocation()
+        TestAllocation("10.0.0.0/8")
 
 
 @pytest.mark.parametrize(
@@ -117,6 +133,16 @@ def test_base_abstract_methods():
         ("2001:db8::/32", ["2001:db8:4::/48", "2001:db8:fca::/120"], 48, "2001:db8::/48", "2001:db8:ffff::/48", 65534),
         ("10.0.0.0/8", ["10.5.0.0/16", "10.255.0.0/24"], 16, "10.0.0.0/16", "10.254.0.0/16", 254),
         ("2001:db8::/32", ["2001:db8:4::/48", "2001:db8:ffff::/120"], 48, "2001:db8::/48", "2001:db8:fffe::/48", 65534),
+        (
+            "10.66.0.0/16",
+            ["10.66.0.0/24", "10.66.2.64/29", "10.66.4.128/25"],
+            24,
+            "10.66.1.0/24",
+            "10.66.255.0/24",
+            253,
+        ),
+        ("10.0.0.0/24", [], 32, "10.0.0.0/32", "10.0.0.255/32", 256),
+        ("10.0.0.0/24", [], 24, "10.0.0.0/24", "10.0.0.0/24", 1),
     ],
 )
 def test_free_networks(supernet, used_nets, cidr, first_free, last_free, num_subnets):
@@ -129,11 +155,11 @@ def test_free_networks(supernet, used_nets, cidr, first_free, last_free, num_sub
 
 @pytest.mark.parametrize(
     ("subnet", "subnet_range"),
-    zip(
+    list(zip(
         net_attr(v4_subnets, "ipa") + net_attr(v6_subnets, "ipa"),
         net_attr(v4_subnets, "range") + net_attr(v6_subnets, "range"),
         strict=True,
-    ),
+    )),
 )
 def test_netrange(subnet, subnet_range):
     assert tools.netrange(subnet) == subnet_range
@@ -322,7 +348,7 @@ def test_free_ranges_mismatch(supernet_range, subnet_ranges):
     ],
 )
 class TestNoFreeRanges:
-    def test_no_free_ranges(self, supernet, subnets, free_size):
+    def test_no_free_ranges(self, supernet, subnets, free_size):  # noqa: ARG002
         range_iterator = tools.free_ranges(supernet.range, net_attr(subnets, "range"))
         with pytest.raises(StopIteration):
             next(range_iterator)