Merge branch 'release/v3.40.0'

.travis.yml

@@ -1,10 +1,12 @@
+dist: xenial
 sudo: false
 language: python
 python:
 - '2.7'
 - '3.4'
 - '3.5'
 - '3.6'
+- '3.7'
 - pypy
 install:
 - pip install .

docs/conf.py

@@ -41,18 +41,6 @@
     'sphinx.ext.napoleon',
 ]
 
-# Monkey patch to disable nonlocal image warning
-import sphinx
-if hasattr(sphinx, 'environment'):
-    original_warn_mode = sphinx.environment.BuildEnvironment.warn_node
-
-    def allow_nonlocal_image_warn_node(self, msg, *args, **kwargs):
-        if not msg.startswith('nonlocal image URI found:'):
-            original_warn_mode(self, msg, *args, **kwargs)
-
-    sphinx.environment.BuildEnvironment.warn_node = \
-        allow_nonlocal_image_warn_node
-
 suppress_warnings = [
     'image.nonlocal_uri',
 ]

progressbar/__about__.py

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

progressbar/bar.py

@@ -10,7 +10,10 @@
 import logging
 import warnings
 from datetime import datetime, timedelta
-import collections
+try:  # pragma: no cover
+    from collections import abc
+except ImportError:  # pragma: no cover
+    import collections as abc
 
 from python_utils import converters
 
@@ -47,7 +50,7 @@ def __del__(self):
                 pass
 
 
-class ProgressBarBase(collections.Iterable, ProgressBarMixinBase):
+class ProgressBarBase(abc.Iterable, ProgressBarMixinBase):
     pass
 
 

setup.py

@@ -71,27 +71,28 @@
                 'sphinx>=1.7.4',
             ],
             'tests': [
-                'flake8>=3.5.0',
-                'pytest>=3.4.0',
-                'pytest-cache>=1.0',
-                'pytest-cov>=2.5.1',
-                'pytest-flakes>=2.0.0',
+                'flake8>=3.7.7',
+                'pytest>=4.3.1',
+                'pytest-cov>=2.6.1',
+                'pytest-flakes>=4.0.0',
                 'pytest-pep8>=1.0.6',
-                'freezegun>=0.3.10',
-                'sphinx>=1.7.1',
+                'freezegun>=0.3.11',
+                'sphinx>=1.8.5',
             ],
         },
         classifiers=[
-            'Development Status :: 5 - Production/Stable',
+            'Development Status :: 6 - Mature',
             'Intended Audience :: Developers',
             'License :: OSI Approved :: BSD License',
             'Natural Language :: English',
             "Programming Language :: Python :: 2",
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.3',
             'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
+            'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: Implementation :: PyPy',
         ],
     )

tox.ini

@@ -9,6 +9,7 @@ basepython =
     py35: python3.5
     py36: python3.6
     py37: python3.7
+    py38: python3.8
     pypy: pypy
 
 deps = -r{toxinidir}/tests/requirements.txt
@@ -20,7 +21,7 @@ deps = flake8
 commands = flake8 {toxinidir}/progressbar {toxinidir}/tests {toxinidir}/examples.py
 
 [testenv:docs]
-basepython = python2.7
+basepython = python3
 deps = -r{toxinidir}/docs/requirements.txt
 whitelist_externals =
     rm