From cba4c45bdbb72cc46ebe6f284907dbc7395a30d1 Mon Sep 17 00:00:00 2001 From: kurianbenoy Date: Sun, 28 Jul 2019 05:30:14 +0530 Subject: [PATCH] removed show-checksums for files pull, push, data_sync.py and from test files --- dvc/command/data_sync.py | 6 ------ dvc/repo/pull.py | 2 -- dvc/repo/push.py | 5 +---- dvc/repo/status.py | 2 +- tests/func/test_data_cloud.py | 7 ------- 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dvc/command/data_sync.py b/dvc/command/data_sync.py index f3b519605..b06412099 100644 --- a/dvc/command/data_sync.py +++ b/dvc/command/data_sync.py @@ -100,12 +100,6 @@ def shared_parent_parser(): shared_parent_parser.add_argument( "-j", "--jobs", type=int, help="Number of jobs to run simultaneously." ) - shared_parent_parser.add_argument( - "--show-checksums", - action="store_true", - default=False, - help="Show checksums instead of file names.", - ) shared_parent_parser.add_argument( "targets", nargs="*", diff --git a/dvc/repo/pull.py b/dvc/repo/pull.py index 380bc86a3..df29dde02 100644 --- a/dvc/repo/pull.py +++ b/dvc/repo/pull.py @@ -7,7 +7,6 @@ def pull( jobs=None, remote=None, all_branches=False, - show_checksums=False, with_deps=False, all_tags=False, force=False, @@ -19,7 +18,6 @@ def pull( remote=remote, all_branches=all_branches, all_tags=all_tags, - show_checksums=show_checksums, with_deps=with_deps, recursive=recursive, ) diff --git a/dvc/repo/push.py b/dvc/repo/push.py index 8787a07c9..c2f43778c 100644 --- a/dvc/repo/push.py +++ b/dvc/repo/push.py @@ -7,7 +7,6 @@ def push( jobs=None, remote=None, all_branches=False, - show_checksums=False, with_deps=False, all_tags=False, recursive=False, @@ -23,6 +22,4 @@ def push( jobs=jobs, recursive=recursive, )["local"] - return self.cloud.push( - used, jobs, remote=remote, show_checksums=show_checksums - ) + return self.cloud.push(used, jobs, remote=remote) diff --git a/dvc/repo/status.py b/dvc/repo/status.py index 32736341a..41e990181 100644 --- a/dvc/repo/status.py +++ b/dvc/repo/status.py @@ -74,7 +74,7 @@ def _cloud_status( ret = {} status_info = self.cloud.status(used, jobs, remote=remote) - for md5, info in status_info.items(): + for _, info in status_info.items(): name = info["name"] status = info["status"] if status in [cloud.STATUS_OK, cloud.STATUS_MISSING]: diff --git a/tests/func/test_data_cloud.py b/tests/func/test_data_cloud.py index a6092c61f..f7bf341fd 100644 --- a/tests/func/test_data_cloud.py +++ b/tests/func/test_data_cloud.py @@ -507,19 +507,14 @@ class TestDataCloudCLIBase(TestDvc): cache_dir = stage_dir.outs[0].cache_path # FIXME check status output - self.main(["status", "-c", "--show-checksums"] + args) self.main(["push"] + args) self.assertTrue(os.path.exists(cache)) self.assertTrue(os.path.isfile(cache)) self.assertTrue(os.path.isfile(cache_dir)) - self.main(["status", "-c", "--show-checksums"] + args) - shutil.rmtree(self.dvc.cache.local.cache_dir) - self.main(["status", "-c", "--show-checksums"] + args) - self.main(["fetch"] + args) self.assertTrue(os.path.exists(cache)) self.assertTrue(os.path.isfile(cache)) @@ -536,8 +531,6 @@ class TestDataCloudCLIBase(TestDvc): self.assertEqual(fd.read(), self.FOO_CONTENTS) self.assertTrue(os.path.isfile(cache_dir)) - self.main(["status", "-c", "--show-checksums"] + args) - # NOTE: check if remote gc works correctly on directories self.main(["gc", "-c", "-f"] + args) shutil.move(