fix long-standing linting problems

Author: mattip

mesonbuild/dependencies/__init__.py

@@ -7,7 +7,6 @@
         ExternalLibrary, DependencyException, DependencyMethods,
         BuiltinDependency, SystemDependency, get_leaf_external_dependencies)
 from .detect import find_external_dependency, get_dep_identifier, packages, _packages_accept_language
-from .blas_lapack import openblas_factory
 
 
 __all__ = [

mesonbuild/dependencies/blas_lapack.py

@@ -25,14 +25,15 @@
 from .. import mesonlib
 from ..mesonlib import MachineChoice, OptionKey
 
-from .base import DependencyMethods, SystemDependency
+from .base import DependencyMethods, SystemDependency, DependencyException
 from .cmake import CMakeDependency
 from .detect import packages
 from .factory import DependencyFactory, factory_methods
 from .pkgconfig import PkgConfigDependency
 
 if T.TYPE_CHECKING:
     from ..environment import Environment
+    from . factory import DependencyGenerator
 
 """
 TODO: how to select BLAS interface layer (LP64, ILP64)?
@@ -302,7 +303,7 @@
 """
 
 
-def check_blas_machine_file(self, name: str, props: dict) -> T.Tuple[bool, T.List[str]]:
+def check_blas_machine_file(name: str, props: dict) -> T.Tuple[bool, T.List[str]]:
     # TBD: do we need to support multiple extra dirs?
     incdir = props.get(f'{name}_includedir')
     assert incdir is None or isinstance(incdir, str)
@@ -363,11 +364,11 @@ def check_symbols(self, compile_args, suffix=None, check_cblas=True,
         prototypes = "".join(f"void {symbol}{suffix}();\n" for symbol in symbols)
         calls = "  ".join(f"{symbol}{suffix}();\n" for symbol in symbols)
         code = (f"{prototypes}"
-                 "int main(int argc, const char *argv[])\n"
-                 "{\n"
+                "int main(int argc, const char *argv[])\n"
+                "{\n"
                 f"  {calls}"
-                 "  return 0;\n"
-                 "}"
+                "  return 0;\n"
+                "}"
                 )
         code = '''#ifdef __cplusplus
                extern "C" {
@@ -719,7 +720,6 @@ def detect_lapack_machine_file(self, props: dict) -> None:
             self.detect([libdir], [incdir])
 
 
-
 class AccelerateSystemDependency(BLASLAPACKMixin, SystemDependency):
     """
     Accelerate is always installed on macOS, and not available on other OSes.
@@ -765,7 +765,6 @@ def detect(self, kwargs: T.Dict[str, T.Any]) -> None:
 
         # We won't check symbols here, because Accelerate is built in a consistent fashion
         # with known symbol mangling, unlike OpenBLAS or Netlib BLAS/LAPACK.
-        return None
 
     def get_symbol_suffix(self) -> str:
         return '$NEWLAPACK' if self.interface == 'lp64' else '$NEWLAPACK$ILP64'
@@ -788,7 +787,7 @@ def parse_mkl_options(self, kwargs: T.Dict[str, T.Any]) -> None:
         if not threading_module:
             self.threading = 'iomp'
         elif len(threading_module) > 1:
-            raise mesonlib.MesonException(f'Multiple threading arguments: {threading_modules}')
+            raise mesonlib.MesonException(f'Multiple threading arguments: {threading_module}')
         else:
             # We have a single threading option specified - validate and process it
             opt = threading_module[0]
@@ -802,7 +801,7 @@ def parse_mkl_options(self, kwargs: T.Dict[str, T.Any]) -> None:
         if not sdl_module:
             self.use_sdl = 'auto'
         elif len(sdl_module) > 1:
-            raise mesonlib.MesonException(f'Multiple sdl arguments: {threading_modules}')
+            raise mesonlib.MesonException(f'Multiple sdl arguments: {threading_module}')
         else:
             # We have a single sdl option specified - validate and process it
             opt = sdl_module[0]
@@ -829,8 +828,6 @@ def parse_mkl_options(self, kwargs: T.Dict[str, T.Any]) -> None:
             raise mesonlib.MesonException(f'Linking SDL implies using LP64 and Intel OpenMP, found '
                                           f'conflicting options: {self.interface}, {self.threading}')
 
-        return None
-
 
 class MKLPkgConfigDependency(BLASLAPACKMixin, MKLMixin, PkgConfigDependency):
     """
@@ -880,7 +877,6 @@ def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.
 
         if self.use_sdl:
             self.detect_sdl()
-        return None
 
     def detect_sdl(self) -> None:
         # Use MKLROOT in addition to standard libdir(s)
@@ -910,7 +906,7 @@ def detect_sdl(self) -> None:
             self.is_found = True
             self.compile_args += incdir_args
             self.link_args += link_arg
-            if not sys.platform == 'win32':
+            if sys.platform != 'win32':
                 self.link_args += ['-lpthread', '-lm', '-ldl']
 
             # Determine MKL version