Upgrade Black to 24.x and reformat

sosy-lab · Jan 29, 2024 · dfe81d6 · dfe81d6
1 parent 4e92cf5
commit dfe81d6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -91,7 +91,7 @@ check-format:
   stage: test
   image: python:3.9
   before_script:
-    - pip install 'black<24'
+    - pip install 'black<25'
   script:
     - black . --check --diff
   <<: *pip-cache

diff --git a/benchexec/containerexecutor.py b/benchexec/containerexecutor.py
@@ -346,16 +346,12 @@ def __init__(
         self._uid = (
             uid
             if uid is not None
-            else container.CONTAINER_UID
-            if container_system_config
-            else os.getuid()
+            else container.CONTAINER_UID if container_system_config else os.getuid()
         )
         self._gid = (
             gid
             if gid is not None
-            else container.CONTAINER_GID
-            if container_system_config
-            else os.getgid()
+            else container.CONTAINER_GID if container_system_config else os.getgid()
         )
         self._allow_network = network_access
         self._env_override = {}

diff --git a/benchexec/tools/depthk.py b/benchexec/tools/depthk.py
@@ -16,7 +16,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     """
     This class serves as tool adaptor for DepthK
     Autor: Williame Rocha - [email protected] - Federal University of Amazonas, Brazil.

diff --git a/benchexec/tools/jcwit.py b/benchexec/tools/jcwit.py
@@ -10,7 +10,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool2):
-
     """
     Tool info for jcwit
     """

diff --git a/benchexec/tools/wit4java.py b/benchexec/tools/wit4java.py
@@ -11,7 +11,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool2):
-
     """
     Tool info for wit4java
     """

diff --git a/contrib/p4/p4_run_setup.py b/contrib/p4/p4_run_setup.py
@@ -45,17 +45,17 @@ def update_runsets(self):
                         prop = [result.Property("/", False, "Yo")]
                         run.properties = prop
                         if run.identifier in expected_dict and len(prop) > 0:
-                            run.expected_results[
-                                prop[0].filename
-                            ] = result.ExpectedResult(
-                                expected_dict[run.identifier] == "True"
-                                or expected_dict[run.identifier] == "true",
-                                None,
+                            run.expected_results[prop[0].filename] = (
+                                result.ExpectedResult(
+                                    expected_dict[run.identifier] == "True"
+                                    or expected_dict[run.identifier] == "true",
+                                    None,
+                                )
                             )
                         else:
-                            run.expected_results[
-                                prop[0].filename
-                            ] = result.ExpectedResult(True, None)
+                            run.expected_results[prop[0].filename] = (
+                                result.ExpectedResult(True, None)
+                            )
                         runSet.runs.append(run)
 
     def _read_expected_result_json(self, json_file_path):