From c442e05382aead29711041720e73e23a12060618 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Wed, 18 Mar 2020 01:28:17 +0000 Subject: [PATCH 1/3] progress: limit maximum running bars Fixes #2905 Closes #3453 --- dvc/progress.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dvc/progress.py b/dvc/progress.py index dd7341398c..41811034ec 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -35,6 +35,7 @@ class Tqdm(tqdm): BYTES_DEFAULTS = dict( unit="B", unit_scale=True, unit_divisor=1024, miniters=1 ) + MAX_BARS = 20 # maximum parallel bars to display def __init__( self, @@ -152,3 +153,13 @@ def format_dict(self): d["ncols_desc"] = 1 d["prefix"] = "" return d + + def display(self, msg=None, pos=None): + if pos is None: + pos = abs(getattr(self, "pos", self.MAX_BARS)) + if pos < self.MAX_BARS: + super().display(msg=msg, pos=pos) + + def clear(self, nolock=False): + if abs(getattr(self, "pos", self.MAX_BARS)) < self.MAX_BARS: + super().clear(nolock=nolock) From b388eb4c89aeb596bac8ad30af71a6322ce62f08 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 20 Mar 2020 13:30:36 +0000 Subject: [PATCH 2/3] progress: add hidden message for overflow bars --- dvc/progress.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dvc/progress.py b/dvc/progress.py index 41811034ec..8e8428de0f 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -157,9 +157,12 @@ def format_dict(self): def display(self, msg=None, pos=None): if pos is None: pos = abs(getattr(self, "pos", self.MAX_BARS)) - if pos < self.MAX_BARS: - super().display(msg=msg, pos=pos) + if pos <= self.MAX_BARS: + super().display( + msg=msg if pos < self.MAX_BARS else " ... (more hidden) ...", + pos=pos, + ) def clear(self, nolock=False): - if abs(getattr(self, "pos", self.MAX_BARS)) < self.MAX_BARS: + if abs(getattr(self, "pos", self.MAX_BARS)) <= self.MAX_BARS: super().clear(nolock=nolock) From fa0a0bfe3832ba22c60438270af1cf9b32a5f2f0 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sat, 28 Mar 2020 21:03:11 +0000 Subject: [PATCH 3/3] progress: fix nested bars properly Just use latest `tqdm` :) --- dvc/progress.py | 14 -------------- setup.py | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dvc/progress.py b/dvc/progress.py index 8e8428de0f..dd7341398c 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -35,7 +35,6 @@ class Tqdm(tqdm): BYTES_DEFAULTS = dict( unit="B", unit_scale=True, unit_divisor=1024, miniters=1 ) - MAX_BARS = 20 # maximum parallel bars to display def __init__( self, @@ -153,16 +152,3 @@ def format_dict(self): d["ncols_desc"] = 1 d["prefix"] = "" return d - - def display(self, msg=None, pos=None): - if pos is None: - pos = abs(getattr(self, "pos", self.MAX_BARS)) - if pos <= self.MAX_BARS: - super().display( - msg=msg if pos < self.MAX_BARS else " ... (more hidden) ...", - pos=pos, - ) - - def clear(self, nolock=False): - if abs(getattr(self, "pos", self.MAX_BARS)) <= self.MAX_BARS: - super().clear(nolock=nolock) diff --git a/setup.py b/setup.py index 5f4e577a9b..3b57acc4cd 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ def run(self): "funcy>=1.14", "pathspec>=0.6.0", "shortuuid>=0.5.0", - "tqdm>=4.40.0,<5", + "tqdm>=4.44.0,<5", "packaging>=19.0", "zc.lockfile>=1.2.1", "flufl.lock>=3.2",