diff --git a/requirements-dev.txt b/requirements-dev.txt index 7721a5c998e5..2e04e363f873 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ pytest-cov pytest-xdist dill # Test contrib dependencies -tqdm<=4.48.0 +tqdm scikit-learn matplotlib tensorboardX diff --git a/tests/ignite/contrib/handlers/test_tqdm_logger.py b/tests/ignite/contrib/handlers/test_tqdm_logger.py index 7bdb6b6f13d6..8bc120b515ec 100644 --- a/tests/ignite/contrib/handlers/test_tqdm_logger.py +++ b/tests/ignite/contrib/handlers/test_tqdm_logger.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import sys import time +from distutils.version import LooseVersion import numpy as np import pytest @@ -15,6 +16,12 @@ pytest.skip("Skip if on Windows", allow_module_level=True) +def get_tqdm_version(): + import tqdm + + return LooseVersion(tqdm.__version__) + + def update_fn(engine, batch): a = 1 engine.state.metrics["a"] = a @@ -36,7 +43,10 @@ def test_pbar(capsys): err = captured.err.split("\r") err = list(map(lambda x: x.strip(), err)) err = list(filter(None, err)) - expected = "Epoch [2/2]: [1/2] 50%|█████ , a=1 [00:00<00:00]" + if get_tqdm_version() < LooseVersion("4.49.0"): + expected = "Epoch [2/2]: [1/2] 50%|█████ , a=1 [00:00<00:00]" + else: + expected = "Epoch [2/2]: [1/2] 50%|█████ , a=1 [00:00