calkit-python 0.30.0__tar.gz → 0.30.2__tar.gz

{calkit_python-0.30.0 → calkit_python-0.30.2}/PKG-INFO

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

{calkit_python-0.30.0 → calkit_python-0.30.2}/calkit/__init__.py

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

{calkit_python-0.30.0 → calkit_python-0.30.2}/calkit/cli/overleaf.py

@@ -314,6 +314,14 @@ def sync(
         for path in paths:
             if not any(pub.get("path") == path for pub in pubs):
                 raise_error(f"Publication with path '{path}' not found")
+    # First check our config for an Overleaf token
+    calkit_config = calkit.config.read()
+    overleaf_token = calkit_config.overleaf_token
+    if not overleaf_token:
+        raise_error(
+            "Overleaf token not set; "
+            "Please set it using 'calkit config set overleaf_token'"
+        )
     repo = git.Repo()
     for pub in pubs:
         overleaf_config = pub.get("overleaf", {})
@@ -341,26 +349,30 @@ def sync(
         overleaf_project_dir = os.path.join(
             ".calkit", "overleaf", overleaf_project_id
         )
+        overleaf_remote_url = (
+            f"https://git:{overleaf_token}@git.overleaf.com/"
+            f"{overleaf_project_id}"
+        )
         if not os.path.isdir(overleaf_project_dir):
-            calkit_config = calkit.config.read()
-            overleaf_token = calkit_config.overleaf_token
-            if not overleaf_token:
-                raise_error(
-                    "Overleaf token not set; "
-                    "Please set it using 'calkit config set overleaf_token'"
-                )
-            overleaf_clone_url = (
-                f"https://git:{overleaf_token}@git.overleaf.com/"
-                f"{overleaf_project_id}"
-            )
             overleaf_repo = git.Repo.clone_from(
-                overleaf_clone_url, to_path=overleaf_project_dir
+                overleaf_remote_url, to_path=overleaf_project_dir
             )
         else:
             overleaf_repo = git.Repo(overleaf_project_dir)
         # Pull the latest version in the Overleaf project
         typer.echo("Pulling the latest version from Overleaf")
-        overleaf_repo.git.pull()
+        # Ensure that our current Overleaf remote URL is correct
+        overleaf_repo.git.remote("set-url", "origin", overleaf_remote_url)
+        try:
+            overleaf_repo.git.pull()
+        except Exception:
+            raise_error(
+                "Failed to pull from Overleaf; "
+                "check that your Overleaf token is valid\n"
+                "Run 'calkit config get overleaf_token' and ensure that "
+                "it matches one in your Overleaf account settings "
+                "(https://overleaf.com/user/settings)"
+            )
         last_sync_commit = pub["overleaf"].get("last_sync_commit")
         # Determine which paths to sync and push
         # TODO: Support glob patterns

{calkit_python-0.30.0 → calkit_python-0.30.2}/calkit/models/pipeline.py

@@ -211,13 +211,16 @@ class PythonScriptStage(Stage):
 class LatexStage(Stage):
     kind: Literal["latex"] = "latex"
     target_path: str
+    latexmkrc_path: str | None = None
     verbose: bool = False
     force: bool = False
     synctex: bool = True
 
     @property
     def dvc_cmd(self) -> str:
-        cmd = f"{self.xenv_cmd} latexmk -cd -interaction=nonstopmode"
+        cmd = f"{self.xenv_cmd} latexmk -cd -norc -interaction=nonstopmode"
+        if self.latexmkrc_path is not None:
+            cmd += f" -r {self.latexmkrc_path}"
         if not self.verbose:
             cmd += " -silent"
         if self.force:
@@ -229,7 +232,11 @@ class LatexStage(Stage):
 
     @property
     def dvc_deps(self) -> list[str]:
-        return [self.target_path] + super().dvc_deps
+        deps = [self.target_path]
+        if self.latexmkrc_path is not None:
+            deps.append(self.latexmkrc_path)
+        deps += super().dvc_deps
+        return deps
 
     @property
     def dvc_outs(self) -> list[str | dict]:

{calkit_python-0.30.0 → calkit_python-0.30.2}/calkit/tests/cli/test_new.py

@@ -579,7 +579,8 @@ def test_new_latex_stage(tmp_dir):
     pipeline = calkit.dvc.read_pipeline()
     assert pipeline["stages"]["build-paper"]["cmd"] == (
         "calkit xenv -n tex --no-check -- "
-        "latexmk -cd -interaction=nonstopmode -silent -synctex=1 -pdf paper.tex"
+        "latexmk -cd -norc -interaction=nonstopmode -silent -synctex=1 "
+        "-pdf paper.tex"
     )
     assert set(pipeline["stages"]["build-paper"]["deps"]) == set(
         ["paper.tex", ".calkit/env-locks/tex.json"]

{calkit_python-0.30.0 → calkit_python-0.30.2}/calkit/tests/models/test_pipeline.py

@@ -63,6 +63,14 @@ 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
+    s = LatexStage(
+        name="something",
+        environment="tex",
+        target_path="my-paper.tex",
+        latexmkrc_path="test/latexmkrc",
+    )
+    assert "test/latexmkrc" in s.dvc_deps
+    assert "-r test/latexmkrc" in s.dvc_cmd
 
 
 def test_jupyternotebookstage():