Merge branch 'release/v3.39.0'

Author: wolph

.travis.yml

@@ -9,7 +9,7 @@ python:
 install:
 - pip install .
 - pip install -r tests/requirements.txt
-before_script: flake8 --ignore=W391 progressbar tests
+before_script: flake8 progressbar tests
 script:
 - python setup.py test
 - python examples.py

README.rst

@@ -73,6 +73,7 @@ Due to limitations in both the IDLE shell and the Jetbrains (Pycharm) shells thi
 
 - The IDLE editor doesn't support these types of progress bars at all: https://bugs.python.org/issue23220
 - The Jetbrains (Pycharm) editors partially work but break with fast output. As a workaround make sure you only write to either `sys.stdout` (regular print) or `sys.stderr` at the same time. If you do plan to use both, make sure you wait about ~200 milliseconds for the next output or it will break regularly. Linked issue: https://github.com/WoLpH/python-progressbar/issues/115
+- Jupyter notebooks buffer `sys.stdout` which can cause mixed output. This issue can be resolved easily using: `import sys; sys.stdout.flush()`. Linked issue: https://github.com/WoLpH/python-progressbar/issues/173
 
 ******************************************************************************
 Links

progressbar/__about__.py

@@ -19,7 +19,7 @@
 long running operations.
 '''.strip().split())
 __email__ = '[email protected]'
-__version__ = '3.38.0'
+__version__ = '3.39.0'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2015 Rick van Hattem (Wolph)'
 __url__ = 'https://github.com/WoLpH/python-progressbar'

progressbar/bar.py

@@ -434,14 +434,13 @@ def default_widgets(self):
 
     def __call__(self, iterable, max_value=None):
         'Use a ProgressBar to iterate through an iterable'
-        if max_value is None:
+        if max_value is not None:
+            self.max_value = max_value
+        elif self.max_value is None:
             try:
                 self.max_value = len(iterable)
             except TypeError:  # pragma: no cover
-                if self.max_value is None:
-                    self.max_value = base.UnknownLength
-        else:
-            self.max_value = max_value
+                self.max_value = base.UnknownLength
 
         self._iterable = iter(iterable)
         return self
@@ -529,6 +528,7 @@ def _needs_update(self):
             delta = timeit.default_timer() - self._last_update_timer
             poll_status = delta > self.poll_interval.total_seconds()
         else:
+            delta = 0
             poll_status = False
 
         # Do not update if value increment is not large enough to
@@ -542,7 +542,7 @@ def _needs_update(self):
             # ignore any division errors
             pass
 
-        return self.value > self.next_update or poll_status or self.end_time
+        return poll_status or self.end_time
 
     def update(self, value=None, force=False, **kwargs):
         'Updates the ProgressBar to a new value.'
@@ -554,7 +554,7 @@ def update(self, value=None, force=False, **kwargs):
             if self.max_value is base.UnknownLength:
                 # Can't compare against unknown lengths so just update
                 pass
-            elif self.min_value <= value <= self.max_value:
+            elif self.min_value <= value <= self.max_value:  # pragma: no cover
                 # Correct value, let's accept
                 pass
             elif self.max_error:
@@ -647,7 +647,6 @@ def start(self, max_value=None, init=True):
                 )
 
         self.num_intervals = max(100, self.term_width)
-        self.next_update = 0
 
         if self.max_value is not base.UnknownLength and self.max_value < 0:
             raise ValueError('Value out of range')

progressbar/widgets.py

@@ -240,19 +240,20 @@ class SamplesMixin(TimeSensitiveWidgetBase):
     >>> samples(progress, None, True)
     (None, None)
     >>> progress.last_update_time += datetime.timedelta(seconds=1)
-    >>> samples(progress, None, True)
-    (datetime.timedelta(0, 1), 0)
+    >>> samples(progress, None, True) == (datetime.timedelta(seconds=1), 0)
+    True
+
     >>> progress.last_update_time += datetime.timedelta(seconds=1)
-    >>> samples(progress, None, True)
-    (datetime.timedelta(0, 1), 0)
+    >>> samples(progress, None, True) == (datetime.timedelta(seconds=1), 0)
+    True
 
     >>> samples = SamplesMixin(samples=datetime.timedelta(seconds=1))
     >>> _, value = samples(progress, None)
     >>> value
     [1, 1]
 
-    >>> samples(progress, None, True)
-    (datetime.timedelta(0, 1), 0)
+    >>> samples(progress, None, True) == (datetime.timedelta(seconds=1), 0)
+    True
     '''
 
     def __init__(self, samples=datetime.timedelta(seconds=2), key_prefix=None,
@@ -352,10 +353,12 @@ def __call__(self, progress, data, value=None, elapsed=None):
             data['eta_seconds'] = None
             ETA_NA = True
 
+        data['eta'] = None
         if data['eta_seconds']:
-            data['eta'] = utils.format_time(data['eta_seconds'])
-        else:
-            data['eta'] = None
+            try:
+                data['eta'] = utils.format_time(data['eta_seconds'])
+            except (ValueError, OverflowError):  # pragma: no cover
+                pass
 
         if data['value'] == progress.min_value:
             format = self.format_not_started

pytest.ini

@@ -9,18 +9,6 @@ addopts =
     --cov-report html
     --no-cov-on-fail
     --doctest-modules
-    --pep8
-    --flakes
-
-pep8ignore =
-    *.py W391
-    docs/*.py ALL
-    progressbar/six.py ALL
-    ptr.py W191 W503
-
-flakes-ignore =
-    docs/*.py ALL
-    progressbar/six.py ALL
 
 norecursedirs =
     .svn
@@ -31,3 +19,6 @@ norecursedirs =
     dist
     .ropeproject
     .tox
+
+filterwarnings =
+    ignore::DeprecationWarning

setup.cfg

@@ -4,36 +4,6 @@ test=pytest
 [metadata]
 description-file = README.rst
 
-[nosetests]
-verbosity=3
-detailed-errors=1
-debug=nose.loader
-
-with-doctest=1
-
-with-coverage=1
-cover-package=progressbar
-cover-branches=1
-cover-min-percentage=100
-
-#pdb=1
-pdb-failures=1
-
-with-tissue=1
-tissue-ignore=W391
-tissue-package=progressbar
-
-[build_sphinx]
-source-dir = docs/
-build-dir  = docs/_build
-all_files  = 1
-
-[upload_sphinx]
-upload-dir = docs/_build/html
-
-[flake8]
-ignore = W391
-
 [bdist_wheel]
 universal = 1
 

setup.py

@@ -25,6 +25,8 @@
 
 
 install_reqs = []
+needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
+pytest_runner = ['pytest-runner>=2.8'] if needs_pytest else []
 tests_reqs = []
 
 if sys.version_info < (2, 7):
@@ -62,7 +64,7 @@
             'six',
         ],
         tests_require=tests_reqs,
-        setup_requires=['setuptools', 'pytest-runner>=2.8'],
+        setup_requires=['setuptools'] + pytest_runner,
         zip_safe=False,
         extras_require={
             'docs': [

tests/conftest.py

@@ -1,4 +1,5 @@
 import time
+import timeit
 import pytest
 import logging
 import freezegun
@@ -23,6 +24,7 @@ def small_interval(monkeypatch):
     # Remove the update limit for tests by default
     monkeypatch.setattr(
         progressbar.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', 1e-6)
+    monkeypatch.setattr(timeit, 'default_timer', time.time)
 
 
 @pytest.fixture(autouse=True)