Styling.

MatthewHambley · MatthewHambley · commit c07125938a32 · 2025-02-28T13:18:15.000Z
diff --git a/source/fab/steps/__init__.py b/source/fab/steps/__init__.py
@@ -7,7 +7,7 @@
 Predefined build steps with sensible defaults.
 """
 import multiprocessing
-from typing import Any, Iterable, Optional, Union
+from typing import Iterable, Optional, Union
 
 from fab.metrics import send_metric
 from fab.util import by_type, TimerLogger
diff --git a/tests/system_tests/zero_config/test_zero_config.py b/tests/system_tests/zero_config/test_zero_config.py
@@ -1,11 +1,9 @@
 from pathlib import Path
 from shutil import copytree
-from subprocess import run
 
 from pytest import warns
 
 from fab.cli import cli_fab
-from fab.tools import ToolRepository
 
 
 class TestZeroConfig:
diff --git a/tests/unit_tests/steps/test_analyse.py b/tests/unit_tests/steps/test_analyse.py
@@ -6,8 +6,7 @@
 
 from fab.build_config import BuildConfig
 from fab.dep_tree import AnalysedDependent
-from fab.parse.fortran import (AnalysedFortran, FortranParserWorkaround,
-                               file_checksum)
+from fab.parse.fortran import AnalysedFortran, FortranParserWorkaround
 from fab.steps.analyse import (_add_manual_results, _add_unreferenced_deps,
                                _gen_file_deps, _gen_symbol_table, _parse_files)
 from fab.tools import ToolBox
diff --git a/tests/unit_tests/steps/test_archive_objects.py b/tests/unit_tests/steps/test_archive_objects.py
@@ -7,8 +7,6 @@
 Test for the archive step.
 """
 from pathlib import Path
-from unittest import mock
-from unittest.mock import call
 
 from pytest import raises, warns
 from pytest_subprocess.fake_process import FakeProcess
diff --git a/tests/unit_tests/steps/test_compile_c.py b/tests/unit_tests/steps/test_compile_c.py
@@ -6,7 +6,6 @@
 """
 Exercises the compiler step.
 """
-import os
 from pathlib import Path
 from unittest.mock import Mock
 
