diff --git a/dvc/progress.py b/dvc/progress.py index c0a67b323..64c021653 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -50,8 +50,7 @@ class Tqdm(tqdm): level=logging.ERROR, desc=None, desc_truncate=None, - leave=None, - level_leave=logging.DEBUG, + leave=False, bar_format=None, bytes=False, # pylint: disable=W0622 **kwargs @@ -63,8 +62,6 @@ class Tqdm(tqdm): desc_truncate : like `desc` but will `truncate()` and not persist level : effective logging level for determining `disable`; used only if `disable` is unspecified - level_leave : effective logging level for determining `leave`; - used only if `leave` is unspecified kwargs : anything accepted by `tqdm.tqdm()` """ kwargs = kwargs.copy() @@ -79,8 +76,6 @@ class Tqdm(tqdm): desc = self.truncate(desc_truncate) if disable is None: disable = logger.getEffectiveLevel() > level - if leave is None: - leave = logger.getEffectiveLevel() <= level_leave super(Tqdm, self).__init__( iterable=iterable, disable=disable, diff --git a/dvc/repo/checkout.py b/dvc/repo/checkout.py index 26057c15c..40f4b123b 100644 --- a/dvc/repo/checkout.py +++ b/dvc/repo/checkout.py @@ -45,7 +45,7 @@ def checkout(self, target=None, with_deps=False, force=False, recursive=False): unit="file", desc="Checkout", disable=total == 0, - level_leave=logging.INFO, + leave=logger.getEffectiveLevel() < logging.CRITICAL, ) as pbar: for stage in stages: if stage.locked: diff --git a/dvc/utils/__init__.py b/dvc/utils/__init__.py index 050f65366..9878a8c2e 100644 --- a/dvc/utils/__init__.py +++ b/dvc/utils/__init__.py @@ -51,16 +51,16 @@ def file_md5(fname): hash_md5 = hashlib.md5() binary = not istextfile(fname) size = os.path.getsize(fname) - bar = False + no_progress_bar = True if size >= LARGE_FILE_SIZE: - bar = True + no_progress_bar = False msg = "Computing md5 for a large file {}. This is only done once." logger.info(msg.format(relpath(fname))) name = relpath(fname) with Tqdm( desc_truncate=name, - disable=not bar, + disable=no_progress_bar, total=size, bytes=True, leave=False,