dvc-utils 0.0.7__tar.gz → 0.0.8__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dvc-utils
3
- Version: 0.0.7
3
+ Version: 0.0.8
4
4
  Summary: CLI for diffing DVC files at two commits (or one commit vs. current worktree), optionally passing both through another command first
5
5
  Home-page: https://github.com/runsascoded/dvc-utils
6
6
  Author: Ryan Williams
@@ -63,17 +63,22 @@ dvc-diff --help
63
63
  # optional) at HEAD (last committed value) vs. the current worktree content.
64
64
  #
65
65
  # Options:
66
- # -c, --color Colorize the output
67
- # -r, --refspec TEXT <commit 1>..<commit 2> (compare two commits) or
68
- # <commit> (compare <commit> to the worktree)
69
- # -S, --no-shell Don't pass `shell=True` to Python `subprocess`es
70
- # -U, --unified INTEGER Number of lines of context to show (passes through
71
- # to `diff`)
72
- # -v, --verbose Log intermediate commands to stderr
73
- # -w, --ignore-whitespace Ignore whitespace differences (pass `-w` to `diff`)
74
- # -x, --exec-cmd TEXT Command(s) to execute before diffing; alternate
75
- # syntax to passing commands as positional arguments
76
- # --help Show this message and exit.
66
+ # -c, --color Colorize the output
67
+ # -r, --refspec TEXT <commit 1>..<commit 2> (compare two commits) or
68
+ # <commit> (compare <commit> to the worktree)
69
+ # -s, --shell-executable TEXT Shell to use for executing commands; defaults
70
+ # to $SHELL (/bin/bash)
71
+ # -S, --no-shell Don't pass `shell=True` to Python
72
+ # `subprocess`es
73
+ # -U, --unified INTEGER Number of lines of context to show (passes
74
+ # through to `diff`)
75
+ # -v, --verbose Log intermediate commands to stderr
76
+ # -w, --ignore-whitespace Ignore whitespace differences (pass `-w` to
77
+ # `diff`)
78
+ # -x, --exec-cmd TEXT Command(s) to execute before diffing; alternate
79
+ # syntax to passing commands as positional
80
+ # arguments
81
+ # --help Show this message and exit.
77
82
  ```
78
83
 
79
84
  ## Examples <a id="examples"></a>
@@ -52,17 +52,22 @@ dvc-diff --help
52
52
  # optional) at HEAD (last committed value) vs. the current worktree content.
53
53
  #
54
54
  # Options:
55
- # -c, --color Colorize the output
56
- # -r, --refspec TEXT <commit 1>..<commit 2> (compare two commits) or
57
- # <commit> (compare <commit> to the worktree)
58
- # -S, --no-shell Don't pass `shell=True` to Python `subprocess`es
59
- # -U, --unified INTEGER Number of lines of context to show (passes through
60
- # to `diff`)
61
- # -v, --verbose Log intermediate commands to stderr
62
- # -w, --ignore-whitespace Ignore whitespace differences (pass `-w` to `diff`)
63
- # -x, --exec-cmd TEXT Command(s) to execute before diffing; alternate
64
- # syntax to passing commands as positional arguments
65
- # --help Show this message and exit.
55
+ # -c, --color Colorize the output
56
+ # -r, --refspec TEXT <commit 1>..<commit 2> (compare two commits) or
57
+ # <commit> (compare <commit> to the worktree)
58
+ # -s, --shell-executable TEXT Shell to use for executing commands; defaults
59
+ # to $SHELL (/bin/bash)
60
+ # -S, --no-shell Don't pass `shell=True` to Python
61
+ # `subprocess`es
62
+ # -U, --unified INTEGER Number of lines of context to show (passes
63
+ # through to `diff`)
64
+ # -v, --verbose Log intermediate commands to stderr
65
+ # -w, --ignore-whitespace Ignore whitespace differences (pass `-w` to
66
+ # `diff`)
67
+ # -x, --exec-cmd TEXT Command(s) to execute before diffing; alternate
68
+ # syntax to passing commands as positional
69
+ # arguments
70
+ # --help Show this message and exit.
66
71
  ```
67
72
 
68
73
  ## Examples <a id="examples"></a>
