chore(deps-dev): fix typing issues found by updated version of mypy (#1000)

Signed-off-by: behnazh-w <[email protected]>

Author: behnazh-w

pyproject.toml

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 - 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
 
 # https://flit.pypa.io/en/latest/pyproject_toml.html
@@ -68,7 +68,7 @@ actions = [
 ]
 dev = [
     "flit >=3.2.0,<4.0.0",
-    "mypy >=1.0.0,<1.14",
+    "mypy >=1.0.0,<1.16",
     "types-pyyaml >=6.0.4,<7.0.0",
     "types-requests >=2.25.6,<3.0.0",
     "types-jsonschema >=4.22.0,<5.0.0",

src/macaron/database/views.py

@@ -34,13 +34,13 @@ def __init__(self, name: str):
         self.name = name
 
 
-@compiler.compiles(CreateView)  # type: ignore
-def _create_view(element, comp, **kw):
+@compiler.compiles(CreateView)
+def _create_view(element, comp, **kw):  # type: ignore
     return f"CREATE VIEW {element.name} AS {comp.sql_compiler.process(element.selectable, literal_binds=True)}"
 
 
-@compiler.compiles(DropView)  # type: ignore
-def _drop_view(element, comp, **kw):
+@compiler.compiles(DropView)
+def _drop_view(element, comp, **kw):  # type: ignore
     return "DROP VIEW %s" % (element.name)
 
 

src/macaron/malware_analyzer/pypi_heuristics/metadata/anomalous_version.py

@@ -80,9 +80,9 @@ def _load_defaults(self) -> tuple[int, int, int]:
         if defaults.has_section(section_name):
             section = defaults[section_name]
             return (
-                section.getint("major_threshold"),
-                section.getint("epoch_threshold"),
-                section.getint("day_publish_error"),
+                section.getint("major_threshold", 20),
+                section.getint("epoch_threshold", 3),
+                section.getint("day_publish_error", 4),
             )
         return 20, 3, 4
 

src/macaron/malware_analyzer/pypi_heuristics/metadata/closer_release_join_date.py

@@ -30,7 +30,7 @@ def _load_defaults(self) -> int:
         section_name = "heuristic.pypi"
         if defaults.has_section(section_name):
             section = defaults[section_name]
-            return section.getint("timedelta_threshold_of_join_release")
+            return section.getint("timedelta_threshold_of_join_release", 5)
         return 5
 
     def _get_maintainers_join_date(self, pypi_registry: PyPIRegistry, package_name: str) -> list[datetime] | None:

src/macaron/malware_analyzer/pypi_heuristics/metadata/high_release_frequency.py

@@ -32,7 +32,7 @@ def _load_defaults(self) -> int:
         section_name = "heuristic.pypi"
         if defaults.has_section(section_name):
             section = defaults[section_name]
-            return section.getint("releases_frequency_threshold")
+            return section.getint("releases_frequency_threshold", 2)
         return 2
 
     def analyze(self, pypi_package_json: PyPIPackageJsonAsset) -> tuple[HeuristicResult, dict[str, JsonType]]:

src/macaron/slsa_analyzer/package_registry/jfrog_maven_registry.py

@@ -141,13 +141,13 @@ def load_defaults(self) -> None:
             return
         section = defaults[section_name]
 
-        self.hostname = section.get("hostname")
+        self.hostname = section.get("hostname", "")
         if not self.hostname:
             raise ConfigurationError(
                 f'The "hostname" key is missing in section [{section_name}] of the .ini configuration file.'
             )
 
-        self.repo = section.get("repo")
+        self.repo = section.get("repo", "")
         if not self.repo:
             raise ConfigurationError(
                 f'The "repo" key is missing in section [{section_name}] of the .ini configuration file.'

src/macaron/slsa_analyzer/package_registry/maven_central_registry.py

@@ -123,20 +123,20 @@ def load_defaults(self) -> None:
             return
         section = defaults[section_name]
 
-        self.search_netloc = section.get("search_netloc")
+        self.search_netloc = section.get("search_netloc", "")
         if not self.search_netloc:
             raise ConfigurationError(
                 f'The "search_netloc" key is missing in section [{section_name}] of the .ini configuration file.'
             )
 
         self.search_scheme = section.get("search_scheme", "https")
-        self.search_endpoint = section.get("search_endpoint")
+        self.search_endpoint = section.get("search_endpoint", "")
         if not self.search_endpoint:
             raise ConfigurationError(
                 f'The "search_endpoint" key is missing in section [{section_name}] of the .ini configuration file.'
             )
 
-        self.registry_url_netloc = section.get("registry_url_netloc")
+        self.registry_url_netloc = section.get("registry_url_netloc", "")
         if not self.registry_url_netloc:
             raise ConfigurationError(
                 f'The "registry_url_netloc" key is missing in section [{section_name}] of the .ini configuration file.'

src/macaron/slsa_analyzer/package_registry/npm_registry.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 - 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023 - 2025, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
 
 """The module provides abstractions for the npm package registry."""
@@ -74,13 +74,13 @@ def load_defaults(self) -> None:
             logger.debug("npm registry is disabled in section [%s] of the .ini configuration file.", section_name)
             return
 
-        self.hostname = section.get("hostname")
+        self.hostname = section.get("hostname", "")
         if not self.hostname:
             raise ConfigurationError(
                 f'The "hostname" key is missing in section [{section_name}] of the .ini configuration file.'
             )
 
-        self.attestation_endpoint = section.get("attestation_endpoint")
+        self.attestation_endpoint = section.get("attestation_endpoint", "")
 
         if not self.attestation_endpoint:
             raise ConfigurationError(

src/macaron/slsa_analyzer/package_registry/pypi_registry.py

@@ -90,7 +90,7 @@ def load_defaults(self) -> None:
             return
         section = defaults[section_name]
 
-        self.registry_url_netloc = section.get("registry_url_netloc")
+        self.registry_url_netloc = section.get("registry_url_netloc", "")
         if not self.registry_url_netloc:
             raise ConfigurationError(
                 f'The "registry_url_netloc" key is missing in section [{section_name}] of the .ini configuration file.'
@@ -105,7 +105,7 @@ def load_defaults(self) -> None:
             fragment="",
         ).geturl()
 
-        fileserver_url_netloc = section.get("fileserver_url_netloc")
+        fileserver_url_netloc = section.get("fileserver_url_netloc", "")
         if not fileserver_url_netloc:
             raise ConfigurationError(
                 f'The "fileserver_url_netloc" key is missing in section [{section_name}] of the .ini configuration file.'