Moving comments because ruff is too stupid to cope with them

Author: r-sharp

script_umdp3_checker/checker_dispatch_tables.py

@@ -8,12 +8,14 @@
 Standalone version of the dispatch tables from UMDP3Job
 Python translation of the original Perl module
 """
+
+from typing import Dict, Callable
+from umdp3_checker_rules import UMDP3Checker
+
 """
 ToDo : This list was checked to ensure it had something for each
        test in the original.
 """
-from typing import Dict, Callable
-from umdp3_checker_rules import UMDP3Checker
 
 # Declare version
 VERSION = "13.5.0"

script_umdp3_checker/tests/test_fortran_checks.py

@@ -1,6 +1,5 @@
 import pytest
 import sys
-import os
 from pathlib import Path
 
 # Add the current directory to Python path

script_umdp3_checker/tests/test_umdp3.py

@@ -18,8 +18,6 @@
 
 from umdp3_checker_rules import UMDP3Checker, TestResult
 from checker_dispatch_tables import CheckerDispatchTables
-from typing import Callable, Iterable, List, Dict, Set
-from dataclasses import dataclass, field
 
 # Prevent pytest from trying to collect TestResult as more tests:
 TestResult.__test__ = False
@@ -37,9 +35,6 @@ def test_basic_functionality():
         "This is a short line",
         "This is a very long line that exceeds eighty characters and should trigger a failure in the line length test",
     ]
-    expected = TestResult(
-        checker_name="Line Length Check", failure_count=1, passed=False
-    )
     result = umdp3_checker.line_over_80chars(test_lines)
     print(
         f"Line length test: {'PASS' if result.failure_count > 0 else 'FAIL'} (expected failure)"

script_umdp3_checker/umdp3_checker_rules.py

@@ -8,27 +8,27 @@
 Package to contain functions which test for UMDP3 compliance.
 Python translation of the original Perl UMDP3.pm module.
 """
-"""
-ToDo : Several of the test functions are poor shadows of the original
-       Perl versions. They would benefit from improving to catch more
-       cases.
-       Equally, there could probably be more consistancly in how things like comments are stripped from the ends of lines
-       and/or full comment lines are skipped.
-"""
+
 import re
 import threading
-from typing import List, Dict, Set
+from typing import List, Dict
 from fortran_keywords import fortran_keywords
 from search_lists import (
     obsolescent_intrinsics,
-    openmp_keywords,
-    fortran_types,
     unseparated_keywords_list,
     retired_ifdefs,
     deprecated_c_identifiers,
 )
 from dataclasses import dataclass, field
 
+"""
+ToDo : Several of the test functions are poor shadows of the original
+       Perl versions. They would benefit from improving to catch more
+       cases.
+       Equally, there could probably be more consistancly in how things like comments are stripped from the ends of lines
+       and/or full comment lines are skipped.
+"""
+
 # Declare version
 VERSION = "13.5.0"
 
@@ -203,7 +203,7 @@ def openmp_sentinels_in_column_one(self, lines: List[str]) -> TestResult:
                 self.add_extra_error("OpenMP sentinel not in column 1")
                 failures += 1
                 error_log = self.add_error_log(
-                    error_log, f"OpenMP sentinel not in column 1:", count + 1
+                    error_log, "OpenMP sentinel not in column 1:", count + 1
                 )
         output = f"Checked {count+1} lines, found {failures} failures."
         return TestResult(

script_umdp3_checker/umdp3_conformance.py

@@ -1,7 +1,7 @@
 import subprocess
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Callable, Iterable, List, Dict, Set
+from typing import Callable, List, Dict, Set
 from dataclasses import dataclass, field
 import argparse
 
@@ -353,7 +353,7 @@ def print_results(self, print_volume: int = 3) -> bool:
                     )
                     if test_result.errors:
                         print(" " * 5 + "-=-" * 30)
-                        print(" " * 5 + f" Std Error :")
+                        print(" " * 5 + " Std Error :")
                         for count, (title, info) in enumerate(
                             test_result.errors.items()
                         ):