cici-tools 0.17.0__tar.gz → 0.17.1__tar.gz

{cici_tools-0.17.0/cici_tools.egg-info → cici_tools-0.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.17.0
+Version: 0.17.1
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0

{cici_tools-0.17.0 → cici_tools-0.17.1}/cici/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.17.0'
-__version_tuple__ = version_tuple = (0, 17, 0)
+__version__ = version = '0.17.1'
+__version_tuple__ = version_tuple = (0, 17, 1)
 
-__commit_id__ = commit_id = 'ge723e80c8'
+__commit_id__ = commit_id = 'ge578edc48'

{cici_tools-0.17.0 → cici_tools-0.17.1}/cici/config/project/serializers.py

@@ -148,14 +148,19 @@ def loads(
     # verify targets exists even if empty
     data.setdefault("targets", [])
 
-    # Inject precommit/gitlab includes into each target
+    # Inject precommit/gitlab include references into each target
+    for target in data["targets"]:
+        name = target["name"]
 
-    # Debug to test injection
-    # print("Before injection:", data["targets"])
+        # if precommit hook exists in .pre-commit-hooks.yml, attach a pre-commit hook reference
+        # Injected object must match PreCommitHookTarget schema to keep msgspec happy
+        if name in precommit_hooks:
+            target["precommit_hook"] = {"name": name}
+        else:
+            # Remove key entirely when no hook exists so msgspec can apply
+            target.pop("precommit_hook", None)
 
-    for target in data["targets"]:
-        target["precommit_hook"] = {"name": target["name"]}
-        target["gitlab_include"] = {"name": target["name"]}
+        target["gitlab_include"] = {"name": name}
 
     # Debug to test injection
     # print("After injection:", data["targets"])

{cici_tools-0.17.0 → cici_tools-0.17.1/cici_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.17.0
+Version: 0.17.1
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0

{cici_tools-0.17.0 → cici_tools-0.17.1}/cici_tools.egg-info/SOURCES.txt

@@ -83,6 +83,7 @@ tests/test_build.py
 tests/test_cli.py
 tests/test_expand_job_extends.py
 tests/test_import.py
+tests/test_precommit_hook_injection.py
 tests/test_resolve_targets.py
 tests/fixtures/gitlab/extends/simple-job.yml
 tests/fixtures/gitlab/extends/.cici/.gitlab-ci.yml

cici_tools-0.17.1/tests/test_precommit_hook_injection.py

@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: UL Research Institutes
+# SPDX-License-Identifier: Apache-2.0
+
+import pytest
+
+from cici.config.project.serializers import loads
+
+CONFIG_YAML = """
+name: test-pipeline
+targets:
+  - name: A
+  - name: B
+  - name: C
+  - name: D
+"""
+# Only some targets have hooks
+PRECOMMIT_HOOKS = {"A": {}, "C": {}}
+
+
+def _target_by_name(file_obj, name: str):
+    for t in file_obj.targets:
+        if t.name == name:
+            return t
+    raise AssertionError(f"Target not found: {name}")
+
+
+@pytest.mark.parametrize(
+    "target_name, expected_has_hook",
+    [
+        ("A", True),
+        ("B", False),
+        ("C", True),
+        ("D", False),
+    ],
+)
+def test_precommit_hook_injection_is_name_based(
+    target_name: str,
+    expected_has_hook: bool,
+):
+    file_obj = loads(
+        CONFIG_YAML,
+        gitlab_ci_jobs={},  # irrelevant for this test
+        precommit_hooks=PRECOMMIT_HOOKS,  # the thing we care about
+    )
+    target = _target_by_name(file_obj, target_name)
+    # dict-or-None version
+    assert (target.precommit_hook is not None) == expected_has_hook