cook-build 0.7.1__tar.gz → 0.7.2__tar.gz

{cook_build-0.7.1/src/cook_build.egg-info → cook_build-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cook-build
-Version: 0.7.1
+Version: 0.7.2
 Summary: A task-centric build system with simple declarative recipes specified in Python
 Author: Till Hoffmann
 License: BSD-3-Clause

{cook_build-0.7.1 → cook_build-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cook-build"
-version = "0.7.1"
+version = "0.7.2"
 description = "A task-centric build system with simple declarative recipes specified in Python"
 readme = "README.md"
 license = {text = "BSD-3-Clause"}

{cook_build-0.7.1 → cook_build-0.7.2}/src/cook/actions.py

@@ -36,6 +36,7 @@ executor with a deprecation warning.
 """
 
 import asyncio
+import functools
 import hashlib
 import logging
 import os
@@ -94,7 +95,9 @@ class FunctionAction(Action):
         else:
             # Run sync function in executor
             loop = asyncio.get_running_loop()
-            await loop.run_in_executor(None, self.func, task, *self.args, **self.kwargs)
+            await loop.run_in_executor(
+                None, functools.partial(self.func, task, *self.args, **self.kwargs)
+            )
 
 
 class SubprocessAction(Action):

{cook_build-0.7.1 → cook_build-0.7.2}/src/cook/contexts.py

@@ -152,7 +152,7 @@ class create_target_directories(Context):
                 create = self.manager.create_task(
                     name,
                     action=actions.FunctionAction(
-                        lambda _: target.parent.mkdir(parents=True, exist_ok=True)
+                        lambda _, p=target.parent: p.mkdir(parents=True, exist_ok=True)
                     ),
                 )
             task.task_dependencies.append(create)

{cook_build-0.7.1 → cook_build-0.7.2}/src/cook/controller.py

@@ -290,8 +290,8 @@ class Controller:
             dep_futures = [task_futures[dep] for dep in dep_tasks]
             await asyncio.gather(*dep_futures)
 
-        start = datetime.now()
         digest = self._evaluate_task_hexdigest(task)
+        start: datetime | None = None
 
         try:
             # Log what we're doing
@@ -307,22 +307,19 @@ class Controller:
                         "  action: %s",
                         task.action,
                     )
-            else:
-                LOGGER.log(
-                    logging.DEBUG if task.name.startswith("_") else logging.INFO,
-                    "executing %s ...",
-                    task,
-                )
-
-            # Update DB for start
-            if not dry_run:
-                params = {"name": task.name, "last_started": start}
-                self.connection.execute(QUERIES["upsert_task_started"], params)
-                self.connection.commit()
 
             # Execute the task
             if not dry_run:
                 async with semaphore:
+                    start = datetime.now()
+                    LOGGER.log(
+                        logging.DEBUG if task.name.startswith("_") else logging.INFO,
+                        "executing %s ...",
+                        task,
+                    )
+                    params = {"name": task.name, "last_started": start}
+                    self.connection.execute(QUERIES["upsert_task_started"], params)
+                    self.connection.commit()
                     await task.execute()
 
                 # Check that all targets were created
@@ -344,6 +341,7 @@ class Controller:
                 self.connection.commit()
 
                 # Log completion
+                assert start is not None
                 delta = util.format_timedelta(datetime.now() - start)
                 LOGGER.log(
                     logging.DEBUG if task.name.startswith("_") else logging.INFO,
@@ -362,7 +360,7 @@ class Controller:
                 self.connection.execute(QUERIES["upsert_task_failed"], params)
                 self.connection.commit()
 
-            delta = util.format_timedelta(datetime.now() - start)
+            delta = util.format_timedelta(datetime.now() - start) if start else "?"
             LOGGER.exception("failed to execute %s after %s", task, delta)
             raise util.FailedTaskError(ex, task=task) from ex
 

{cook_build-0.7.1 → cook_build-0.7.2}/src/cook/manager.py

@@ -150,7 +150,7 @@ def create_task(
 
     Args:
         name: Name of the new task. Defaults to the string representation of the first
-            dependency if not provided.
+            target if not provided.
         action: Action to execute or a string for shell commands.
         targets: Paths for files to be generated.
         dependencies: Paths to files on which this task depends.

{cook_build-0.7.1 → cook_build-0.7.2/src/cook_build.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cook-build
-Version: 0.7.1
+Version: 0.7.2
 Summary: A task-centric build system with simple declarative recipes specified in Python
 Author: Till Hoffmann
 License: BSD-3-Clause

{cook_build-0.7.1 → cook_build-0.7.2}/tests/test_actions.py

@@ -158,6 +158,18 @@ async def test_module_action_debug() -> None:
         create_subprocess.assert_called_with(sys.executable, "-m", "pytest")
 
 
+@pytest.mark.asyncio
+async def test_sync_function_action_with_kwargs() -> None:
+    calls = []
+
+    def func(task, *, key):
+        calls.append((task, key))
+
+    action = FunctionAction(func, key="value")
+    await action.execute("my_task")  # type: ignore[arg-type]
+    assert calls == [("my_task", "value")]
+
+
 def test_composite_digest() -> None:
     actions = [
         SubprocessAction("hello"),

{cook_build-0.7.1 → cook_build-0.7.2}/tests/test_contexts.py

@@ -84,6 +84,27 @@ async def test_create_target_directories_with_multiple_targets(
     assert filename.parent.is_dir()
 
 
+@pytest.mark.asyncio
+async def test_create_target_directories_different_parents(
+    m: Manager, tmp_wd: Path, conn: sqlite3.Connection
+) -> None:
+    # Targets in two different directories: the closure in create_target_directories
+    # must create both parents, not just the last one from the loop.
+    targets = [tmp_wd / "dir_a" / "file.txt", tmp_wd / "dir_b" / "file.txt"]
+    with normalize_action(), create_target_directories():
+        task = m.create_task(
+            "multi_dir",
+            targets=targets,
+            action=FunctionAction(
+                lambda t: [target.write_text("ok") for target in t.targets]
+            ),
+        )
+    controller = Controller(m.resolve_dependencies(), conn)
+    await controller.execute(task)
+    for target in targets:
+        assert target.is_file(), f"{target} was not created"
+
+
 def test_normalize_action(m: Manager) -> None:
     with normalize_action():
         task = m.create_task("foo", action="bar")

{cook_build-0.7.1 → cook_build-0.7.2}/tests/test_controller.py

@@ -420,6 +420,36 @@ async def test_last_started_completed(m: Manager, conn: Connection) -> None:
     assert delta.total_seconds() > 1
 
 
+@pytest.mark.asyncio
+async def test_last_started_reflects_actual_start(m: Manager, conn: Connection) -> None:
+    delay = 0.5
+    task1 = m.create_task(
+        "task1",
+        action=SubprocessAction(f"sleep {delay} && touch task1.txt", shell=True),
+        targets=["task1.txt"],
+    )
+    task2 = m.create_task(
+        "task2",
+        action=SubprocessAction("touch task2.txt", shell=True),
+        targets=["task2.txt"],
+    )
+    result = m.create_task("result", dependencies=[task1.targets[0], task2.targets[0]])
+
+    # With num_concurrent=1, task2 must wait for task1 to finish. Its last_started
+    # should reflect when it actually began executing, not when it was scheduled.
+    await Controller(m.resolve_dependencies(), conn).execute(result, num_concurrent=1)
+    rows = dict(
+        conn.execute(
+            "SELECT name, last_started FROM tasks WHERE name IN ('task1', 'task2')"
+        ).fetchall()
+    )
+    delta = (rows["task2"] - rows["task1"]).total_seconds()
+    assert delta >= delay, (
+        f"task2 started only {delta:.3f}s after task1, expected >= {delay}s; "
+        "last_started is recorded at scheduling time, not actual execution time"
+    )
+
+
 @pytest.mark.asyncio
 async def test_sync_action_backwards_compat(
     m: Manager, conn: Connection, caplog: pytest.LogCaptureFixture