Fixed sonar complaints and improved coverage

Author: aabmets

quantcrypt/internal/cli/main.py

@@ -40,7 +40,7 @@ def find_command_modules() -> Generator[ModuleType, None, None]:
     for filepath in import_dir.rglob("*.py"):
         if filepath.name == "compile.py":
             required_packages = ["cffi", "setuptools", "yaml", "requests"]
-            if not all(find_spec(pkg) is not None for pkg in required_packages):
+            if not all(find_spec(pkg) is not None for pkg in required_packages):  # pragma: no cover
                 continue
         relative_path = filepath.resolve().relative_to(package_path)
         module_path = '.'.join(relative_path.with_suffix('').parts)

quantcrypt/internal/compiler.py

@@ -110,38 +110,42 @@ def include_directive(self) -> str:
         header_file = self.source_dir / "api.h"
         return f'#include "{header_file.as_posix()}"'
 
-    @property
-    def compiler_args(self) -> list[str]:  # pragma: no cover
-        opsys = platform.system().lower()
-        arch = platform.machine().lower()
-
-        if opsys not in ("windows", "linux", "darwin"):
-            raise errors.UnsupportedPlatformError
-
+    def _windows_compiler_args(self) -> list[str]:  # pragma: no cover
         extra_flags: list[str] = []
-        unix_flags = [
+        for flag in self.required_flags:
+            extra_flags.append(f"/arch:{flag.upper()}")
+        return ["/O2", "/MD", "/nologo", *extra_flags]
+
+    def _linux_compiler_args(self) -> list[str]:  # pragma: no cover
+        arch = platform.machine().lower()
+        extra_flags = [
             "-fdata-sections", "-ffunction-sections",
-            "-O3", "-flto", "-std=c99"
+            "-O3", "-flto", "-std=c99", "-s"
         ]
-        if opsys == "windows" and arch in const.AMDArches:
+        if arch in const.AMDArches:
             for flag in self.required_flags:
-                extra_flags.append(f"/arch:{flag.upper()}")
-            return ["/O2", "/MD", "/nologo", *extra_flags]
+                extra_flags.append(f"-m{flag.lower()}")
+        elif arch in const.ARMArches:
+            march_flag = "-march=armv8.5-a"
+            for flag in self.required_flags:
+                march_flag += f"+{flag.lower()}"
+            extra_flags.append(march_flag)
+        return extra_flags
+
+    @staticmethod
+    def _darwin_compiler_args() -> list[str]:  # pragma: no cover
+        return ["-fdata-sections", "-ffunction-sections", "-O3", "-flto", "-std=c99"]
+
+    @property
+    def compiler_args(self) -> list[str]:  # pragma: no cover
+        opsys = platform.system().lower()
+        if opsys == "windows":
+            return self._windows_compiler_args()
         elif opsys == "linux":
-            extra_flags.append("-s")
-            if arch in const.AMDArches:
-                for flag in self.required_flags:
-                    extra_flags.append(f"-m{flag.lower()}")
-            elif arch in const.ARMArches:
-                march_flag = "-march=armv8.5-a"
-                for flag in self.required_flags:
-                    march_flag += f"+{flag.lower()}"
-                extra_flags.append(march_flag)
+            return self._linux_compiler_args()
         elif opsys == "darwin":
-            pass
-
-        unix_flags.extend(extra_flags)
-        return unix_flags
+            return self._darwin_compiler_args()
+        return list()
 
     @property
     def linker_args(self) -> list[str]:  # pragma: no cover

quantcrypt/internal/pqclean.py

@@ -152,11 +152,17 @@ def read_algo_metadata(spec: const.AlgoSpec) -> PQAMetaData:
     return PQAMetaData(**data)
 
 
-def check_opsys_support(spf: PQASupportedPlatform) -> str | None:
+def check_opsys_support(spf: PQASupportedPlatform, variant: const.PQAVariant) -> str | None:
+    os_name = ''
     for opsys in spf.operating_systems:
-        if platform.system().lower() == opsys.lower():
-            return opsys.lower()
-    return None
+        _os_name = opsys.lower()
+        if platform.system().lower() == _os_name:
+            os_name = _os_name
+    if os_name:
+        for x, y in const.ExcludedCombinations:
+            if x == os_name and y == variant:  # pragma: no cover
+                return None
+    return os_name or None
 
 
 def check_arch_support(impl: PQAImplementation) -> PQASupportedPlatform | None:
@@ -183,14 +189,11 @@ def check_platform_support(
         spf = check_arch_support(impl)
         if not spf:
             return None, None
-        if spf.operating_systems:
-            opsys = check_opsys_support(spf)
+        elif spf.operating_systems:
+            opsys = check_opsys_support(spf, variant)
             if not opsys:
                 return None, None
-            for x, y in const.ExcludedCombinations:
-                if x == opsys and y == variant:  # pragma: no cover
-                    return None, None
-        if spf.required_flags:  # pragma: no branch
+        elif spf.required_flags:  # pragma: no branch
             required_flags = spf.required_flags
 
     pqclean_dir = find_pqclean_dir(src_must_exist=True)

tests/test_compiler.py

@@ -12,7 +12,7 @@
 from pathlib import Path
 from unittest.mock import patch
 from quantcrypt.internal import constants as const
-from quantcrypt.internal.compiler import Compiler
+from quantcrypt.compiler import Compiler
 
 
 def test_compiler_run(alt_tmp_path):