calkit-python 0.24.1__tar.gz → 0.24.3__tar.gz

{calkit_python-0.24.1 → calkit_python-0.24.3}/PKG-INFO

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

{calkit_python-0.24.1 → calkit_python-0.24.3}/calkit/__init__.py

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

{calkit_python-0.24.1 → calkit_python-0.24.3}/calkit/cli/check.py

@@ -71,17 +71,16 @@ def check_environment(
     if env["kind"] == "docker":
         if "image" not in env:
             raise_error("Image must be defined for Docker environments")
-        if "path" in env:
-            check_docker_env(
-                tag=env["image"],
-                fpath=env["path"],
-                lock_fpath=get_env_lock_fpath(
-                    env=env, env_name=env_name, as_posix=False
-                ),
-                platform=env.get("platform"),
-                deps=env.get("deps", []),
-                quiet=not verbose,
-            )
+        check_docker_env(
+            tag=env["image"],
+            fpath=env.get("path"),
+            lock_fpath=get_env_lock_fpath(
+                env=env, env_name=env_name, as_posix=False
+            ),
+            platform=env.get("platform"),
+            deps=env.get("deps", []),
+            quiet=not verbose,
+        )
     elif env["kind"] == "conda":
         check_conda_env(
             env_fpath=env["path"],
@@ -361,6 +360,11 @@ def check_venv(
         ["uv", "venv"] if kind == "uv-venv" else ["python", "-m", "venv"]
     )
     pip_cmd = "pip" if kind == "venv" else "uv pip"
+    pip_freeze_cmd = f"{pip_cmd} freeze"
+    if kind == "uv-venv":
+        pip_freeze_cmd += " --color never"
+    else:
+        pip_freeze_cmd += " --no-color"
     pip_install_args = "-q" if quiet else ""
     if python is not None and not use_uv:
         raise_error("Python version cannot be specified if not using uv")
@@ -391,7 +395,7 @@ def check_venv(
     check_cmd = (
         f"{activate_cmd} "
         f"&& {pip_cmd} install {pip_install_args} -r {path} "
-        f"&& {pip_cmd} freeze > {lock_fpath} "
+        f"&& {pip_freeze_cmd} > {lock_fpath} "
         "&& deactivate"
     )
     try:

{calkit_python-0.24.1 → calkit_python-0.24.3}/calkit/cli/main.py

@@ -878,10 +878,10 @@ def run_in_env(
     if env["kind"] == "docker":
         if "image" not in env:
             raise_error("Image must be defined for Docker environments")
-        if "path" in env and not no_check:
+        if not no_check:
             check_docker_env(
                 tag=env["image"],
-                fpath=env["path"],
+                fpath=env.get("path"),
                 lock_fpath=get_env_lock_fpath(
                     env=env, env_name=env_name, as_posix=False
                 ),

{calkit_python-0.24.1 → calkit_python-0.24.3}/calkit/models/pipeline.py

@@ -177,15 +177,17 @@ class PythonScriptStage(Stage):
 
 
 class LatexStage(Stage):
-    kind: Literal["latex"]
+    kind: Literal["latex"] = "latex"
     target_path: str
+    silent: bool = False
 
     @property
     def dvc_cmd(self) -> str:
-        return (
-            f"{self.xenv_cmd} -- "
-            f"latexmk -cd -interaction=nonstopmode -pdf {self.target_path}"
-        )
+        cmd = f"{self.xenv_cmd} -- latexmk -cd -interaction=nonstopmode"
+        if self.silent:
+            cmd += " -silent"
+        cmd += f" -pdf {self.target_path}"
+        return cmd
 
     @property
     def dvc_deps(self) -> list[str]:

{calkit_python-0.24.1 → calkit_python-0.24.3}/calkit/tests/cli/test_main.py

@@ -93,6 +93,7 @@ def test_run_in_env(tmp_dir):
         '--description "Just Python."',
         shell=True,
     )
+    subprocess.check_call(["calkit", "check", "env", "-n", "py3.10"])
     out = (
         subprocess.check_output(
             "calkit xenv -n py3.10 python --version",

{calkit_python-0.24.1 → calkit_python-0.24.3}/calkit/tests/models/test_pipeline.py

@@ -1,6 +1,10 @@
 """Tests for ``calkit.models.pipeline``."""
 
-from calkit.models.pipeline import PythonScriptStage, WordToPdfStage
+from calkit.models.pipeline import (
+    LatexStage,
+    PythonScriptStage,
+    WordToPdfStage,
+)
 
 
 def test_pythonscriptstage():
@@ -38,3 +42,12 @@ def test_wordtopdfstage():
     assert sd["cmd"] == (
         'calkit office word-to-pdf "my word doc.docx" -o "my word doc.pdf"'
     )
+
+
+def test_latexstage():
+    s = LatexStage(environment="tex", target_path="my-paper.tex")
+    assert " -silent " not in s.dvc_cmd
+    s.silent = True
+    assert " -silent " in s.dvc_cmd
+    assert "my-paper.tex" in s.dvc_deps
+    assert "my-paper.pdf" in s.dvc_outs