calkit-python 0.32.1__tar.gz → 0.32.2__tar.gz

{calkit_python-0.32.1 → calkit_python-0.32.2}/PKG-INFO

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

{calkit_python-0.32.1 → calkit_python-0.32.2}/calkit/__init__.py

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

{calkit_python-0.32.1 → calkit_python-0.32.2}/calkit/cli/main.py

@@ -1021,6 +1021,14 @@ def run(
             help="Run stages that produce the given output path.",
         ),
     ] = [],
+    sync_overleaf: Annotated[
+        bool,
+        typer.Option(
+            "--overleaf",
+            "-O",
+            help="Sync with Overleaf before and after running.",
+        ),
+    ] = False,
 ):
     """Check dependencies and run the pipeline."""
     import dvc.log
@@ -1031,6 +1039,7 @@ def run(
 
     import calkit.environments
     import calkit.pipeline
+    from calkit.cli.overleaf import sync as overleaf_sync
 
     if (target_inputs or target_outputs) and targets:
         raise_error("Cannot specify both targets and inputs")
@@ -1079,6 +1088,9 @@ def run(
         failed = not result.get("success", False)
         if failed:
             warn(f"Failed to check environment '{env_name}'")
+    # If specified, perform initial Overleaf sync
+    if sync_overleaf:
+        overleaf_sync(no_commit=False, no_push=True, verbose=verbose)
     # Compile the DVC pipeline
     dvc_stages = None
     if ck_info.get("pipeline", {}):
@@ -1264,6 +1276,9 @@ def run(
                 "utf-8", errors="replace"
             )
         )
+    # If specified, perform final Overleaf sync
+    if sync_overleaf:
+        overleaf_sync(verbose=verbose, no_commit=save_after_run, no_push=True)
     if save_after_run or save_message is not None:
         if save_message is None:
             save_message = "Run pipeline"

{calkit_python-0.32.1 → calkit_python-0.32.2}/calkit/overleaf.py

@@ -379,9 +379,9 @@ def sync(
                 cwd=main_repo.working_dir,
             )
             # Handle merge conflicts
-            if (
-                process.returncode != 0
-                and "merge conflict" in process.stdout.lower()
+            if process.returncode != 0 and (
+                "merge conflict" in process.stdout.lower()
+                or "merge conflict" in process.stderr.lower()
             ):
                 msg = ""
                 for line in process.stdout.split("\n"):
@@ -402,7 +402,11 @@ def sync(
                     "    calkit overleaf sync --resolve"
                 )
             elif process.returncode != 0:
-                raise RuntimeError(f"Could not apply:\n{process.stdout}")
+                main_repo.git.am("--abort")
+                raise RuntimeError(
+                    "Could not apply Git patch:\n"
+                    f"{process.stdout}\n{process.stderr}"
+                )
         elif resolving_conflict:
             # We have no patch since the last sync, but we need to update
             # our latest sync commit