prepare-assignment 0.4.4__tar.gz → 0.4.5__tar.gz

{prepare_assignment-0.4.4 → prepare_assignment-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: prepare-assignment
-Version: 0.4.4
+Version: 0.4.5
 Summary: Prepare assignment
 Author-email: Bonajo <m.bonajo@fontys.nl>
 License: MIT

{prepare_assignment-0.4.4 → prepare_assignment-0.4.5}/prepare_assignment/core/preparer.py

@@ -77,18 +77,18 @@ def __build_json_schema(props: TaskProperties, task: TaskDefinition) -> Dict[str
         },
         "required": ["uses"],
     }
-    if len(task.inputs) > 0:
-        properties: Dict[str, Any] = {}
-        required: List[str] = []
-        for inp in task.inputs:
-            properties[inp.name] = inp.to_schema_definition()
-            if inp.required:
-                required.append(inp.name)
-        with_schema: Dict[str, Any] = {"type": "object", "additionalProperties": False, "properties": properties}
-        if len(required) > 0:
-            with_schema["required"] = required
-            schema["required"].append("with")
-        schema["properties"]["with"] = with_schema
+    # A task without inputs still accepts an empty 'with'
+    properties: Dict[str, Any] = {}
+    required: List[str] = []
+    for inp in task.inputs:
+        properties[inp.name] = inp.to_schema_definition()
+        if inp.required:
+            required.append(inp.name)
+    with_schema: Dict[str, Any] = {"type": "object", "additionalProperties": False, "properties": properties}
+    if len(required) > 0:
+        with_schema["required"] = required
+        schema["required"].append("with")
+    schema["properties"]["with"] = with_schema
     return schema
 
 
@@ -273,8 +273,6 @@ def __prepare_tasks(tasks: List[Any], parsed: Optional[Dict[str, ValidableTask]]
         else:
             logger.debug(f"Task '{props}' has already been loaded in this run")
         if check_inputs and file is not None:
-            if task_def.get("with", None) is None:
-                task_def["with"] = {}
             validate_tasks(file, task_def, parsed[str(props)]["schema"])
     logger.debug("All (sub-)tasks prepared")
     return parsed

{prepare_assignment-0.4.4 → prepare_assignment-0.4.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "prepare-assignment"
-version = "0.4.4"
+version = "0.4.5"
 description = "Prepare assignment"
 authors = [{name = "Bonajo", email = "m.bonajo@fontys.nl"}]
 license = {text = "MIT"}

{prepare_assignment-0.4.4 → prepare_assignment-0.4.5}/tests/core/test_preparer.py

@@ -8,7 +8,7 @@ import pytest
 from pytest_mock import MockerFixture
 
 from prepare_assignment.core.preparer import prepare_tasks, __task_install_dependencies
-from prepare_assignment.data.errors import DependencyError, PrepareTaskError
+from prepare_assignment.data.errors import DependencyError, PrepareTaskError, ValidationError
 from virtualenv import cli_run  # type: ignore
 
 from prepare_assignment.utils.files import remove_tree
@@ -317,3 +317,36 @@ def test_cached_composite_duplicate_id_is_rejected(mocker: MockerFixture) -> Non
     with pytest.raises(PrepareTaskError) as exc:
         prepare_tasks("prepare.yml", prepare)
     assert "multiple steps with id 'same'" in str(exc.value.cause)
+
+
+NO_INPUTS_TASK: Final[Dict[str, Any]] = {
+    'id': 'noinputs',
+    'name': 'No inputs',
+    'description': 'Task without inputs',
+    'runs': {'using': 'composite', 'tasks': [{'name': 'say', 'run': 'echo hello'}]}
+}
+
+
+@pytest.mark.parametrize("step", [
+    {'name': 'no with', 'uses': 'noinputs'},
+    {'name': 'empty with', 'uses': 'noinputs', 'with': {}},
+    {'name': 'null with', 'uses': 'noinputs', 'with': None},
+])
+def test_task_without_inputs(mocker: MockerFixture, step: Dict[str, Any]) -> None:
+    __clean_cache()
+    mocker.patch("prepare_assignment.core.preparer.__download_task",
+                 side_effect=lambda props: props.repo_path.mkdir(parents=True, exist_ok=True))
+    mocker.patch("prepare_assignment.core.preparer.validate_task_definition", return_value=NO_INPUTS_TASK)
+    mapping = prepare_tasks("prepare.yml", {'prepare': [step]})
+    assert list(mapping) == ["prepare-assignment/noinputs@latest"]
+
+
+def test_task_without_inputs_rejects_unknown_input(mocker: MockerFixture) -> None:
+    __clean_cache()
+    mocker.patch("prepare_assignment.core.preparer.__download_task",
+                 side_effect=lambda props: props.repo_path.mkdir(parents=True, exist_ok=True))
+    mocker.patch("prepare_assignment.core.preparer.validate_task_definition", return_value=NO_INPUTS_TASK)
+    step = {'name': 'typo', 'uses': 'noinputs', 'with': {'inptu': 'x'}}
+    with pytest.raises(ValidationError) as exc:
+        prepare_tasks("prepare.yml", {'prepare': [step]})
+    assert "'inptu' was unexpected" in exc.value.message