From c7ef6592fe9719f8802671b934516a108928e6e9 Mon Sep 17 00:00:00 2001 From: Jorge Orpinel Date: Fri, 19 Jul 2019 14:10:35 -0600 Subject: [PATCH] output: remove a couple more "(s)" left Per https://github.com/iterative/dvc/pull/2281#issuecomment-513053199 --- dvc/command/pipeline.py | 2 +- dvc/remote/local/__init__.py | 2 +- scripts/completion/dvc.zsh | 2 +- tests/func/test_remote.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dvc/command/pipeline.py b/dvc/command/pipeline.py index 8b7bc2f40..2b7a35ddb 100644 --- a/dvc/command/pipeline.py +++ b/dvc/command/pipeline.py @@ -175,7 +175,7 @@ class CmdPipelineList(CmdBase): 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 diff --git a/dvc/remote/local/__init__.py b/dvc/remote/local/__init__.py index 127a4a3ba..564cda289 100644 --- a/dvc/remote/local/__init__.py +++ b/dvc/remote/local/__init__.py @@ -399,7 +399,7 @@ class RemoteLOCAL(RemoteBASE): 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") ) diff --git a/scripts/completion/dvc.zsh b/scripts/completion/dvc.zsh index e253bc831..b1cab28f7 100644 --- a/scripts/completion/dvc.zsh +++ b/scripts/completion/dvc.zsh @@ -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=( diff --git a/tests/func/test_remote.py b/tests/func/test_remote.py index da4a1de35..dadae44ff 100644 --- a/tests/func/test_remote.py +++ b/tests/func/test_remote.py @@ -229,7 +229,7 @@ def test_partial_push_n_pull(dvc_repo, repo_dir, caplog): 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)) @@ -240,7 +240,7 @@ def test_partial_push_n_pull(dvc_repo, repo_dir, caplog): 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):