Merge pull request #2299 from jorgeorpinel/master

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

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
 

dvc/command/update.py

@@ -23,7 +23,7 @@ class CmdUpdate(CmdBase):
 
 
 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."
     update_parser = subparsers.add_parser(
         "update",
         parents=[parent_parser],

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")
             )

scripts/completion/dvc.bash

@@ -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'
@@ -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:
 #

scripts/completion/dvc.zsh

@@ -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
@@ -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=(

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):