Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

output: remove a couple more "(s)" left #2299

Merged
merged 3 commits into from
Jul 20, 2019
Merged

output: remove a couple more "(s)" left #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7ef659
output: remove a couple more "(s)" left
jorgeorpinel Jul 19, 2019
0575104
update: small autocomplete scripts reformat
jorgeorpinel Jul 19, 2019
80c30ce
update: better short desc in command help outut
jorgeorpinel Jul 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dvc/command/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def run(self):
logger.info(stage)
if len(stages) != 0:
logger.info("=" * 80)
logger.info("{} pipeline(s) total".format(len(pipelines)))
logger.info("{} pipelines total".format(len(pipelines)))

return 0

Expand Down
2 changes: 1 addition & 1 deletion dvc/command/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def run(self):


def add_parser(subparsers, parent_parser):
UPDATE_HELP = "Update dependencies and reproduce specified DVC-files."
UPDATE_HELP = "Update data artifacts imported from other DVC repositories."
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please note this change is due to iterative/dvc.org#490 (comment). Feel free to resolve this comment after reading.

update_parser = subparsers.add_parser(
"update",
parents=[parent_parser],
Expand Down
2 changes: 1 addition & 1 deletion dvc/remote/local/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def _process(
fails = sum(map(func, *plans))

if fails:
msg = "{} file(s) failed to {}"
msg = "{} files failed to {}"
raise DvcException(
msg.format(fails, "download" if download else "upload")
)
Expand Down
4 changes: 2 additions & 2 deletions scripts/completion/dvc.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

_dvc_commands='add cache checkout commit config destroy diff fetch get-url get gc \
import-url import init install lock metrics move pipeline pull push \
remote remove repro root run status unlock unprotect version update'
remote remove repro root run status unlock unprotect update version'

_dvc_options='-h --help -V --version'
_dvc_global_options='-h --help -q --quiet -v --verbose'
Expand Down Expand Up @@ -56,8 +56,8 @@ _dvc_run='--no-exec -f --file -c --cwd -d --deps -o --outs -O --outs-no-cache --
_dvc_status='--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -c --cloud $(compgen -G *.dvc)'
_dvc_unlock='$(compgen -G *.dvc)'
_dvc_unprotect='$(compgen -G *)'
_dvc_version=''
_dvc_update='$(compgen -G *.dvc)'
_dvc_version=''

# Notes:
#
Expand Down
4 changes: 2 additions & 2 deletions scripts/completion/dvc.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ _dvc_commands() {
"status:Show changed stages, compare local cache and a remote storage."
"unlock:Unlock DVC-file."
"unprotect:Unprotect data file/directory."
"update:Update data artifacts imported from other DVC repositories."
"version:Show DVC version and system/environment informaion."
"update:Update dependencies and reproduce specified DVC-files."
)

_describe 'dvc commands' _commands
Expand Down Expand Up @@ -96,7 +96,7 @@ _dvc_destroy=(
)

_dvc_diff=(
{-t,--target}"[Source path to a data file or directory.]:Target file(s):"
{-t,--target}"[Source path to a data file or directory.]:Target files:"
)

_dvc_fetch=(
Expand Down
4 changes: 2 additions & 2 deletions tests/func/test_remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def unreliable_upload(self, from_file, to_info, name=None, **kwargs):

with patch.object(RemoteLOCAL, "_upload", unreliable_upload):
assert main(["push"]) == 1
assert str(get_last_exc(caplog)) == "1 file(s) failed to upload"
assert str(get_last_exc(caplog)) == "1 files failed to upload"

assert not remote.exists(remote.checksum_to_path_info(foo.checksum))
assert remote.exists(remote.checksum_to_path_info(bar.checksum))
Expand All @@ -240,7 +240,7 @@ def unreliable_upload(self, from_file, to_info, name=None, **kwargs):

with patch.object(RemoteLOCAL, "_download", side_effect=Exception):
assert main(["pull"]) == 1
assert str(get_last_exc(caplog)) == "2 file(s) failed to download"
assert str(get_last_exc(caplog)) == "2 files failed to download"


def get_last_exc(caplog):
Expand Down