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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cook-build
-Version: 0.7.1
+Version: 0.7.3
 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.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cook-build"
-version = "0.7.1"
+version = "0.7.3"
 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.3}/src/cook/__main__.py

@@ -342,12 +342,10 @@ def __main__(cli_args: list[str] | None = None) -> None:
                 ]
             )
             if args.module:
-                # Temporarily add the current working directory to the path.
-                try:
-                    sys.path.append(os.getcwd())
-                    importlib.import_module(args.module)
-                finally:
-                    sys.path.pop()
+                # Add the current working directory to the path so local modules can be
+                # imported.
+                sys.path.append(os.getcwd())
+                importlib.import_module(args.module)
             elif args.recipe.is_file():
                 # Parse the recipe.
                 spec = importlib.util.spec_from_file_location("recipe", args.recipe)

{cook_build-0.7.1 → cook_build-0.7.3}/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):
@@ -119,21 +122,22 @@ class SubprocessAction(Action):
             True
     """
 
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, args: str | list[str], **kwargs) -> None:
         # Validate shell argument early
-        if kwargs.get("shell", False) and args and not isinstance(args[0], str):
+        if kwargs.get("shell", False) and not isinstance(args, str):
             raise ValueError("shell=True requires string args")
         self.args = args
         self.kwargs = kwargs
 
     async def execute(self, task: "Task") -> None:
         # Get the command arguments
-        (args,) = self.args
+        args = self.args
         shell = self.kwargs.get("shell", False)
         other_kwargs = {k: v for k, v in self.kwargs.items() if k != "shell"}
 
         # Create the subprocess
         if shell:
+            assert isinstance(args, str)
             process = await asyncio.create_subprocess_shell(args, **other_kwargs)
         else:
             # Exec mode: args can be a string (single command) or list
@@ -164,7 +168,7 @@ class SubprocessAction(Action):
     @property
     def hexdigest(self) -> str:
         hasher = hashlib.sha1()
-        (args,) = self.args
+        args = self.args
         if isinstance(args, str):
             hasher.update(args.encode())
         else:
@@ -173,7 +177,7 @@ class SubprocessAction(Action):
         return hasher.hexdigest()
 
     def __repr__(self) -> str:
-        args, *_ = self.args
+        args = self.args
         if not isinstance(args, str):
             args = " ".join(map(shlex.quote, args))
         return f"{self.__class__.__name__}({repr(args)})"
@@ -196,13 +200,13 @@ class CompositeAction(Action):
 
     @property
     def hexdigest(self) -> str | None:
-        parts = []
+        hasher = hashlib.sha1()
         for action in self.actions:
             hexdigest = action.hexdigest
             if hexdigest is None:
                 return None
-            parts.append(hexdigest)
-        return "".join(parts)
+            hasher.update(bytearray.fromhex(hexdigest))
+        return hasher.hexdigest()
 
 
 class ModuleAction(SubprocessAction):

{cook_build-0.7.1 → cook_build-0.7.3}/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.3}/src/cook/controller.py

@@ -39,11 +39,6 @@ QUERIES = {
         "last_digested" TIMESTAMP NOT NULL
     );
     """,
-    "select_task": """
-        SELECT "digest"
-        FROM "files"
-        WHERE "name" = :name
-    """,
     "upsert_task_completed": """
         INSERT INTO "tasks" ("name", "digest", "last_completed")
         VALUES (:name, :digest, :last_completed)
@@ -80,7 +75,6 @@ class Controller:
     def __init__(self, dependencies: nx.DiGraph, connection: Connection) -> None:
         self.dependencies = dependencies
         self.connection = connection
-        self._digest_cache: dict[Path, tuple[float, bytes]] = {}
 
     def resolve_stale_tasks(self, tasks: list["Task"] | None = None) -> set["Task"]:
         self.is_stale(tasks or list(self.dependencies))
@@ -88,7 +82,7 @@ class Controller:
             node for node, data in self.dependencies.nodes(True) if data.get("is_stale")
         }
 
-    def _evaluate_task_hexdigest(self, task: "Task") -> str | None:
+    def _evaluate_task_hexdigest(self, task: "Task") -> str:
         """
         Evaluate the digest of a task by combining the digest of all its dependencies.
         """
@@ -102,8 +96,7 @@ class Controller:
             )
             dependency = Path(dependency).resolve()
             if not dependency.is_file():
-                LOGGER.debug("dependency %s of %s is missing", dependency, task)
-                return None
+                raise FileNotFoundError(f"dependency {dependency} of {task} is missing")
             dependencies.append(dependency)
 
         hasher = hashlib.sha1()
@@ -198,9 +191,11 @@ class Controller:
             return True
 
         # If one of the dependencies is missing, the task is stale.
-        current_digest = self._evaluate_task_hexdigest(task)
-        if current_digest is None:
+        try:
+            current_digest = self._evaluate_task_hexdigest(task)
+        except FileNotFoundError:
             LOGGER.debug("%s is stale because one of its dependencies is missing", task)
+            return True
 
         # If the digest has changed, the task is stale.
         (cached_digest,) = cached_digest
@@ -290,8 +285,10 @@ 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)
+        digest: str | None = None
+        if not dry_run:
+            digest = self._evaluate_task_hexdigest(task)
+        start: datetime | None = None
 
         try:
             # Log what we're doing
@@ -307,22 +304,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
@@ -335,6 +329,7 @@ class Controller:
 
             # Update DB for completion
             if not dry_run:
+                assert digest is not None
                 params = {
                     "name": task.name,
                     "digest": digest,
@@ -344,6 +339,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 +358,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.3}/src/cook/manager.py

@@ -63,7 +63,7 @@ class Manager:
                     raise ValueError(f"{context} did not return a task")
             self.tasks[task.name] = task
             return task
-        except:
+        except Exception:
             filename, lineno = util.get_location()
             LOGGER.exception(
                 "failed to create task with name '%s' at %s:%d", name, filename, lineno
@@ -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.3}/src/cook/util.py

@@ -32,6 +32,7 @@ def evaluate_hexdigest(path: PathOrStr, size=2**16, hasher: str = "sha1") -> str
 class Timer:
     def __init__(self):
         self.start = None
+        self.end = None
 
     def __enter__(self) -> Timer:
         self.start = time()

{cook_build-0.7.1 → cook_build-0.7.3/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.3
 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.3}/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.3}/tests/test_contexts.py

@@ -84,19 +84,40 @@ 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")
         assert (
             isinstance(task.action, SubprocessAction)
-            and task.action.args[0] == "bar"
+            and task.action.args == "bar"
             and task.action.kwargs["shell"]
         )
 
         task = m.create_task("bar", action=["baz"])
         assert (
             isinstance(task.action, SubprocessAction)
-            and task.action.args[0] == ["baz"]
+            and task.action.args == ["baz"]
             and not task.action.kwargs.get("shell")
         )
 
@@ -110,7 +131,7 @@ def test_normalize_action(m: Manager) -> None:
         assert isinstance(task.action, FunctionAction)
 
         task = m.create_task("fizz", action=[pytest, "foo", "bar"])
-        assert isinstance(task.action, ModuleAction) and task.action.args[0] == [
+        assert isinstance(task.action, ModuleAction) and task.action.args == [
             sys.executable,
             "-m",
             "pytest",

{cook_build-0.7.1 → cook_build-0.7.3}/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