calkit-python 0.41.19__tar.gz → 0.41.20__tar.gz

{calkit_python-0.41.19 → calkit_python-0.41.20}/CONTRIBUTING.md

@@ -98,7 +98,7 @@ This guide will help you get started.
 ## 🎉 Join the community
 
 - Participate in **[GitHub Discussions](https://github.com/calkit/discussions)**.
-- Join our [**Discord**](https://discord.gg/ubb7gAXc) for real-time collaboration.
+- Join our [**Discord**](https://discord.gg/m2MBC79HzD) for real-time collaboration.
 - Follow our updates on [**LinkedIn**](https://linkedin.com/company/calkit).
 
 We appreciate your help in making Calkit better! 🚀

{calkit_python-0.41.19 → calkit_python-0.41.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calkit-python
-Version: 0.41.19
+Version: 0.41.20
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues
@@ -26,7 +26,7 @@ Requires-Dist: arithmeval
 Requires-Dist: bibtexparser
 Requires-Dist: checksumdir
 Requires-Dist: docx2pdf
-Requires-Dist: dvc==3.67.1
+Requires-Dist: dvc[all]==3.67.1
 Requires-Dist: fastapi
 Requires-Dist: fsspec>=2026.4.0
 Requires-Dist: gitpython

{calkit_python-0.41.19 → calkit_python-0.41.20}/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?

{calkit_python-0.41.19 → calkit_python-0.41.20}/calkit/dvc/zip.py

@@ -499,6 +499,23 @@ def _sync_one(
     # pipeline output that hasn't been produced yet on a fresh run)
     if workspace_hash is None and zip_hash is None:
         return None
+    # Workspace doesn't exist with no prior sync record while syncing to-zip —
+    # there's nothing to push into the zip (e.g., the zip was pulled but
+    # never unzipped into the workspace)
+    if (
+        workspace_hash is None
+        and last_sync_record is None
+        and direction == "to-zip"
+    ):
+        return None
+    # Zip doesn't exist with no prior sync record while syncing to-workspace —
+    # there's nothing to pull into the workspace
+    if (
+        zip_hash is None
+        and last_sync_record is None
+        and direction == "to-workspace"
+    ):
+        return None
     # Deletion + change on the other side is a conflict
     if workspace_deleted and zip_changed and direction == "both":
         raise RuntimeError(

{calkit_python-0.41.19 → calkit_python-0.41.20}/calkit/tests/cli/main/test_core.py

@@ -60,6 +60,16 @@ def test_init(tmp_dir):
     subprocess.check_call(["calkit", "init"])
     assert os.path.isfile("calkit.yaml")
     assert calkit.load_calkit_info() == {}
+    # Already initialized: init without --force fails and does not clobber
+    result = subprocess.run(
+        ["calkit", "init"],
+        capture_output=True,
+        text=True,
+    )
+    assert result.returncode != 0
+    assert "already initialized" in result.stderr.lower()
+    assert "use --force" in result.stderr.lower()
+    assert calkit.load_calkit_info() == {}
     # init must not clobber a pre-existing calkit.yaml
     os.makedirs("sub")
     ck_info = {"name": "test-project"}
@@ -67,6 +77,19 @@ def test_init(tmp_dir):
         calkit.ryaml.dump(ck_info, f)
     subprocess.check_call(["calkit", "init"], cwd="sub")
     assert calkit.load_calkit_info(wdir="sub") == ck_info
+    # Fully initialized project blocks init without --force
+    result = subprocess.run(
+        ["calkit", "init"],
+        cwd="sub",
+        capture_output=True,
+        text=True,
+    )
+    assert result.returncode != 0
+    assert "already initialized" in result.stderr.lower()
+    assert calkit.load_calkit_info(wdir="sub") == ck_info
+    # --force allows re-initialization without clobbering calkit.yaml
+    subprocess.check_call(["calkit", "init", "--force"], cwd="sub")
+    assert calkit.load_calkit_info(wdir="sub") == ck_info
 
 
 @skipif_windows_docker

{calkit_python-0.41.19 → calkit_python-0.41.20}/calkit/tests/dvc/test_zip.py

@@ -303,3 +303,28 @@ def test_sync_one(tmp_dir, monkeypatch):
     assert result is not None
     assert (src7 / "a.txt").read_text() == "hello"
     assert get_sync_record(str(src7.as_posix())) is not None
+    # Zip exists but workspace was never unzipped (no sync record) with
+    # direction=to-zip: nothing to push, skip without error
+    src8 = tmp_dir / "src8"
+    src8.mkdir()
+    (src8 / "a.txt").write_text("hello")
+    zip_out8 = str(tmp_dir / calkit.dvc.zip.ZIPS_DIR / "src8.zip")
+    zip_(str(src8), zip_out8)
+    shutil.rmtree(str(src8))
+    write_zip_path_map({str(src8.as_posix()): zip_out8})
+    result = sync_one(str(src8), zip_out8, direction="to-zip")
+    assert result is None
+    assert os.path.isfile(zip_out8)
+    assert not os.path.exists(str(src8))
+    # Workspace exists but zip was never created (no sync record) with
+    # direction=to-workspace: nothing to pull, skip without error
+    src9 = tmp_dir / "src9"
+    src9.mkdir()
+    (src9 / "a.txt").write_text("hello")
+    zip_out9 = str(tmp_dir / calkit.dvc.zip.ZIPS_DIR / "src9.zip")
+    write_zip_path_map({str(src9.as_posix()): zip_out9})
+    result = sync_one(str(src9), zip_out9, direction="to-workspace")
+    assert result is None
+    assert not os.path.exists(zip_out9)
+    assert get_sync_record(str(src9.as_posix())) is None
+    assert (src9 / "a.txt").read_text() == "hello"

{calkit_python-0.41.19 → calkit_python-0.41.20}/docs/help.md

@@ -7,7 +7,7 @@ To get in touch with the community,
 check out the
 [discussion forum](https://github.com/orgs/calkit/discussions)
 or the
-[Discord server](https://discord.gg/ryDkGarc).
+[Discord server](https://discord.gg/m2MBC79HzD).
 
 If you want to get in touch directly,
 feel free to

{calkit_python-0.41.19 → calkit_python-0.41.20}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "bibtexparser",
   "checksumdir",
   "docx2pdf",
-  "dvc==3.67.1",
+  "dvc[all]==3.67.1",
   "fastapi",
   "gitpython",
   "keyring",