@@ -79,14 +78,13 @@ def test_vanilla(self, content,
         config, _ = content
 
         monkeypatch.setenv('CFLAGS', '-Denv_flag')
-        
+
         fake_process.register(['scc', '--version'], stdout='1.2.3')
         fake_process.register([
             'scc', '-c', '-Denv_flag', '-I', 'foo/include',
             '-Dhello', 'foo.c',
             '-o', str(config.prebuild_folder / 'foo.12df783ad.o')
         ])
-        compiler = config.tool_box[Category.C_COMPILER]
         with warns(UserWarning, match="_metric_send_conn not set, "
                                       "cannot send metrics"):
             compile_c(config=config,
@@ -110,7 +108,6 @@ def test_exception_handling(self, content,
             'scc', '-c', 'foo.c',
             '-o', str(config.build_output / '_prebuild/foo.f4399d2d.o')
         ], returncode=1)
-        compiler = config.tool_box[Category.C_COMPILER]
         with raises(RuntimeError):
             compile_c(config=config)
 
diff --git a/tests/unit_tests/steps/test_compile_fortran.py b/tests/unit_tests/steps/test_compile_fortran.py
@@ -4,7 +4,6 @@
 
 from pytest import fixture, mark, raises, warns
 from pytest_subprocess.fake_process import FakeProcess
-from pyfakefs.fake_filesystem_unittest import Patcher
 
 from fab.artefacts import ArtefactSet, ArtefactStore
 from fab.build_config import BuildConfig, FlagsConfig
@@ -66,8 +65,8 @@ def test_compile_cc_wrong_compiler(stub_tool_box,
     with raises(RuntimeError) as err:
         handle_compiler_args(config)
     assert str(err.value) \
-            == "Unexpected tool 'some Fortran compiler' of category " \
-               + "'C_COMPILER' instead of FortranCompiler"
+        == "Unexpected tool 'some Fortran compiler' of category " \
+           + "'C_COMPILER' instead of FortranCompiler"
 
 
 class TestCompilePass:
@@ -82,7 +81,7 @@ def test_vanilla(self, analysed_files, stub_tool_box: ToolBox,
         """
         a, b, c = analysed_files
 
-        fake_process.register(['sfc', '--version'], stdout = '1.2.3')
+        fake_process.register(['sfc', '--version'], stdout='1.2.3')
         fake_process.register(['sfc', fake_process.any()])
 
         uncompiled = {a, b}
@@ -91,13 +90,6 @@ def test_vanilla(self, analysed_files, stub_tool_box: ToolBox,
                                   tmp_path / 'proj/build_output/_prebuild/' / c.fpath.name)
         }
 
-        run_mp_results = [
-            (
-                CompiledFile(tmp_path / 'proj/build_output/b.f90',
-                             output_fpath=tmp_path / 'proj/build_output/_prebuild/b.123.o')
-            )
-        ]
-
         # this gets filled in
         mod_hashes: Dict[str, int] = {}
 
diff --git a/tests/unit_tests/steps/test_link.py b/tests/unit_tests/steps/test_link.py
@@ -13,7 +13,7 @@
 
 from tests.conftest import call_list
 
-from fab.artefacts import ArtefactSet, ArtefactStore
+from fab.artefacts import ArtefactSet
 from fab.build_config import BuildConfig
 from fab.steps.link import link_exe
 from fab.tools.compiler import FortranCompiler
diff --git a/tests/unit_tests/steps/test_link_shared_object.py b/tests/unit_tests/steps/test_link_shared_object.py
@@ -52,7 +52,7 @@ def test_run(fake_process: FakeProcess, monkeypatch) -> None:
         {None: {'foo.o', 'bar.o'}}
 
     with warns(UserWarning, match="_metric_send_conn not set, "
-                                    "cannot send metrics"):
+                                  "cannot send metrics"):
         link_shared_object(config, "/tmp/lib_my.so",
                            flags=['-fooflag', '-barflag'])
     assert call_list(fake_process) == [
diff --git a/tests/unit_tests/steps/test_preprocess.py b/tests/unit_tests/steps/test_preprocess.py
@@ -8,7 +8,6 @@
 from pytest import raises, warns
 from pytest_subprocess.fake_process import FakeProcess
 
-from fab.artefacts import ArtefactSet, ArtefactStore, ArtefactsGetter
 from fab.build_config import BuildConfig
 from fab.steps.preprocess import preprocess_fortran
 from fab.tools.category import Category
diff --git a/tests/unit_tests/steps/test_psyclone_unit_test.py b/tests/unit_tests/steps/test_psyclone_unit_test.py
@@ -12,7 +12,7 @@
 
 from fab.parse.x90 import AnalysedX90
 from fab.steps.psyclone import _check_override, _gen_prebuild_hash, MpCommonArgs
-from fab.util import file_checksum, string_checksum
+from fab.util import string_checksum
 
 
 class TestGenPrebuildHash:
diff --git a/tests/unit_tests/steps/test_root_inc_files.py b/tests/unit_tests/steps/test_root_inc_files.py
@@ -57,7 +57,7 @@ def test_skip_output_folder(self, stub_tool_box: ToolBox, fs) -> None:
                    match="_metric_send_conn not set, cannot send metrics"), \
              warns(DeprecationWarning,
                    match="RootIncFiles is deprecated as .inc files are due to be removed."):
-                root_inc_files(config)
+            root_inc_files(config)
         filetree: List[Path] = []
         for path, _, files in Path('/').walk():
             for file in files:
diff --git a/tests/unit_tests/tools/test_ar.py b/tests/unit_tests/tools/test_ar.py
@@ -8,9 +8,9 @@
 """
 from pathlib import Path
 
-from pytest_subprocess.fake_process import FakeProcess, ProcessRecorder
+from pytest_subprocess.fake_process import FakeProcess
 
-from tests.conftest import ExtendedRecorder, arg_list, call_list
+from tests.conftest import ExtendedRecorder, call_list
 
 from fab.tools import Category, Ar
 
@@ -43,9 +43,9 @@ def test_check_unavailable(fake_process: FakeProcess) -> None:
     """
     Tests availability failure.
     """
-    recorder = fake_process.register(['ar', '--version'],
-                                     returncode=1,
-                                     stderr="Something went wrong.")
+    fake_process.register(['ar', '--version'],
+                          returncode=1,
+                          stderr="Something went wrong.")
     ar = Ar()
     assert not ar.check_available()
     assert call_list(fake_process) == [["ar", "--version"]]
diff --git a/tests/unit_tests/tools/test_compiler.py b/tests/unit_tests/tools/test_compiler.py
@@ -29,6 +29,7 @@ class TestCompiler:
     """
     Tests base compiler tool.
     """
+
     def test_hash(self, fake_process: FakeProcess) -> None:
         """
         Tests hashing.
@@ -54,8 +55,8 @@ def test_hash(self, fake_process: FakeProcess) -> None:
         # A change in the name must change the hash, again:
         #
         cc_three = Compiler('new compiler', Path('testc'), 'test',
-                          version_regex=r'([\d.]+)',
-                          category=Category.FORTRAN_COMPILER)
+                            version_regex=r'([\d.]+)',
+                            category=Category.FORTRAN_COMPILER)
         third_hash = cc_three.get_hash()
         assert third_hash not in (first_hash, second_hash)
 
@@ -96,13 +97,14 @@ def test_openmp_control(self,
         fc.compile_file(Path("a.f90"), Path("a.o"), openmp=control)
 
         assert call_list(fake_process) \
-            == [command]
+               == [command]
 
 
 class TestCCompiler:
     """
     Tests base C compiler tool.
     """
+
     def test_construction(self) -> None:
         """
         Tests Construction.
@@ -142,6 +144,7 @@ class TestFortranCompiler:
     """
     Tests base Fortran compiler tool.
     """
+
     def test_construction(self) -> None:
         """
         Tests basic Fortran compiler construction.
@@ -296,8 +299,8 @@ def test_get_version_command_failure(self,
         """
         Tests version retrieval failure.
         """
-        recorder = fake_process.register(['sfortran', '--version'],
-                                         returncode=1)
+        fake_process.register(['sfortran', '--version'],
+                              returncode=1)
         compiler = FortranCompiler('some fortran', 'sfortran', 'some',
                                    r'Some ([\d.]+) Fortran')
         with raises(RuntimeError) as err:
@@ -354,13 +357,14 @@ def test_module_directory(self, fake_process: FakeProcess) -> None:
         assert fc._module_output_path == "/module_out"
         fc.compile_file(Path("a.f90"), Path("a.o"), openmp=False)
         assert call_list(fake_process) \
-            == [command]
+               == [command]
 
 
 class TestGcc:
     """
     Tests GCC tool.
     """
+
     def test_check_available(self, fake_process: FakeProcess) -> None:
         """
         Tests availability check.
@@ -464,6 +468,7 @@ class TestGFortran:
     """
     Tests the Fortran component of the Gnu Compiler Collection.
     """
+
     def test_constructor(self):
         """
         Tests the default constructor
@@ -546,8 +551,8 @@ def test_get_version_with_ifort_string(self,
             ifort (IFORT) 14.0.3 20140422
             Copyright (C) 1985-2014 Intel Corporation.  All rights reserved.
             """)
-        recorder =fake_process.register(['gfortran', '--version'],
-                                        stdout=version_string)
+        recorder = fake_process.register(['gfortran', '--version'],
+                                         stdout=version_string)
         gfortran = Gfortran()
         with raises(RuntimeError) as err:
             gfortran.get_version()
@@ -571,6 +576,7 @@ class TestIcc:
     """
     Tests the old Intel C compiler tool.
     """
+
     def test_icc(self):
         """
         Tests the default constructor.
@@ -617,6 +623,7 @@ class TestIFort:
     """
     Test the old Intel Fortran compiler tool.
     """
+
     def test_constructor(self) -> None:
         """
         Tests the default constructor.
@@ -699,8 +706,8 @@ def test_get_version_invalid(self, version: str,
             ifort (IFORT) {version} 20140422
             Copyright (C) 1985-2014 Intel Corporation.  All rights reserved.
             """)
-        recorder = fake_process.register(['ifort', '-V'],
-                                         stdout=version_string)
+        fake_process.register(['ifort', '-V'],
+                              stdout=version_string)
         ifort = Ifort()
         with raises(RuntimeError) as err:
             ifort.get_version()
@@ -713,6 +720,7 @@ class TestIcx:
     """
     Tests the Icx C compiler tool.
     """
+
     def test_icx(self) -> None:
         """
         Tests default constructor.
@@ -763,6 +771,7 @@ class TestIfx:
     """
     Tests Ifx Fortran tool.
     """
+
     def test_constructor(self) -> None:
         """
         Tests default constructor.
@@ -811,6 +820,7 @@ class TestNvC:
     """
     Tests the nVidia C tool.
     """
+
     def test_constructor(self) -> None:
         """
         Tests the default constructor.
@@ -842,7 +852,7 @@ def test_get_version_with_icc_string(self, fake_process: FakeProcess) -> None:
             icc (ICC) 2021.10.0 20230609
             Copyright (C) 1985-2023 Intel Corporation.  All rights reserved.
             """)
-        recorder = fake_process.register(['nvc', '-V'], stdout=version_string)
+        fake_process.register(['nvc', '-V'], stdout=version_string)
         nvc = Nvc()
         with raises(RuntimeError) as err:
             nvc.get_version()
@@ -855,6 +865,7 @@ class TestNvFortran:
     """
     Tests nVidia Fortran tool.
     """
+
     def test_nvfortran(self):
         """
         Tests default constructor.
@@ -904,6 +915,7 @@ class TestCrayC:
     """
     Tests Cray C tool.
     """
+
     def test_default_constructor(self) -> None:
         """
         Tests constructing a Craycc object without arguments.
@@ -917,7 +929,7 @@ def test_default_constructor(self) -> None:
     @mark.parametrize(['version_string', 'version'], [
         ["Cray C : Version 8.7.0  Tue Jul 23, 2024  07:39:46", (8, 7, 0)],
         [
-"""
+            """
 Cray clang version 15.0.1  (66f7391d6a03cf932f321b9f6b1d8612ef5f362c)
 
 Target: x86_64-unknown-linux-gnu
@@ -969,6 +981,7 @@ class TestCrayFortran:
     """
     Tests Cray Fortran tool.
     """
+
     def test_default_construction(self) -> None:
         """
         Tests object constructs correctly.
diff --git a/tests/unit_tests/tools/test_linker.py b/tests/unit_tests/tools/test_linker.py
@@ -11,7 +11,7 @@
 
 from tests.conftest import ExtendedRecorder
 
-from pytest import fixture, mark, raises, warns
+from pytest import mark, raises, warns
 from pytest_subprocess.fake_process import FakeProcess
 
 from tests.conftest import call_list
