Merge pull request #960 from projectsyn/deps/black-24

Update dependency black to v24

commodore/__init__.py

@@ -1,6 +1,7 @@
 """
 Commodore. Build dynamic inventories and compile catalogs with Kapitan
 """
+
 from pathlib import Path as P
 from importlib_metadata import version
 

commodore/__main__.py

@@ -1,6 +1,7 @@
 """
 Helper module to run not-installed version (via ``python3 -m commodore``)
 """
+
 from .cli import main
 
 if __name__ == "__main__":

commodore/catalog.py

@@ -182,7 +182,6 @@ def _is_semantic_diff_kapitan_029_030(win: tuple[str, str]) -> bool:
 def _kapitan_029_030_difffunc(
     before_text: str, after_text: str, fromfile: str = "", tofile: str = ""
 ) -> tuple[Iterable[str], bool]:
-
     diff_lines, _ = _ignore_yaml_formatting_difffunc(
         before_text, after_text, fromfile, tofile
     )
@@ -198,7 +197,6 @@ def _kapitan_029_030_difffunc(
 def _ignore_yaml_formatting_difffunc(
     before_text: str, after_text: str, fromfile: str = "", tofile: str = ""
 ) -> tuple[list[str], bool]:
-
     before_objs = sorted(yaml.safe_load_all(before_text), key=K8sObject)
     before_sorted_lines = yaml.dump_all(before_objs, Dumper=IndentedListDumper).split(
         "\n"

commodore/cli/catalog.py

@@ -1,4 +1,5 @@
 """Commands which interact with cluster catalogs"""
+
 from __future__ import annotations
 
 import click

commodore/cli/component.py

@@ -1,4 +1,5 @@
 """Commands which interact with components"""
+
 from __future__ import annotations
 
 from collections.abc import Iterable

commodore/cli/inventory.py

@@ -1,4 +1,5 @@
 """Commands which interact with a Commodore (reclass) inventory"""
+
 from __future__ import annotations
 
 import json

commodore/cli/oidc.py

@@ -1,4 +1,5 @@
 """Commands which expose Commodore's OIDC login support"""
+
 import click
 
 from commodore.config import Config

commodore/cli/options.py

@@ -1,4 +1,5 @@
 """Click options which are reused for multiple commands"""
+
 import click
 
 from commodore.config import Config

commodore/cli/package.py

@@ -1,4 +1,5 @@
 """Commands which interact with config packages"""
+
 from __future__ import annotations
 
 from collections.abc import Iterable

commodore/dependency_mgmt/__init__.py

@@ -57,7 +57,6 @@ def create_package_symlink(cfg, pname: str, package: Package):
 
 
 def fetch_components(cfg: Config):
-
     """
     Download all components required by target.
 

commodore/dependency_mgmt/jsonnet_bundler.py

@@ -18,7 +18,7 @@ def jsonnet_dependencies(config: Config) -> Iterable:
     """
     dependencies = []
 
-    for (_, component) in sorted(config.get_components().items()):
+    for _, component in sorted(config.get_components().items()):
         dependencies.append(
             {
                 "source": {

commodore/dependency_templater.py

@@ -100,8 +100,7 @@ def __init__(
 
     @classmethod
     @abstractmethod
-    def from_existing(cls, config: Config, path: Path):
-        ...
+    def from_existing(cls, config: Config, path: Path): ...
 
     @classmethod
     def _base_from_existing(cls, config: Config, path: Path, deptype: str):

commodore/gitrepo/__init__.py

@@ -482,7 +482,7 @@ def checkout(self, version: Optional[str] = None):
     def _check_conflicts(self):
         """Check for conflicts in index. Raise `MergeConflict` for the first conflict
         found."""
-        for (path, blobs) in self.repo.index.unmerged_blobs().items():
+        for path, blobs in self.repo.index.unmerged_blobs().items():
             for stage, b in blobs:
                 if stage != 0:
                     raise MergeConflict(path)

commodore/gitrepo/diff.py

@@ -11,8 +11,7 @@
 class DiffFunc(Protocol):
     def __call__(
         self, before_text: str, after_text: str, fromfile: str = "", tofile: str = ""
-    ) -> tuple[Iterable[str], bool]:
-        ...
+    ) -> tuple[Iterable[str], bool]: ...
 
 
 def _colorize_diff(line: str) -> str:

commodore/inventory/lint.py

@@ -19,16 +19,14 @@
 
 
 class LintFunc(Protocol):
-    def __call__(self, file: Path, filecontents: dict[str, Any]) -> int:
-        ...
+    def __call__(self, file: Path, filecontents: dict[str, Any]) -> int: ...
 
 
 class Linter:
     @abc.abstractmethod
     def __call__(
         self, config: Config, path: Path, ignore_patterns: tuple[str, ...] = ()
-    ) -> int:
-        ...
+    ) -> int: ...
 
 
 class ComponentSpecLinter(Linter):

commodore/postprocess/__init__.py

@@ -22,8 +22,7 @@ def __call__(
         filterid: str,
         path: P,
         **filterargs: str,
-    ):
-        ...
+    ): ...
 
 
 ValidateFunc = Callable[[Config, Component, str, dict], dict]

pyproject.toml

@@ -51,7 +51,7 @@ pytest = "8.2.0"
 pytest-xdist = "3.6.1"
 pytest-benchmark = "4.0.0"
 responses = "0.25.0"
-black = "23.12.1"
+black = "24.4.2"
 pyfakefs = "5.5.0"
 pytest-cov = "5.0.0"
 pylint = "3.1.0"

tests/conftest.py

@@ -3,6 +3,7 @@
 See the pytest docs for more details:
 https://docs.pytest.org/en/latest/how-to/fixtures.html#scope-sharing-fixtures-across-classes-modules-packages-or-session
 """
+
 from __future__ import annotations
 
 import os
@@ -21,8 +22,7 @@
 
 
 class RunnerFunc(Protocol):
-    def __call__(self, args: list[str]) -> Result:
-        ...
+    def __call__(self, args: list[str]) -> Result: ...
 
 
 @pytest.fixture(autouse=True)

tests/test_catalog.py

@@ -1,6 +1,7 @@
 """
 Tests for catalog internals
 """
+
 from __future__ import annotations
 
 import os
@@ -603,7 +604,6 @@ def test_catalog_list(
     ],
 )
 def test_catalog_list_parameters(config: Config, tenant: str, sort_by: str):
-
     params = {}
 
     if tenant != "":

tests/test_cli.py

@@ -1,6 +1,7 @@
 """
 Tests for command line interface (CLI)
 """
+
 from subprocess import call
 
 

tests/test_component_compile.py

@@ -1,6 +1,7 @@
 """
 Tests for component compile command
 """
+
 import shutil
 import os
 

tests/test_component_template.py

@@ -1,6 +1,7 @@
 """
 Tests for component new command
 """
+
 from __future__ import annotations
 
 import json

tests/test_dependency_mgmt.py

@@ -1,6 +1,7 @@
 """
 Unit-tests for dependency management
 """
+
 from __future__ import annotations
 
 import os
@@ -519,7 +520,6 @@ def test_verify_component_version_overrides(cluster_params: dict, expected: str)
 def _setup_packages(
     upstream_path: Path, packages: list[str]
 ) -> dict[str, DependencySpec]:
-
     package_specs = {}
 
     for p in packages:

tests/test_dependency_mgmt_version_parsing.py

@@ -5,6 +5,7 @@
 functionality of `_read_versions()` was originally implemented directly in
 `_read_components()`.
 """
+
 from __future__ import annotations
 
 from unittest.mock import patch

tests/test_dependency_sync.py

@@ -91,7 +91,6 @@ def test_ensure_branch_no_repo(tmp_path: Path, config: Config):
 
 
 def _setup_gh_get_responses(has_open_pr: bool, clone_url: str = ""):
-
     with open(DATA_DIR / "projectsyn-package-foo-response.json", encoding="utf-8") as f:
         resp = json.load(f)
         if clone_url:
@@ -582,8 +581,7 @@ def test_message_body(tmp_path: Path, raw_message: Union[str, bytes], expected:
     assert dependency_syncer.message_body(c) == expected
 
 
-class Foo:
-    ...
+class Foo: ...
 
 
 @pytest.mark.parametrize(
@@ -617,7 +615,6 @@ def test_maybe_pause(
     pause_seconds: int,
     expected_pause: bool,
 ):
-
     start = datetime.datetime.now()
     dependency_syncer._maybe_pause(
         update_count, pr_batch_size, datetime.timedelta(seconds=pause_seconds)

tests/test_gitrepo.py

@@ -1,6 +1,7 @@
 """
 Unit-tests for git
 """
+
 from __future__ import annotations
 
 import re

tests/test_helpers.py

@@ -1,6 +1,7 @@
 """
 Unit-tests for helpers
 """
+
 from __future__ import annotations
 
 import os

tests/test_inventory_lint_components.py

@@ -207,14 +207,14 @@ def _setup_directory(tmp_path: Path):
     assert len(skip_direntries) == len(SKIP_FILECONTENTS)
 
     expected_errcount = 0
-    for (idx, (filecontents, eec)) in enumerate(LINT_FILECONTENTS):
+    for idx, (filecontents, eec) in enumerate(LINT_FILECONTENTS):
         dentry = lint_direntries[idx]
         os.makedirs(dentry.parent, exist_ok=True)
         yaml_dump(filecontents, dentry)
         # these should be skipped
         yaml_dump(filecontents, tmp_path / f".{idx}.yml")
         expected_errcount += eec
-    for (idx, (filecontents, _)) in enumerate(SKIP_FILECONTENTS):
+    for idx, (filecontents, _) in enumerate(SKIP_FILECONTENTS):
         dentry = skip_direntries[idx]
         os.makedirs(dentry.parent, exist_ok=True)
         _dump_skip_file(filecontents, dentry)

tests/test_login.py

@@ -1,6 +1,7 @@
 """
 Unit-tests for login
 """
+
 from __future__ import annotations
 
 from unittest.mock import patch

tests/test_postprocess.py

@@ -1,6 +1,7 @@
 """
 Tests for postprocessing
 """
+
 import os
 
 import click

tests/test_tokencache.py

@@ -1,6 +1,7 @@
 """
 Unit-tests for tokencache
 """
+
 import json
 
 from xdg.BaseDirectory import xdg_cache_home