Merge pull request #1277 from projectsyn/renovate/black-26.x

Update dependency black to v26

Author: simu

commodore/component/compile.py

@@ -267,15 +267,11 @@ def _prepare_kapitan_inventory(
     # We plug "fake" Argo CD library here because every component relies on it
     # and we don't want to provide it every time when compiling a single component.
     with open(inv.lib_dir / "argocd.libjsonnet", "w", encoding="utf-8") as argocd_libf:
-        argocd_libf.write(
-            dedent(
-                """
+        argocd_libf.write(dedent("""
             local ArgoApp(component, namespace, project='', secrets=true, base=null) = {};
             local ArgoProject(name) = {};
 
             {
               App: ArgoApp,
               Project: ArgoProject,
-            }"""
-            )
-        )
+            }"""))

commodore/package/compile.py

@@ -188,15 +188,11 @@ def _setup_inventory(
     # We plug "fake" Argo CD library here because every component relies on it
     # and we don't want to provide it every time when compiling a single component.
     with open(inv.lib_dir / "argocd.libjsonnet", "w", encoding="utf-8") as argocd_libf:
-        argocd_libf.write(
-            dedent(
-                """
+        argocd_libf.write(dedent("""
             local ArgoApp(component, namespace, project='', secrets=true) = {};
             local ArgoProject(name) = {};
 
             {
               App: ArgoApp,
               Project: ArgoProject,
-            }"""
-            )
-        )
+            }"""))

poetry.lock

@@ -51,7 +51,7 @@ pytest = "9.0.2"
 pytest-xdist = "3.8.0"
 pytest-benchmark = "5.2.3"
 responses = "0.25.8"
-black = "25.12.0"
+black = "26.1.0"
 pyfakefs = "6.0.0"
 pytest-cov = "7.0.0"
 pylint = "4.0.4"

pyproject.toml

@@ -444,18 +444,14 @@ def test_kapitan_029_030_difffunc_suppresses_noise():
 
 
 def test_ignore_yaml_formatting_difffunc_keep_semantic_whitespace():
-    before_text = textwrap.dedent(
-        """
+    before_text = textwrap.dedent("""
         a:
         b: b
-        """
-    )
-    after_text = textwrap.dedent(
-        """
+        """)
+    after_text = textwrap.dedent("""
         a:
           b: b
-        """
-    )
+        """)
 
     diffs, suppressed = catalog._ignore_yaml_formatting_difffunc(
         before_text, after_text, fromfile="test", tofile="test"
@@ -477,22 +473,18 @@ def test_ignore_yaml_formatting_difffunc_keep_semantic_whitespace():
 
 
 def test_ignore_yaml_formatting_difffunc_suppresses_noise():
-    before_text = textwrap.dedent(
-        """
+    before_text = textwrap.dedent("""
         a:
         - a
         - b
         b: b
-        """
-    )
-    after_text = textwrap.dedent(
-        """
+        """)
+    after_text = textwrap.dedent("""
         a:
           - a
           - b
         b: b
-        """
-    )
+        """)
 
     diffs, suppressed = catalog._ignore_yaml_formatting_difffunc(
         before_text, after_text, fromfile="test", tofile="test"

tests/test_catalog.py

@@ -12,7 +12,6 @@
 import pytest
 import yaml
 
-
 TESTS_DIR = Path(__file__).parent / "jsonnet"
 
 

tests/test_commodore_libjsonnet.py

@@ -271,9 +271,7 @@ def _setup_render_jsonnetfile_json(tmp_path: P) -> Component:
     ur = cr.clone(upath)
     jsonnetfile = upath / "jsonnetfile.jsonnet"
     with open(jsonnetfile, "w") as jf:
-        jf.write(
-            dedent(
-                """
+        jf.write(dedent("""
             {
                version: 1,
                dependencies: [
@@ -288,9 +286,7 @@ def _setup_render_jsonnetfile_json(tmp_path: P) -> Component:
                     },
                ],
                legacyImports: true,
-            }"""
-            )
-        )
+            }"""))
     ur.index.add("*")
     ur.index.commit("initial commit")
     ur.remote().push()

tests/test_component.py

@@ -42,9 +42,7 @@ def _prepare_component(
         shutil.move(str(component_root / ".git"), str(tmp_path / component_name))
 
     with open(component_root / "component/main.jsonnet", "a") as file:
-        file.write(
-            dedent(
-                """
+        file.write(dedent("""
             {
               "test_service_account": kube.ServiceAccount('test') {
                 metadata+: {
@@ -60,9 +58,7 @@ def _prepare_component(
                   },
                 },
               },
-            }"""
-            )
-        )
+            }"""))
     return component_root
 
 
@@ -343,8 +339,7 @@ def test_component_compile_kustomize(tmp_path: P, cli_runner: RunnerFunc):
     with open(
         component_path / "component" / "kustomization.jsonnet", "w", encoding="utf-8"
     ) as f:
-        f.write(
-            """
+        f.write("""
 local com = import 'lib/commodore.libjsonnet';
 
 com.Kustomization(
@@ -359,8 +354,7 @@ def test_component_compile_kustomize(tmp_path: P, cli_runner: RunnerFunc):
   {
     namespace: 'foo',
   }
-)"""
-        )
+)""")
     with open(
         component_path / "class" / f"{component_name}.yml", "r", encoding="utf-8"
     ) as cyaml:

tests/test_component_compile.py

@@ -1729,14 +1729,12 @@ def test_component_update_raises_on_merge_conflict(
     with open(
         component_path / "lib" / "test-component.libsonnet", "w", encoding="utf-8"
     ) as f:
-        f.write(
-            """// Test contents
+        f.write("""// Test contents
 
 {
   Foo: {bar: 1, baz: false},
 }
-"""
-        )
+""")
 
     r = Repo(component_path)
     r.index.add([".cruft.json", "lib/test-component.libsonnet"])

tests/test_component_template.py

@@ -327,16 +327,11 @@ def test_print_deprecation_notices(config, capsys):
 
     config.print_deprecation_notices()
     captured = capsys.readouterr()
-    assert (
-        textwrap.dedent(
-            """
+    assert textwrap.dedent("""
             Commodore notices:
              > test 1
              > test 2
-            """
-        )
-        == captured.out
-    )
+            """) == captured.out
 
 
 def mock_get_token(url: str) -> Optional[str]: