calkit-python 0.23.0__tar.gz → 0.23.1__tar.gz

{calkit_python-0.23.0 → calkit_python-0.23.1}/PKG-INFO

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

{calkit_python-0.23.0 → calkit_python-0.23.1}/calkit/__init__.py

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

{calkit_python-0.23.0 → calkit_python-0.23.1}/calkit/dvc.py

@@ -155,7 +155,7 @@ def read_pipeline(wdir: str = ".") -> dict:
         return calkit.ryaml.load(f)
 
 
-def get_remotes(wdir: str = None) -> dict[str, str]:
+def get_remotes(wdir: str | None = None) -> dict[str, str]:
     """Get a dictionary of DVC remotes, keyed by name, with URL as the
     value.
     """
@@ -169,13 +169,17 @@ def get_remotes(wdir: str = None) -> dict[str, str]:
     if not out:
         return {}
     resp = {}
-    for line in out.split("\n"):
-        split_line = line.split()
-        if len(split_line) >= 2:
-            # This is a remote
-            name = split_line[0]
-            url = split_line[1]
+    out = out.replace("(default)", "").strip()
+    is_name = True
+    for token in out.split():
+        token = token.strip()
+        print(token)
+        if is_name:
+            name = token
+        else:
+            url = token
             resp[name] = url
+        is_name = not is_name
     return resp
 
 

{calkit_python-0.23.0 → calkit_python-0.23.1}/calkit/pipeline.py

@@ -192,9 +192,11 @@ def to_dvc(
                                         str(var_val),
                                     )
                                 extra_outs.append(out_i)
-                            extra_outs = list(set(extra_outs))
                             for out_i in extra_outs:
-                                dvc_stages[stage_name]["deps"].append(out_i)
+                                if out_i not in dvc_stages[stage_name]["deps"]:
+                                    dvc_stages[stage_name]["deps"].append(
+                                        out_i
+                                    )
                         else:
                             dvc_stages[stage_name]["deps"].append(out)
     if write:

calkit_python-0.23.1/calkit/tests/test_dvc.py

@@ -0,0 +1,37 @@
+"""Tests for the ``dvc`` module."""
+
+import subprocess
+
+import calkit
+
+
+def test_get_remotes(tmp_dir):
+    subprocess.call(["git", "init"])
+    assert not calkit.dvc.get_remotes()
+    subprocess.call(["dvc", "init"])
+    assert not calkit.dvc.get_remotes()
+    subprocess.call(
+        [
+            "dvc",
+            "remote",
+            "add",
+            "something",
+            "https://sup.com",
+        ]
+    )
+    subprocess.call(
+        [
+            "dvc",
+            "remote",
+            "add",
+            "something-very-long-remote-that-will-be-more-than-one-line",
+            "https://sup.com/this/is/a/long/remote/url/so/test/this",
+        ]
+    )
+    resp = calkit.dvc.get_remotes()
+    assert resp == {
+        "something": "https://sup.com",
+        "something-very-long-remote-that-will-be-more-than-one-line": (
+            "https://sup.com/this/is/a/long/remote/url/so/test/this"
+        ),
+    }

{calkit_python-0.23.0 → calkit_python-0.23.1}/docs/pipeline/index.md

@@ -37,8 +37,8 @@ pipeline:
       environment: main
       outputs:
         - data/raw.csv
-        - path: data/raw.csv
-          storage: dvc
+        - path: data/meta.json
+          storage: git
           delete_before_run: false
 ```
 

calkit_python-0.23.0/calkit/tests/test_dvc.py

@@ -1,23 +0,0 @@
-"""Tests for the ``dvc`` module."""
-
-import subprocess
-
-import calkit
-
-
-def test_get_remotes(tmp_dir):
-    subprocess.call(["git", "init"])
-    assert not calkit.dvc.get_remotes()
-    subprocess.call(["dvc", "init"])
-    assert not calkit.dvc.get_remotes()
-    subprocess.call(
-        [
-            "dvc",
-            "remote",
-            "add",
-            "something",
-            "https://sup.com",
-        ]
-    )
-    resp = calkit.dvc.get_remotes()
-    assert resp == {"something": "https://sup.com"}