@@ -69,6 +69,7 @@ def dvc_cache_path(ref: str, dvc_path: Optional[str] = None, log: bool = False)
69
69
  @cli.command('diff', short_help='Diff a DVC-tracked file at two commits (or one commit vs. current worktree), optionally passing both through another command first')
70
70
  @option('-c', '--color', is_flag=True, help='Colorize the output')
71
71
  @option('-r', '--refspec', default='HEAD', help='<commit 1>..<commit 2> (compare two commits) or <commit> (compare <commit> to the worktree)')
72
+ @option('-s', '--shell-executable', help=f'Shell to use for executing commands; defaults to $SHELL ({env.get("SHELL")})')
72
73
  @option('-S', '--no-shell', is_flag=True, help="Don't pass `shell=True` to Python `subprocess`es")
73
74
  @option('-U', '--unified', type=int, help='Number of lines of context to show (passes through to `diff`)')
74
75
  @option('-v', '--verbose', is_flag=True, help="Log intermediate commands to stderr")
@@ -78,6 +79,7 @@ def dvc_cache_path(ref: str, dvc_path: Optional[str] = None, log: bool = False)
78
79
  def dvc_utils_diff(
79
80
  color: bool,
80
81
  refspec: str | None,
82
+ shell_executable: str | None,
81
83
  no_shell: bool,
82
84
  unified: int | None,
83
85
  verbose: bool,
@@ -140,6 +142,7 @@ def dvc_utils_diff(
140
142
  color=color,
141
143
  unified=unified,
142
144
  ignore_whitespace=ignore_whitespace,
145
+ shell_executable=shell_executable,
143
146
  **shell_kwargs,
144
147
  )
145
148
  else:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dvc-utils
3
- Version: 0.0.7
3
+ Version: 0.0.8
4
4
  Summary: CLI for diffing DVC files at two commits (or one commit vs. current worktree), optionally passing both through another command first
5
5
  Home-page: https://github.com/runsascoded/dvc-utils
6
6
  Author: Ryan Williams
@@ -63,17 +63,22 @@ dvc-diff --help
63
63
  # optional) at HEAD (last committed value) vs. the current worktree content.
64
64
  #
65
65
  # Options:
66
- # -c, --color Colorize the output
67
- # -r, --refspec TEXT <commit 1>..<commit 2> (compare two commits) or
68
- # <commit> (compare <commit> to the worktree)
69
- # -S, --no-shell Don't pass `shell=True` to Python `subprocess`es
70
- # -U, --unified INTEGER Number of lines of context to show (passes through
71
- # to `diff`)
72
- # -v, --verbose Log intermediate commands to stderr
73
- # -w, --ignore-whitespace Ignore whitespace differences (pass `-w` to `diff`)
74
- # -x, --exec-cmd TEXT Command(s) to execute before diffing; alternate
75
- # syntax to passing commands as positional arguments
76
- # --help Show this message and exit.
66
+ # -c, --color Colorize the output
67
+ # -r, --refspec TEXT <commit 1>..<commit 2> (compare two commits) or
68
+ # <commit> (compare <commit> to the worktree)
69
+ # -s, --shell-executable TEXT Shell to use for executing commands; defaults
70
+ # to $SHELL (/bin/bash)
71
+ # -S, --no-shell Don't pass `shell=True` to Python
72
+ # `subprocess`es
73
+ # -U, --unified INTEGER Number of lines of context to show (passes
74
+ # through to `diff`)
75
+ # -v, --verbose Log intermediate commands to stderr
76
+ # -w, --ignore-whitespace Ignore whitespace differences (pass `-w` to
77
+ # `diff`)
78
+ # -x, --exec-cmd TEXT Command(s) to execute before diffing; alternate
79
+ # syntax to passing commands as positional
80
+ # arguments
81
+ # --help Show this message and exit.
77
82
  ```
78
83
 
79
84
  ## Examples <a id="examples"></a>
@@ -2,7 +2,7 @@ from setuptools import setup
2
2
 
3
3
  setup(
4
4
  name='dvc-utils',
5
- version="0.0.7",
5
+ version="0.0.8",
6
6
  description="CLI for diffing DVC files at two commits (or one commit vs. current worktree), optionally passing both through another command first",
7
7
  long_description=open("README.md").read(),
8
8
  long_description_content_type="text/markdown",
File without changes
File without changes