Merge pull request #24 from siemens/tweaks

Tweak in CI and dependencies

Author: ralienpp

Makefile

@@ -93,7 +93,7 @@ autoformat:
 verify:
 	reuse lint
 	ruff check .
-	pylint .
+	pylint . --ignore-paths="^venv"
 	PYTHONPATH=./resources pyright
 	# on Windows Powershell: `$env:PYTHONPATH = "./resources"; pyright`
 

requirements-dev.txt

@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 safety>= 3.3.1, < 4.0.0
-pylint>= 3.3.8, < 4.0.0
+pylint>= 4.0.2, < 5.0.0
 black>= 25.0.0, < 26.0.0
 ruff>= 0.12.12, < 1.0.0
-robotframework-robocop==6.6.1
-robotframework-tidy==4.17.0
-pyright==1.1.405
+robotframework-robocop==6.9.2
+robotframework-tidy==4.18.0
+pyright==1.1.407
 codespell==2.4.1
-reuse==5.0.2
+reuse==6.2.0

requirements.txt

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-cryptography==45.0.7
+cryptography==46.0.3
 pyasn1==0.6.1
 pyasn1-alt-modules==0.4.6
 robotframework==7.3.2

resources/keyutils.py

@@ -460,7 +460,11 @@ def load_private_key_from_file(  # noqa: D417 for RF docs
         pass
 
     try:
-        if b"SPDX-License-Identifier:" in pem_data:
+        # The reuse tool will also look for its marker in the entire body of the
+        # file, not just the header - so in the line below it would've been
+        # triggered because `in pem_data:` is not a valid license name.
+        # Hence we don't include the complete marker, but only its prefix.
+        if b"SPDX-License" in pem_data:
             pem_data2 = _extract_and_format_key(filepath)
         else:
             pem_data2 = pem_data

scripts/write_stats.py

@@ -6,6 +6,7 @@
 from pq_logic.hybrid_key_factory import HybridKeyFactory
 from pq_logic.pq_key_factory import PQKeyFactory
 from resources.keyutils import generate_key
+from tabulate import tabulate
 
 df_pq = pd.DataFrame(columns=["name", "public_key_size", "private_key_size", "ct_length", "claimed_nist_level"])
 df_hybrid = pd.DataFrame(columns=["name", "public_key_size", "private_key_size", "ct_length"])
@@ -31,7 +32,8 @@
 
     for method in options:
         key = generate_key(algorithm=alg_name, **method)
-        entry = {"name": key.name, "public_key_size": key.public_key().key_size, "private_key_size": key.key_size, "ct_length": key.ct_length}
+        entry = {"name": key.name, "public_key_size": key.public_key().key_size,
+                 "private_key_size": key.key_size, "ct_length": key.ct_length}
         data[alg_name].append(entry)
 
 df_pq = pd.DataFrame(pq_data).sort_values(by="claimed_nist_level")
@@ -49,7 +51,7 @@
     with open(f"./data/stats/hybrid_table_{alg_name}.tex", "w") as f:
         f.write(latex_hybrid)
 
-from tabulate import tabulate
+
 
 pq_str  = tabulate(pq_data, headers="keys", tablefmt="grid")
 with open("./data/stats/pq_table.txt", "w") as f: