Remove --no-sync from cluv submit: always sync before submitting

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: lebrice

cluv/cli/submit.py

@@ -7,8 +7,6 @@
 from pathlib import Path
 
 import rich_argparse
-from milatools.utils.remote_v2 import RemoteV2
-
 from cluv.cli.sync import sync
 from cluv.config import find_pyproject, get_config
 from cluv.utils import console
@@ -22,7 +20,7 @@ def add_submit_args(
         "submit",
         help="Submit a SLURM job on a remote cluster.",
         formatter_class=rich_argparse.RichHelpFormatter,
-        usage="cluv submit <cluster> <job.sh> [--no-sync] [sbatch-args...] [-- program-args...]",
+        usage="cluv submit <cluster> <job.sh> [sbatch-args...] [-- program-args...]",
     )
     submit_parser.add_argument(
         "cluster",
@@ -35,12 +33,6 @@ def add_submit_args(
         metavar="<job.sh>",
         help="Path to the sbatch job script (relative to project root).",
     )
-    submit_parser.add_argument(
-        "--no-sync",
-        action="store_true",
-        default=False,
-        help="Skip syncing the project to the cluster before submitting.",
-    )
     submit_parser.add_argument(
         "rest",
         nargs=argparse.REMAINDER,
@@ -54,14 +46,13 @@ def add_submit_args(
 async def submit(
     cluster: str,
     job_script: str,
-    no_sync: bool,
     rest: list[str],
 ):
     """Submit a SLURM job on a remote cluster.
 
-    Enforces a clean git state, sets GIT_COMMIT and any SBATCH_* env vars
-    configured in [tool.cluv.slurm] / [tool.cluv.clusters.<name>], then calls
-    sbatch on the remote.
+    Enforces a clean git state, syncs the project, sets GIT_COMMIT and any
+    SBATCH_* env vars configured in [tool.cluv.slurm] / [tool.cluv.clusters.<name>],
+    then calls sbatch on the remote.
 
     Any arguments before -- are forwarded to sbatch as flags; arguments after --
     are passed to the job script as program arguments.
@@ -91,12 +82,9 @@ async def submit(
         ["git", "rev-parse", "HEAD"], text=True
     ).strip()
 
-    # 3. Sync (or just connect).
-    if not no_sync:
-        remotes = await sync(clusters=[cluster])
-        remote = remotes[0]
-    else:
-        remote = await RemoteV2.connect(cluster)
+    # 3. Sync.
+    remotes = await sync(clusters=[cluster])
+    remote = remotes[0]
 
     config = get_config()
 

tests/test_integration.py

@@ -217,7 +217,6 @@ async def test_submit_rorqual_builds_correct_command():
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,  # uses the mocked sync, which returns our patched remote
             rest=["--", "echo", "hello"],
         )
 

tests/test_submit.py

@@ -59,7 +59,6 @@ async def test_dirty_git_aborts(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=[],
         )
     assert exc_info.value.code == 1
@@ -87,7 +86,6 @@ async def test_submit_builds_correct_remote_command(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=["--", "python", "train.py"],
         )
 
@@ -120,7 +118,6 @@ async def test_sbatch_flags_forwarded(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=["--partition=gpu", "--mem=40G", "--", "python", "train.py"],
         )
 
@@ -153,7 +150,6 @@ async def test_rest_without_separator_treated_as_sbatch_flags(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=["--gres=gpu:1"],
         )
 
@@ -184,7 +180,6 @@ async def test_submit_includes_global_slurm_vars(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=["--", "python", "train.py"],
         )
 
@@ -213,7 +208,6 @@ async def test_submit_per_cluster_vars_override_globals(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=["--", "python", "train.py"],
         )
 
@@ -224,40 +218,7 @@ async def test_submit_per_cluster_vars_override_globals(tmp_path):
     assert "SBATCH_TIME=1:00:00" in cmd
 
 
-# ---------------------------------------------------------------------------
-# --no-sync skips sync and calls RemoteV2.connect instead
-# ---------------------------------------------------------------------------
-
-
-async def test_no_sync_skips_sync(tmp_path):
-    fake_remote = AsyncMock()
-    pyproject = tmp_path / "proj" / "pyproject.toml"
-    (tmp_path / "proj").mkdir()
-
-    mock_connect = AsyncMock(return_value=fake_remote)
-    mock_sync = AsyncMock(return_value=[fake_remote])
-
-    with (
-        patch.object(submit_module.subprocess, "run", side_effect=_git_clean_run),
-        patch.object(submit_module.subprocess, "check_output", return_value=FAKE_COMMIT),
-        patch.object(submit_module, "sync", mock_sync),
-        patch.object(submit_module.RemoteV2, "connect", mock_connect),
-        patch.object(submit_module, "get_config", return_value=_make_config()),
-        patch.object(submit_module, "find_pyproject", return_value=pyproject),
-        patch.object(Path, "home", return_value=tmp_path),
-    ):
-        await submit_module.submit(
-            cluster="rorqual",
-            job_script="scripts/job.sh",
-            no_sync=True,
-            rest=[],
-        )
-
-    mock_sync.assert_not_called()
-    mock_connect.assert_called_once_with("rorqual")
-
-
-async def test_sync_called_by_default(tmp_path):
+async def test_always_syncs(tmp_path):
     fake_remote = AsyncMock()
     pyproject = tmp_path / "proj" / "pyproject.toml"
     (tmp_path / "proj").mkdir()
@@ -275,7 +236,6 @@ async def test_sync_called_by_default(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=[],
         )
 
@@ -303,7 +263,6 @@ async def test_git_commit_always_injected(tmp_path):
         await submit_module.submit(
             cluster="rorqual",
             job_script="scripts/job.sh",
-            no_sync=False,
             rest=[],
         )