Merge pull request #1239 from saurabh12nxf/update-flake8-1159

Update flake8 to latest version (fixes #1159)

Author: PhilippWendler

.gitlab-ci.yml

@@ -127,7 +127,7 @@ flake8:
   stage: test
   image: python:3.10
   before_script:
-    - "pip install 'flake8<6' flake8-awesome"
+    - pip install setuptools flake8 flake8-awesome
   script:
     - flake8
   <<: *pip-cache

benchexec/check_cgroups.py

@@ -119,7 +119,7 @@ def __init__(self, options):
     def run(self):
         try:
             check_cgroup_availability(self.options.wait)
-        except BaseException as e:
+        except BaseException as e:  # noqa: B036
             self.error = e
 
 

benchexec/containerexecutor.py

@@ -543,7 +543,7 @@ def _start_execution(
                     memlimit=memlimit,
                     memory_nodes=memory_nodes,
                     result_files_patterns=result_files_patterns,
-                    *args,
+                    *args,  # noqa: B026
                     **kwargs,
                 )
                 if result is not None:
@@ -662,7 +662,7 @@ def grandchild():
                 if use_cgroup_ns:
                     container.setup_cgroup_namespace()
                 container.drop_capabilities()
-            except BaseException as e:
+            except BaseException as e:  # noqa: B036
                 # When using runexec, this logging will end up in the output.log file,
                 # where usually the tool output is. This is suboptimal, but probably
                 # better than swallowing it. (In cases where this logs something,
@@ -853,7 +853,7 @@ def child():
                 else:
                     logging.exception("Error in child process of RunExecutor")
                 return CHILD_UNKNOWN_ERROR
-            except BaseException:
+            except BaseException:  # noqa: B036
                 # Need to catch everything because this method always needs to return an
                 # int (we are inside a C callback that requires returning int).
                 logging.exception("Error in child process of RunExecutor")

benchexec/containerized_tool.py

@@ -285,7 +285,6 @@ def _call_tool_func(name, args, kwargs):
     @param args: List of arguments to be passed as positional arguments.
     @param kwargs: Dict of arguments to be passed as keyword arguments.
     """
-    global tool
     try:
         return getattr(tool, name)(*args, **kwargs)
     except SystemExit as e:

benchexec/localexecution.py

@@ -287,7 +287,7 @@ def run(self):
                 logging.critical(e)
             except BenchExecException as e:
                 logging.critical(e)
-            except BaseException:
+            except BaseException:  # noqa: B036
                 logging.exception("Exception during run execution")
             self.run_finished_callback()
             _Worker.working_queue.task_done()

benchexec/tablegenerator/util.py

@@ -422,4 +422,5 @@ class TableDefinitionError(Exception):
     """
 
     def __init__(self, message):
+        super().__init__(message)
         self.message = message

benchexec/test_runexecutor.py

@@ -951,7 +951,9 @@ def get_runexec_cmdline(self, *args, **kwargs):
 
     def execute_run(self, *args, **kwargs):
         return super(TestRunExecutorWithContainer, self).execute_run(
-            workingDir="/tmp", *args, **kwargs
+            workingDir="/tmp",
+            *args,  # noqa: B026
+            **kwargs,
         )
 
     def test_home_and_tmp_is_separate(self):

benchexec/test_tool_info.py

@@ -92,7 +92,7 @@ def log_if_unsupported(msg):
     """Catch any exception in block and log it with a message about an unsupported feature"""
     try:
         yield  # call code block to be executed
-    except BaseException as e:
+    except BaseException as e:  # noqa: B036
         logging.warning(
             "Tool-info module does not support %s: “%s”",
             msg,
@@ -134,7 +134,7 @@ def print_tool_info(tool, tool_locator):
     version = None
     try:
         version = tool.version(executable)
-    except BaseException:
+    except BaseException:  # noqa: B036
         logging.warning("Determining version failed:", exc_info=1)
     if version:
         print_value("Version", tool.version(executable))
@@ -327,7 +327,7 @@ def analyze_tool_output(tool, file, dummy_cmdline):
             result,
             extra_line=True,
         )
-    except BaseException:
+    except BaseException:  # noqa: B036
         logging.warning(
             "Tool module failed to analyze result in “%s”:", file.name, exc_info=1
         )

benchexec/tools/test.py

@@ -34,7 +34,7 @@ def test_load_tool_info_module(self):
                 logging.warning(
                     "Cannot load tool-info module %s: %s", tool_info_name, e
                 )
-            except BaseException as e:
+            except BaseException as e:  # noqa: B036
                 self.fail(f"Loading tool-info module {tool_info_name} failed: {e}")
 
 

contrib/aws/awsexecutor.py

@@ -255,7 +255,6 @@ def execute_benchmark(benchmark, output_handler):
 
 
 def stop():
-    global event_handler
     event_handler.set()
     global STOPPED_BY_INTERRUPT
     STOPPED_BY_INTERRUPT = True