Warning only when (major, minor) versions differ

Signed-off-by: Vlad Gheorghiu <[email protected]>

Author: vsoftco

CHANGES.md

@@ -1,6 +1,12 @@
 # Pre-release
 
 - Added type checking and automatic linting/formatting, https://github.com/open-quantum-safe/liboqs-python/pull/97
+- Added a utility function for de-structuring version strings in `oqs.py`
+  - `version(version_str: str) -> tuple[str, str, str]:` - Returns a tuple
+    containing the
+    (major, minor, patch) versions
+- A warning is issued only if the liboqs-python version's major and minor
+  numbers differ from those of liboqs, ignoring the patch version
 
 # Version 0.12.0 - January 15, 2025
 

oqs/oqs.py

@@ -35,21 +35,6 @@
 logger.addHandler(logging.StreamHandler(stdout))
 
 
-def oqs_python_version() -> Union[str, None]:
-    """liboqs-python version string."""
-    try:
-        result = importlib.metadata.version("liboqs-python")
-    except importlib.metadata.PackageNotFoundError:
-        warnings.warn("Please install liboqs-python using pip install", stacklevel=2)
-        return None
-    return result
-
-
-# liboqs-python tries to automatically install and load this liboqs version in
-# case no other version is found
-OQS_VERSION = oqs_python_version()
-
-
 def _countdown(seconds: int) -> None:
     while seconds > 0:
         logger.info("Installing in %s seconds...", seconds)
@@ -226,13 +211,44 @@ def oqs_version() -> str:
     return ct.c_char_p(native().OQS_version()).value.decode("UTF-8")  # type: ignore[union-attr]
 
 
-# Warn the user if the liboqs version differs from liboqs-python version
-if oqs_version() != oqs_python_version():
-    warnings.warn(
-        f"liboqs version {oqs_version()} differs from liboqs-python version "
-        f"{oqs_python_version()}",
-        stacklevel=2,
-    )
+def oqs_python_version() -> Union[str, None]:
+    """liboqs-python version string."""
+    try:
+        result = importlib.metadata.version("liboqs-python")
+    except importlib.metadata.PackageNotFoundError:
+        warnings.warn("Please install liboqs-python using pip install", stacklevel=2)
+        return None
+    return result
+
+
+def version(version_str: str) -> tuple[str, str, str]:
+    parts = version_str.split(".")
+
+    major = parts[0] if len(parts) > 0 else ""
+    minor = parts[1] if len(parts) > 1 else ""
+    patch = parts[2] if len(parts) > 2 else ""
+
+    return major, minor, patch
+
+
+oqs_ver = oqs_version()
+oqs_ver_major, oqs_ver_minor, oqs_ver_patch = version(oqs_ver)
+
+oqs_python_ver = oqs_python_version()
+if oqs_python_ver:
+    oqs_python_ver_major, oqs_python_ver_minor, oqs_python_ver_patch = version(oqs_python_ver)
+    # Warn the user if the liboqs version differs from liboqs-python version
+    if not (oqs_ver_major == oqs_python_ver_major and oqs_ver_minor == oqs_python_ver_minor):
+        warnings.warn(
+            f"liboqs version (major, minor) {oqs_version()} differs from liboqs-python version "
+            f"{oqs_python_version()}",
+            stacklevel=2,
+        )
+
+
+# liboqs-python tries to automatically install and load this liboqs version in
+# case no other version is found
+OQS_VERSION = oqs_python_version()
 
 
 class MechanismNotSupportedError(Exception):