calkit-python 0.41.18__py3-none-any.whl → 0.41.20__py3-none-any.whl

calkit/cli/core.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import os
 import re
 import subprocess
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, NoReturn
 
 import typer
 from typer.core import TyperGroup
@@ -96,7 +96,7 @@ def run_cmd(cmd: list[str]):
         pty.spawn(cmd, lambda fd: os.read(fd, 1024))
 
 
-def raise_error(txt: str):
+def raise_error(txt: str) -> NoReturn:
     typer.echo(typer.style("Error: " + str(txt), fg="red"), err=True)
     raise typer.Exit(1)
 

calkit/cli/latex.py

@@ -7,6 +7,7 @@ import os
 import string
 import subprocess
 from copy import deepcopy
+from pathlib import Path
 
 import typer
 from typing_extensions import Annotated
@@ -135,6 +136,36 @@ def build(
             help="Path to a latexmkrc file to use for compilation.",
         ),
     ] = None,
+    output_dir: Annotated[
+        str | None,
+        typer.Option(
+            "--output-dir",
+            help=(
+                "Directory for the compiled PDF, relative to the current "
+                "directory. Passed to latexmk as -outdir."
+            ),
+        ),
+    ] = None,
+    aux_dir: Annotated[
+        str | None,
+        typer.Option(
+            "--aux-dir",
+            help=(
+                "Directory for auxiliary files, relative to the current "
+                "directory. Passed to latexmk as -auxdir."
+            ),
+        ),
+    ] = None,
+    latexmk_args: Annotated[
+        list[str],
+        typer.Option(
+            "--latexmk-arg",
+            help=(
+                "Extra argument to pass through to latexmk. Repeat the option "
+                "to pass more than one."
+            ),
+        ),
+    ] = [],
     no_synctex: Annotated[
         bool,
         typer.Option(
@@ -173,7 +204,20 @@ def build(
         latexmk_cmd.append("-silent")
     if force:
         latexmk_cmd.append("-f")
-    latexmk_cmd += ["-interaction=nonstopmode", tex_file]
+    # latexmk runs with -cd, so its -outdir/-auxdir are relative to the .tex
+    # file's directory; convert the (current-directory-relative) Calkit paths
+    # into that frame.
+    tex_dir = os.path.dirname(tex_file) or "."
+    if output_dir is not None:
+        rel = Path(os.path.relpath(output_dir, tex_dir)).as_posix()
+        latexmk_cmd.append(f"-outdir={rel}")
+    if aux_dir is not None:
+        rel = Path(os.path.relpath(aux_dir, tex_dir)).as_posix()
+        latexmk_cmd.append(f"-auxdir={rel}")
+    latexmk_cmd.append("-interaction=nonstopmode")
+    # User pass-through args come last so they can override Calkit's defaults.
+    latexmk_cmd += latexmk_args
+    latexmk_cmd.append(tex_file)
     if environment is not None:
         if no_check:
             check_cmd = ["--no-check"]

calkit/cli/list.py

@@ -261,21 +261,23 @@ def list_releases():
     objs = calkit.load_calkit_info().get("releases", {})
     for name, obj in objs.items():
         typer.echo(name + ":")
-        # First figure out if the release is published
+        # Figure out if the release is published. Internal releases are never
+        # uploaded to an archival service, so skip the lookup for them.
         published = None
-        try:
-            published = calkit.invenio.get(
-                f"/records/{obj.get('record_id')}",
-                service=obj.get("publisher"),
-            )["is_published"]
-        except Exception:
+        if not obj.get("internal"):
             try:
                 published = calkit.invenio.get(
-                    f"/records/{obj.get('record_id')}/draft",
+                    f"/records/{obj.get('record_id')}",
                     service=obj.get("publisher"),
                 )["is_published"]
-            except Exception as e:
-                warn(f"Cannot tell if release {name} is published: {e}")
+            except Exception:
+                try:
+                    published = calkit.invenio.get(
+                        f"/records/{obj.get('record_id')}/draft",
+                        service=obj.get("publisher"),
+                    )["is_published"]
+                except Exception as e:
+                    warn(f"Cannot tell if release {name} is published: {e}")
         if published is not None:
             typer.echo(f"    published: {published}")
         for k, v in obj.items():

calkit/cli/main/core.py

@@ -179,11 +179,26 @@ def init(
         typer.Option(
             "--force",
             "-f",
-            help="Force reinitializing DVC if already initialized.",
+            help="Re-initialize even if the project is already initialized.",
         ),
     ] = False,
 ):
     """Initialize the current working directory."""
+    import git
+    from git.exc import InvalidGitRepositoryError
+
+    def _project_is_initialized() -> bool:
+        try:
+            git.Repo(".", search_parent_directories=False)
+        except InvalidGitRepositoryError:
+            return False
+        return os.path.isfile(".dvc/config") and os.path.isfile("calkit.yaml")
+
+    if _project_is_initialized() and not force:
+        raise_error(
+            "This project is already initialized. "
+            "Use --force to re-initialize."
+        )
     subprocess.run(["git", "init"])
     result = calkit.dvc.run_dvc_command(
         ["init"] + (["--force"] if force else [])
@@ -197,13 +212,15 @@ def init(
     # Commit the newly created .dvc directory
     repo = calkit.git.get_repo()
     repo.git.add(".dvc")
-    repo.git.commit("-m", "Initialize DVC")
+    if calkit.git.get_staged_files(repo=repo):
+        repo.git.commit("-m", "Initialize DVC")
     # Create an empty calkit.yaml if one doesn't already exist
     if not os.path.isfile("calkit.yaml"):
         with open("calkit.yaml", "w"):
             pass
         repo.git.add("calkit.yaml")
-        repo.git.commit("-m", "Initialize Calkit")
+        if calkit.git.get_staged_files(repo=repo):
+            repo.git.commit("-m", "Initialize Calkit")
     # TODO: Initialize `dvc.yaml`
     # TODO: Add a sane .gitignore file
     # TODO: Add a sane LICENSE file?