Resolve conflicts

Bump deps

Signed-off-by: andrew000 <[email protected]>

Author: andrew000

.github/workflows/python_detailed.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v5
         with:
           version: "latest"
           enable-cache: true

.github/workflows/python_simplified.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v5
         with:
           version: "latest"
           enable-cache: true

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
       - id: "check-json"
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.8.2
+    rev: v0.9.3
     hooks:
       - id: ruff
         args: [ "--fix" ]

Makefile

@@ -2,11 +2,6 @@ src-dir = oqs
 tests-dir = tests
 examples-dir = examples
 
-.PHONY pull:
-pull:
-	git pull origin master
-	git submodule update --init --recursive
-
 .PHONY lint:
 lint:
 	echo "Running ruff..."
@@ -26,7 +21,7 @@ format:
 .PHONE mypy:
 mypy:
 	echo "Running MyPy..."
-	uv run mypy --config-file pyproject.toml
+	uv run mypy --config-file pyproject.toml $(src-dir)
 
 .PHONY outdated:
 outdated:

examples/kem.py

@@ -1,4 +1,5 @@
 # Key encapsulation Python example
+
 import logging
 from pprint import pformat
 
@@ -16,7 +17,7 @@
 kemalg = "ML-KEM-512"
 with oqs.KeyEncapsulation(kemalg) as client:
     with oqs.KeyEncapsulation(kemalg) as server:
-        logger.info("Client details: %s", pformat(client.details))
+        logger.info("Key encapsulation details: %s", pformat(client.details))
 
         # Client generates its keypair
         public_key_client = client.generate_keypair()

examples/rand.py

@@ -1,4 +1,5 @@
 # Various RNGs Python example
+
 import logging
 import platform  # to learn the OS we're on
 

examples/sig.py

@@ -1,4 +1,5 @@
 # Signature Python example
+
 import logging
 from pprint import pformat
 

oqs/__init__.py

@@ -17,11 +17,11 @@
 )
 
 __all__ = (
+    "OQS_SUCCESS",
+    "OQS_VERSION",
     "KeyEncapsulation",
     "MechanismNotEnabledError",
     "MechanismNotSupportedError",
-    "OQS_SUCCESS",
-    "OQS_VERSION",
     "Signature",
     "get_enabled_kem_mechanisms",
     "get_enabled_sig_mechanisms",