calkit-python 0.26.8__tar.gz → 0.26.9__tar.gz

{calkit_python-0.26.8 → calkit_python-0.26.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calkit-python
-Version: 0.26.8
+Version: 0.26.9
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.26.8 → calkit_python-0.26.9}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.26.8"
+__version__ = "0.26.9"
 
 from .core import *  # noqa: F403, I001
 from . import git  # noqa: F401

{calkit_python-0.26.8 → calkit_python-0.26.9}/calkit/models/pipeline.py

@@ -306,11 +306,14 @@ class JupyterNotebookStage(Stage):
     def dvc_outs(self) -> list[str | dict]:
         outs = super().dvc_outs
         exec_nb_path = self.executed_notebook_path
-        html_path = self.html_path
-        outs = outs + [
-            {exec_nb_path: {"cache": self.executed_ipynb_storage == "dvc"}},
-            {html_path: {"cache": self.html_storage == "dvc"}},
-        ]
+        outs.append(
+            {exec_nb_path: {"cache": self.executed_ipynb_storage == "dvc"}}
+        )
+        if self.html_storage:
+            html_path = self.html_path
+            outs.append(
+                {html_path: {"cache": self.html_storage == "dvc"}},
+            )
         return outs
 
     @property

{calkit_python-0.26.8 → calkit_python-0.26.9}/calkit/pipeline.py

@@ -70,7 +70,7 @@ def to_dvc(
             deps += env["deps"]
         outs.append({lock_fpath: dict(cache=False, persist=True)})
         stage = dict(cmd=cmd, deps=deps, outs=outs, always_changed=True)
-        stage["desc"] = (
+        stage["desc"] = (  # type: ignore
             "Automatically generated by Calkit. "
             "Changes made here will be overwritten."
         )

{calkit_python-0.26.8 → calkit_python-0.26.9}/calkit/tests/models/test_pipeline.py

@@ -1,6 +1,7 @@
 """Tests for ``calkit.models.pipeline``."""
 
 from calkit.models.pipeline import (
+    JupyterNotebookStage,
     LatexStage,
     PythonScriptStage,
     WordToPdfStage,
@@ -51,3 +52,38 @@ def test_latexstage():
     assert " -silent " not in s.dvc_cmd
     assert "my-paper.tex" in s.dvc_deps
     assert "my-paper.pdf" in s.dvc_outs
+
+
+def test_jupyternotebookstage():
+    def dvc_outs_to_str_list(dvc_stage) -> list[str]:
+        outs = []
+        for out in dvc_stage["outs"]:
+            if isinstance(out, dict):
+                outs.append(list(out.keys())[0])
+            else:
+                outs.append(out)
+        return outs
+
+    s = JupyterNotebookStage(
+        environment="main",
+        notebook_path="something.ipynb",
+        inputs=["file.txt"],
+        html_storage="git",
+    )
+    dvc_stage = s.to_dvc()
+    outs = dvc_outs_to_str_list(dvc_stage)
+    assert s.html_path in outs
+    assert s.executed_notebook_path in outs
+    assert "html" in dvc_stage["cmd"]
+    assert "file.txt" in dvc_stage["deps"]
+    s = JupyterNotebookStage(
+        environment="main",
+        notebook_path="something.ipynb",
+        inputs=["file.txt"],
+        html_storage=None,
+    )
+    dvc_stage = s.to_dvc()
+    outs = dvc_outs_to_str_list(dvc_stage)
+    assert s.html_path not in outs
+    assert s.executed_notebook_path in outs
+    assert "html" not in dvc_stage["cmd"]