ipaddons 0.2.2__tar.gz → 0.2.3__tar.gz

{ipaddons-0.2.2 → ipaddons-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipaddons
-Version: 0.2.2
+Version: 0.2.3
 Summary: Additional tools for the ipaddress standard library module
 Project-URL: docs, https://ipaddress-tools.readthedocs.io/stable/
 Project-URL: homepage, https://ipaddress-tools.readthedocs.io/stable/

{ipaddons-0.2.2 → ipaddons-0.2.3}/pyproject.toml

@@ -112,6 +112,8 @@ lint.isort.required-imports = [ "from __future__ import annotations" ]
 lint.future-annotations = true
 
 per-file-ignores."tests/**/*.py" = [
+    "D",
+    "DOC",
     "I002",
     "INP",
 ]

{ipaddons-0.2.2 → ipaddons-0.2.3}/src/ipaddons/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.2.3'
+__version_tuple__ = version_tuple = (0, 2, 3)
 
 __commit_id__ = commit_id = None

{ipaddons-0.2.2 → ipaddons-0.2.3}/src/ipaddons/tools.py

@@ -81,6 +81,9 @@ def merge_ranges(ranges: list[NetworkRange]) -> list[NetworkRange]:
     :param ranges: A list of network ranges.
     :return: A list of network ranges with overlapping ranges merged into one.
     """
+    if not len(ranges):
+        # Empty range
+        return []
     sorted_ranges = sorted(ranges, reverse=True)
     merged_ranges = []
     base = sorted_ranges.pop()

{ipaddons-0.2.2 → ipaddons-0.2.3}/tests/test_ip_allocation.py

@@ -57,6 +57,10 @@ mergeable_subnets = [
         (v4_supernet_string, v4_subnet_strings, IPv4Allocation, ipaddress.IPv4Network),
         (v6_supernet, v6_subnets, IPv6Allocation, ipaddress.IPv6Network),
         (v6_supernet_string, v6_subnet_strings, IPv6Allocation, ipaddress.IPv6Network),
+        (v4_supernet, v4_subnets[:1], IPv4Allocation, ipaddress.IPv4Network),
+        (v6_supernet, v6_subnets[:1], IPv6Allocation, ipaddress.IPv6Network),
+        (v4_supernet, [], IPv4Allocation, ipaddress.IPv4Network),
+        (v6_supernet, [], IPv6Allocation, ipaddress.IPv6Network),
     ],
 )
 def test_allocation_classes(supernet, subnets, allocation_class, network_class):
@@ -86,7 +90,20 @@ def test_allocation_ranges(supernet, subnets, subnet_ranges):
     assert sorted(a._used_network_ranges) == sorted(subnet_ranges)
 
 
-@pytest.mark.parametrize("subnets", mergeable_subnets)
+@pytest.mark.parametrize(
+    "subnets",
+    mergeable_subnets,
+)
 def test_merge(subnets):
     covering_prefix = subnets[0]
     assert tools.merge_ranges(subnets) == [covering_prefix]
+
+@pytest.mark.parametrize(
+    "subnets",
+    mergeable_subnets,
+)
+def test_merge_one(subnets):
+    assert tools.merge_ranges(subnets[:1]) == subnets[:1]
+
+def test_merge_empty():
+    assert tools.merge_ranges([]) == []