chore: update Black to 24.3.0

This required disabling E704 in flake8. That seems to be expected:
psf/black#3887

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 default_stages: [commit]
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.3.0
+    rev: 24.3.0
     hooks:
       - id: black
         language_version: python3

Pipfile

@@ -8,7 +8,7 @@ verify_ssl = true
 ggshield = { editable = true, path = "." }
 
 [dev-packages]
-black = "==22.3.0"
+black = "==24.3.0"
 coverage = "*"
 flake8 = "*"
 flake8-isort = "*"

ggshield/cmd/iac/scan/all.py

@@ -105,9 +105,9 @@ def iac_scan_all(
         scan_parameters,
         ScanContext(
             command_path=ctx.command_path,
-            scan_mode=scan_mode
-            if ci_mode is None
-            else f"{scan_mode.value}/{ci_mode.value}",
+            scan_mode=(
+                scan_mode if ci_mode is None else f"{scan_mode.value}/{ci_mode.value}"
+            ),
             extra_headers={"Ci-Mode": str(ci_mode.value)} if ci_mode else None,
             target_path=directory,
         ).get_http_headers(),

ggshield/cmd/iac/scan/diff.py

@@ -186,9 +186,9 @@ def iac_scan_diff(
         scan_parameters,
         ScanContext(
             command_path=ctx.command_path,
-            scan_mode=scan_mode
-            if ci_mode is None
-            else f"{scan_mode.value}/{ci_mode.value}",
+            scan_mode=(
+                scan_mode if ci_mode is None else f"{scan_mode.value}/{ci_mode.value}"
+            ),
             extra_headers={"Ci-Mode": str(ci_mode.value)} if ci_mode else None,
             target_path=directory,
         ).get_http_headers(),

ggshield/cmd/iac/scan/iac_scan_common_options.py

@@ -9,6 +9,7 @@
 The `kwargs` argument is required due to the way click works,
 `add_common_options()` adds an argument for each option it defines.
 """
+
 from typing import Any, Callable, Sequence
 
 import click

ggshield/cmd/sca/scan/scan_common_options.py

@@ -9,6 +9,7 @@
 The `kwargs` argument is required due to the way click works,
 `add_common_options()` adds an argument for each option it defines.
 """
+
 from typing import Callable, Sequence
 
 import click

ggshield/cmd/utils/common_options.py

@@ -10,6 +10,7 @@
 The `kwargs` argument is required because due to the way click works,
 `add_common_options()` adds an argument for each option it defines.
 """
+
 from pathlib import Path
 from typing import Any, Callable, Optional, TypeVar
 

ggshield/core/config/utils.py

@@ -67,13 +67,11 @@ def get_global_path(filename: str) -> Path:
 
 
 @overload
-def find_global_config_path(*, to_write: Literal[False] = False) -> Optional[Path]:
-    ...
+def find_global_config_path(*, to_write: Literal[False] = False) -> Optional[Path]: ...
 
 
 @overload
-def find_global_config_path(*, to_write: Literal[True]) -> Path:
-    ...
+def find_global_config_path(*, to_write: Literal[True]) -> Path: ...
 
 
 def find_global_config_path(*, to_write: bool = False) -> Optional[Path]:

ggshield/core/errors.py

@@ -2,6 +2,7 @@
 This module centralizes GGShield error handling. For more details, have a look
 at doc/dev/error-handling.md.
 """
+
 import platform
 import traceback
 from enum import IntEnum

ggshield/core/scan/scan_context.py

@@ -56,7 +56,9 @@ def get_http_headers(self) -> Dict[str, str]:
 
         return {
             **{f"GGShield-{key}": str(value) for key, value in headers.items()},
-            "mode": self.scan_mode.value
-            if isinstance(self.scan_mode, ScanMode)
-            else self.scan_mode,
+            "mode": (
+                self.scan_mode.value
+                if isinstance(self.scan_mode, ScanMode)
+                else self.scan_mode
+            ),
         }

ggshield/utils/git_shell.py

@@ -129,7 +129,7 @@ def simplify_git_url(url: str) -> str:
     - extension
     https://user:pass@mygitlab.corp.com:84/path/to/repo.git -> mygitlab.corp.com/toto/titi/tata
     """
-    for (pattern, replace) in (
+    for pattern, replace in (
         (r"https?://", ""),  # Scheme
         (r".+@", ""),  # Credentials
         (r":\d*/", "/"),  # Port

ggshield/utils/os.py

@@ -67,13 +67,11 @@ def cd(newdir: Union[str, Path]) -> Iterator[None]:
 
 
 @overload
-def getenv_int(key: str, default: None = None) -> Optional[int]:
-    ...
+def getenv_int(key: str, default: None = None) -> Optional[int]: ...
 
 
 @overload
-def getenv_int(key: str, default: int) -> int:
-    ...
+def getenv_int(key: str, default: int) -> int: ...
 
 
 def getenv_int(key: str, default: Optional[int] = None) -> Optional[int]:
@@ -84,13 +82,11 @@ def getenv_int(key: str, default: Optional[int] = None) -> Optional[int]:
 
 
 @overload
-def getenv_float(key: str, default: None = None) -> Optional[float]:
-    ...
+def getenv_float(key: str, default: None = None) -> Optional[float]: ...
 
 
 @overload
-def getenv_float(key: str, default: float) -> float:
-    ...
+def getenv_float(key: str, default: float) -> float: ...
 
 
 def getenv_float(key: str, default: Optional[float] = None) -> Optional[float]:
@@ -101,13 +97,11 @@ def getenv_float(key: str, default: Optional[float] = None) -> Optional[float]:
 
 
 @overload
-def getenv_bool(key: str, default: None = None) -> Optional[bool]:
-    ...
+def getenv_bool(key: str, default: None = None) -> Optional[bool]: ...
 
 
 @overload
-def getenv_bool(key: str, default: bool) -> bool:
-    ...
+def getenv_bool(key: str, default: bool) -> bool: ...
 
 
 def getenv_bool(key: str, default: Optional[bool] = None) -> Optional[bool]:

ggshield/verticals/iac/output/iac_text_output_handler.py

@@ -462,9 +462,11 @@ def label_incident(n: int) -> str:
         format_text(
             f"[~] {num_unchanged} {label_incident(num_unchanged)} remaining",
             STYLE[
-                "iac_remaining_vulnerability"
-                if num_unchanged > 0
-                else "iac_dim_summary"
+                (
+                    "iac_remaining_vulnerability"
+                    if num_unchanged > 0
+                    else "iac_dim_summary"
+                )
             ],
         )
     )

setup.cfg

@@ -63,5 +63,5 @@ console_scripts = ggshield=ggshield.__main__:main
 [flake8]
 inline-quotes = double
 max-line-length = 120
-ignore = E203, W503
+ignore = E203, E704, W503
 exclude = **/snapshots/*.py, .venv, build