dvc-utils 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

dvc_utils/diff.py

@@ -18,6 +18,7 @@ from dvc_utils.path import dvc_paths, dvc_cache_path
     short_help='Diff a DVC-tracked file at two commits (or one commit vs. current worktree), optionally passing both through another command first',
     no_args_is_help=True,
 )
+@option('-b/-B', '--both/--no-both', default=False, help='Merge stderr into stdout in pipeline commands (like shell `2>&1`), so stderr is included in diff output. Default: stderr shown only on command failures.')
 @option('-c/-C', '--color/--no-color', default=None, help='Force or prevent colorized output')
 @option('-r', '--refspec', help='<commit 1>..<commit 2> (compare two commits) or <commit> (compare <commit> to the worktree)')
 @option('-R', '--ref', help='Shorthand for `-r <ref>^..<ref>`, i.e. inspect a specific commit (vs. its parent)')
@@ -29,6 +30,7 @@ from dvc_utils.path import dvc_paths, dvc_cache_path
 @option('-x', '--exec-cmd', 'exec_cmds', multiple=True, help='Command(s) to execute before diffing; alternate syntax to passing commands as positional arguments')
 @argument('args', metavar='[exec_cmd...] <path>', nargs=-1)
 def dvc_diff(
+    both: bool,
     color: bool | None,
     refspec: str | None,
     ref: str | None,
@@ -111,14 +113,16 @@ def dvc_diff(
                 cmds1 = [ shlex.split(cmd) for cmd in cmds1 ]
                 cmds2 = [ shlex.split(cmd) for cmd in cmds2 ]
 
-            join_pipelines(
+            returncode = join_pipelines(
                 base_cmd=['diff', *diff_args],
                 cmds1=cmds1,
                 cmds2=cmds2,
                 verbose=verbose,
                 shell=shell,
                 executable=shell_executable,
+                both=both,
             )
+            exit(returncode)
         else:
             res = process.run('diff', *diff_args, path1 or '/dev/null', path2 or '/dev/null', log=log, check=False)
             exit(res.returncode)

dvc_utils/path.py

@@ -60,7 +60,8 @@ def dvc_md5(
         relpath = basename(dvc_path)
         if relpath.endswith(".dvc"):
             relpath = relpath[:-len(".dvc")]
-        while cur_dir and cur_dir != '.':
+        prev_dir = None
+        while cur_dir and cur_dir != '.' and cur_dir != prev_dir:
             dir_cache_path = dvc_cache_path(ref=git_ref, dvc_path=f"{cur_dir}.dvc", log=log)
             if dir_cache_path:
                 with open(dir_cache_path, 'r') as f:
@@ -71,6 +72,7 @@ def dvc_md5(
                 else:
                     raise RuntimeError(f"{relpath=} not found in DVC-tracked dir {cur_dir}")
             relpath = join(basename(cur_dir), relpath)
+            prev_dir = cur_dir
             cur_dir = dirname(cur_dir)
         return None
     dvc_obj = yaml.safe_load(dvc_spec)

{dvc_utils-0.3.0.dist-info → dvc_utils-0.3.2.dist-info}/METADATA

@@ -1,22 +1,23 @@
 Metadata-Version: 2.4
 Name: dvc-utils
-Version: 0.3.0
+Version: 0.3.2
 Summary: CLI for diffing DVC-tracked files at two commits (or one commit vs. current worktree), optionally passing both through another command first
-Author-email: Ryan Williams <ryan@runsascoded.com>
-License: MIT
 Project-URL: Homepage, https://github.com/runsascoded/dvc-utils
 Project-URL: Author URL, https://github.com/ryan-williams
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
+Author-email: Ryan Williams <ryan@runsascoded.com>
+License: MIT
 License-File: LICENSE
+Requires-Python: >=3.10
 Requires-Dist: click
-Requires-Dist: dffs>=0.0.5
+Requires-Dist: dffs>=0.0.7
 Requires-Dist: pyyaml
 Requires-Dist: utz>=0.20.0
 Provides-Extra: ci
-Requires-Dist: bmdf==0.5.2; extra == "ci"
-Requires-Dist: dvc-s3; extra == "ci"
-Dynamic: license-file
+Requires-Dist: bmdf==0.5.2; extra == 'ci'
+Requires-Dist: dvc-s3; extra == 'ci'
+Provides-Extra: test
+Requires-Dist: pytest>=7.0.0; extra == 'test'
+Description-Content-Type: text/markdown
 
 # dvc-utils
 Diff [DVC] files, optionally piping through other commands first.
@@ -61,6 +62,10 @@ dvc-diff
 #   optional) at HEAD (last committed value) vs. the current worktree content.
 #
 # Options:
+#   -b, --both / -B, --no-both    Merge stderr into stdout in pipeline commands
+#                                 (like shell `2>&1`), so stderr is included in
+#                                 diff output. Default: stderr shown only on
+#                                 command failures.
 #   -c, --color / -C, --no-color  Force or prevent colorized output
 #   -r, --refspec TEXT            <commit 1>..<commit 2> (compare two commits)
 #                                 or <commit> (compare <commit> to the worktree)

dvc_utils-0.3.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+dvc_utils/__init__.py,sha256=Q9_9py_bah16WN6RIryNMelBvG9IJW1B1Sm2PEU87Yk,92
+dvc_utils/cli.py,sha256=et2OeEWJeY0XUuStMVd8qmjtOgDbXl9esn3KYZCQFSI,318
+dvc_utils/diff.py,sha256=wUCbVU4HvEP_YzcsHeL9RMi3yHvNIf2TqAEWSsZTzTo,5368
+dvc_utils/main.py,sha256=cfbwebEc9Auh9DXyah31kvd9Br_uCsUxzOXkucfiSnM,119
+dvc_utils/path.py,sha256=gC9LMCaAVcfCmcOAt7XI_gtk25U6CKoQSDKLRBR4-Qg,3034
+dvc_utils/sync.py,sha256=gDwo0Z4lMK--xRwsACIpJRWS5rF6g7Wou0LJRxNd6b4,481
+dvc_utils-0.3.2.dist-info/METADATA,sha256=9008bq-4FbTfazTVUueQEBQHrIEg2HgaqN6GDXNGxrM,15276
+dvc_utils-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dvc_utils-0.3.2.dist-info/entry_points.txt,sha256=VHnkBNH2bPbP1wX8-rKK_T13f3e9tnmAGBcrP0hjTr0,85
+dvc_utils-0.3.2.dist-info/licenses/LICENSE,sha256=ZS8AReay7xmQzBAHwxIuTouGXz3SKgUa2_Sz8Ip0EzQ,1070
+dvc_utils-0.3.2.dist-info/RECORD,,

{dvc_utils-0.3.0.dist-info → dvc_utils-0.3.2.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

dvc_utils-0.3.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-dvc_utils/__init__.py,sha256=Q9_9py_bah16WN6RIryNMelBvG9IJW1B1Sm2PEU87Yk,92
-dvc_utils/cli.py,sha256=et2OeEWJeY0XUuStMVd8qmjtOgDbXl9esn3KYZCQFSI,318
-dvc_utils/diff.py,sha256=7YDlsIsVeaU6QEWjhzd2zM9_6eB6mr50kjCKcGNBa0U,5070
-dvc_utils/main.py,sha256=cfbwebEc9Auh9DXyah31kvd9Br_uCsUxzOXkucfiSnM,119
-dvc_utils/path.py,sha256=tdigsKTCZPhCIb9wRX4e_tj1lUxa2gm6lXERlfb8qY4,2955
-dvc_utils/sync.py,sha256=gDwo0Z4lMK--xRwsACIpJRWS5rF6g7Wou0LJRxNd6b4,481
-dvc_utils-0.3.0.dist-info/licenses/LICENSE,sha256=ZS8AReay7xmQzBAHwxIuTouGXz3SKgUa2_Sz8Ip0EzQ,1070
-dvc_utils-0.3.0.dist-info/METADATA,sha256=iZCUEBwGGx3kilieHZwkJGqNtVRe11kJjNnprVTiJP4,14941
-dvc_utils-0.3.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-dvc_utils-0.3.0.dist-info/entry_points.txt,sha256=VHnkBNH2bPbP1wX8-rKK_T13f3e9tnmAGBcrP0hjTr0,85
-dvc_utils-0.3.0.dist-info/top_level.txt,sha256=jT0-PJa2t_eFRE9rn-52AjdnZ8nQeEHllf2kJmaGh80,10
-dvc_utils-0.3.0.dist-info/RECORD,,

dvc_utils-0.3.0.dist-info/top_level.txt

@@ -1 +0,0 @@
-dvc_utils