calkit-python 0.28.0__tar.gz → 0.28.1__tar.gz

{calkit_python-0.28.0 → calkit_python-0.28.1}/PKG-INFO

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

{calkit_python-0.28.0 → calkit_python-0.28.1}/calkit/__init__.py

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

{calkit_python-0.28.0 → calkit_python-0.28.1}/calkit/cli/list.py

@@ -71,7 +71,9 @@ def list_references():
 
 
 @list_app.command(name="environments")
+@list_app.command(name="envs")
 def list_environments():
+    """List environments in the project."""
     envs = calkit.load_calkit_info().get("environments", {})
     for name, env in envs.items():
         typer.echo(name + ":")

{calkit_python-0.28.0 → calkit_python-0.28.1}/calkit/cli/main.py

@@ -931,9 +931,9 @@ def run(
     no_run_cache: Annotated[
         bool, typer.Option("--no-run-cache", help="Ignore the run cache.")
     ] = False,
-    no_log: Annotated[
+    save_log: Annotated[
         bool,
-        typer.Option("--no-log", "-l", help="Do not log the run."),
+        typer.Option("--log", "-l", help="Log the run."),
     ] = False,
     save_after_run: Annotated[
         bool,
@@ -952,7 +952,7 @@ def run(
     if not quiet:
         typer.echo("Getting system information")
     system_info = calkit.get_system_info()
-    if not no_log:
+    if save_log:
         # Save the system to .calkit/systems
         if verbose:
             typer.echo("Saving system information:")
@@ -1027,7 +1027,7 @@ def run(
     start_time_no_tz = calkit.utcnow(remove_tz=True)
     start_time = calkit.utcnow(remove_tz=False)
     run_id = uuid.uuid4().hex
-    if not no_log:
+    if save_log:
         log_fpath = os.path.join(
             ".calkit",
             "logs",
@@ -1055,7 +1055,7 @@ def run(
     dvc.ui.ui.write = lambda *args, **kwargs: None
     res = dvc_cli_main(["repro"] + args)
     failed = res != 0
-    if not no_log:
+    if save_log:
         # Get Git status after running
         git_changed_files_after = calkit.git.get_changed_files(repo=repo)
         git_staged_files_after = calkit.git.get_staged_files(repo=repo)

{calkit_python-0.28.0 → calkit_python-0.28.1}/calkit/models/pipeline.py

@@ -110,6 +110,7 @@ class Stage(BaseModel):
         "jupyter-notebook",
         "r-script",
         "julia-script",
+        "julia-command",
         "word-to-pdf",
     ]
     environment: str
@@ -325,6 +326,18 @@ class JuliaScriptStage(Stage):
         return [self.script_path] + super().dvc_deps
 
 
+class JuliaCommandStage(Stage):
+    kind: Literal["julia-command"] = "julia-command"
+    command: str
+
+    @property
+    def dvc_cmd(self) -> str:
+        # We need to escape quotes in the command
+        julia_cmd = self.command.replace('"', '\\"')
+        cmd = f'{self.xenv_cmd} -- "{julia_cmd}"'
+        return cmd
+
+
 class JupyterNotebookStage(Stage):
     """A stage that runs a Jupyter notebook.
 
@@ -483,6 +496,7 @@ class Pipeline(BaseModel):
                 | WordToPdfStage
                 | JupyterNotebookStage
                 | JuliaScriptStage
+                | JuliaCommandStage
             ),
             Discriminator("kind"),
         ],

{calkit_python-0.28.0 → calkit_python-0.28.1}/calkit/tests/models/test_pipeline.py

@@ -4,6 +4,7 @@ import pytest
 from pydantic import ValidationError
 
 from calkit.models.pipeline import (
+    JuliaCommandStage,
     JupyterNotebookStage,
     LatexStage,
     PythonScriptStage,
@@ -119,3 +120,12 @@ def test_stageiteration():
     i.values
     exp_vals = i.expand_values(params={})
     assert exp_vals == [{"param1": 1, "param2": 2}, {"param1": 3, "param2": 4}]
+
+
+def test_juliacommandstage():
+    s = JuliaCommandStage(environment="j1", command='println("sup")')
+    sd = s.to_dvc()
+    print(sd)
+    assert sd["cmd"] == (
+        'calkit xenv -n j1 --no-check -- "println(\\"sup\\")"'
+    )

{calkit_python-0.28.0 → calkit_python-0.28.1}/docs/pipeline/index.md

@@ -86,6 +86,10 @@ For more details, see `calkit.models.pipeline`.
 
 - `script_path`
 
+### `julia-command`
+
+- `command`
+
 ## Iteration
 
 ### Over a list of values