ipilot 1.36.2__tar.gz → 1.38.0__tar.gz

{ipilot-1.36.2 → ipilot-1.38.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipilot
-Version: 1.36.2
+Version: 1.38.0
 Summary: IP Information Lookup Tool
 Author-Email: Luke Tainton <luke@tainton.uk>
 Requires-Python: <4.0,>=3.11

{ipilot-1.36.2 → ipilot-1.38.0}/app/args.py

@@ -1,5 +1,3 @@
-#!/usr/local/env python3
-
 """MODULE: Provides CLI arguments to the application."""
 
 import argparse
@@ -9,10 +7,10 @@ from app.query_normalisation import get_public_ip
 
 def parse_args() -> argparse.Namespace:  # pragma: no cover
     """Get arguments from user via the command line.
-    
+
     Args:
         None
-    
+
     Returns:
         argparse.Namespace: parsed arguments
     """

{ipilot-1.36.2 → ipilot-1.38.0}/app/ip_info.py

@@ -1,27 +1,26 @@
-#!/usr/bin/env python3
-
 """MODULE: Provides functions to call various APIs to retrieve IP/prefix information."""
 
-from typing import Optional
-
 import ipaddress
+
 import requests
 
 
-def get_ip_information(ipv4_address: ipaddress.IPv4Address) -> Optional[dict]:
+def get_ip_information(ipv4_address: ipaddress.IPv4Address) -> dict | None:
     """Retrieves information about a given IPv4 address from IP-API.com.
-    
+
     Args:
         ipv4_address (ipaddress.IPv4Address): IPv4 address to query
-    
+
     Returns:
-        Optional[dict]: API response
+        dict | None: API response
     """
     api_endpoint: str = f"http://ip-api.com/json/{ipv4_address}"
     try:
         resp: requests.Response = requests.get(api_endpoint, timeout=10)
         resp.raise_for_status()
-        ret: dict | None = resp.json() if resp.json().get("status") == "success" else None
+        ret: dict | None = (
+            resp.json() if resp.json().get("status") == "success" else None
+        )
     except (requests.exceptions.JSONDecodeError, requests.exceptions.HTTPError):
         ret = None
     return ret
@@ -29,10 +28,10 @@ def get_ip_information(ipv4_address: ipaddress.IPv4Address) -> Optional[dict]:
 
 def get_autonomous_system_number(as_info: str) -> str:
     """Parses AS number from provided AS information.
-    
+
     Args:
         as_info (str): AS information
-    
+
     Returns:
         str: AS number
     """
@@ -40,16 +39,18 @@ def get_autonomous_system_number(as_info: str) -> str:
     return as_number
 
 
-def get_prefix_information(autonomous_system: str) -> Optional[list]:
+def get_prefix_information(autonomous_system: str) -> list | None:
     """Retrieves prefix information about a given autonomous system.
-    
+
     Args:
         autonomous_system (str): autonomous system to query, e.g. AS123
-    
+
     Returns:
-        Optional[list]: API response
+        list | None: API response
     """
-    api_endpoint: str = f"https://api.hackertarget.com/aslookup/?q={str(autonomous_system)}"
+    api_endpoint: str = (
+        f"https://api.hackertarget.com/aslookup/?q={autonomous_system!s}"
+    )
     try:
         resp: requests.Response = requests.get(api_endpoint, timeout=10)
         resp.raise_for_status()

{ipilot-1.36.2 → ipilot-1.38.0}/app/main.py

@@ -1,5 +1,3 @@
-#!/usr/local/bin/python3
-
 """MODULE: Main application module."""
 
 import sys
@@ -16,15 +14,16 @@ from app.query_normalisation import is_ip_address, resolve_domain_name
 HEADER = """-----------------------------------------------
 | IP Address Information Lookup Tool (iPilot) |
 |       By Luke Tainton (@luketainton)        |
------------------------------------------------\n"""
+-----------------------------------------------
+"""
 
 
 def main() -> None:
     """Main function.
-    
+
     Args:
         None
-    
+
     Returns:
         None
     """
@@ -33,7 +32,9 @@ def main() -> None:
         print(HEADER)
 
     # Set IP to passed IP address, or resolve passed domain name to IPv4
-    ip_address = resolve_domain_name(args.query) if not is_ip_address(args.query) else args.query
+    ip_address = (
+        resolve_domain_name(args.query) if not is_ip_address(args.query) else args.query
+    )
 
     # If not given an IPv4, and can't resolve to IPv4, then throw error and exit
     if not ip_address:

{ipilot-1.36.2 → ipilot-1.38.0}/app/print_table.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """MODULE: Provides functions for preparing, then printing, retrieved data."""
 
 from tabulate import tabulate

{ipilot-1.36.2 → ipilot-1.38.0}/app/query_normalisation.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """MODULE: Provides functions that ensure an IP address is
 available to query the APIs for."""
 

{ipilot-1.36.2 → ipilot-1.38.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ipilot"
-version = "1.36.2"
+version = "1.38.0"
 description = "IP Information Lookup Tool"
 readme = "README.md"
 authors = [
@@ -17,10 +17,8 @@ app = "app.main:main"
 
 [dependency-groups]
 dev = [
-    "black<26.5.2,>=26.5.1",
     "coverage<8.0.0,>=7.5.0",
-    "pylint<4.1.0,>=4.0.4",
-    "pylint-exit<2.0.0,>=1.2.0",
+    "ruff>=0.12.0",
     "pytest<9.1.2,>=9.1.1",
     "requests-mock<2.0.0,>=1.12.1",
 ]

{ipilot-1.36.2 → ipilot-1.38.0}/tests/test_ip_info.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """MODULE: Provides test cases for app/ip_info.py."""
 
 import requests_mock
@@ -55,7 +53,7 @@ def test_get_prefix_information_broken_api_response() -> None:
     autonomous_system = "AS109"
     with requests_mock.Mocker() as mocker:
         mocker.get(
-            f"https://api.hackertarget.com/aslookup/?q={str(autonomous_system)}",
+            f"https://api.hackertarget.com/aslookup/?q={autonomous_system!s}",
             text="error",
         )
         resp = get_prefix_information(autonomous_system)
@@ -67,7 +65,7 @@ def test_get_prefix_information_bad_response() -> None:
     autonomous_system = "AS109"
     with requests_mock.Mocker() as mocker:
         mocker.get(
-            f"https://api.hackertarget.com/aslookup/?q={str(autonomous_system)}",
+            f"https://api.hackertarget.com/aslookup/?q={autonomous_system!s}",
             status_code=404,
         )
         resp = get_prefix_information(autonomous_system)

{ipilot-1.36.2 → ipilot-1.38.0}/tests/test_print_table.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """MODULE: Provides test cases for app/print_table.py."""
 
 from app.print_table import generate_prefix_string  # pragma: no cover

{ipilot-1.36.2 → ipilot-1.38.0}/tests/test_query_normalisation.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """MODULE: Provides test cases for app/query_normalisation.py."""
 
 from app.query_normalisation import (  # pragma: no cover