Merge branch 'develop' of github.com:WoLpH/python-progressbar into develop

Author: wolph

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: WoLpH

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.4.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: check-yaml
+    -   id: check-added-large-files
+
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.9
+    hooks:
+    -   id: flake8

.travis.yml

@@ -7,13 +7,14 @@ python:
 - '3.5'
 - '3.6'
 - '3.7'
+- '3.8'
 - pypy
 install:
 - pip install -U .
 - pip install -U -r tests/requirements.txt
-before_script: flake8 progressbar tests examples
+before_script: flake8 progressbar tests examples.py
 script:
-- python setup.py test
+- py.test
 - python examples.py
 after_success:
 - coveralls

CONTRIBUTING.rst

@@ -3,7 +3,7 @@ Contributing
 ============
 
 Contributions are welcome, and they are greatly appreciated! Every
-little bit helps, and credit will always be given. 
+little bit helps, and credit will always be given.
 
 You can contribute in many ways:
 
@@ -36,7 +36,7 @@ is open to whoever wants to implement it.
 Write Documentation
 ~~~~~~~~~~~~~~~~~~~
 
-Python Progressbar could always use more documentation, whether as part of the 
+Python Progressbar could always use more documentation, whether as part of the
 official Python Progressbar docs, in docstrings, or even on the web in blog posts,
 articles, and such.
 
@@ -75,7 +75,7 @@ Ready to contribute? Here's how to set up `python-progressbar` for local develop
    Or without git-flow:
 
     $ git checkout -b feature/name-of-your-bugfix-or-feature
-   
+
    Now you can make your changes locally.
 
 5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
@@ -85,7 +85,7 @@ Ready to contribute? Here's how to set up `python-progressbar` for local develop
     $ tox
 
    To get flake8 and tox, just pip install them into your virtualenv using the requirements file.
-   
+
     $ pip install -r tests/requirements.txt
 
 6. Commit your changes and push your branch to GitHub with `git-flow-avh`_::
@@ -111,7 +111,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.7, 3.3, and for PyPy. Check 
+3. The pull request should work for Python 2.7, 3.3, and for PyPy. Check
    https://travis-ci.org/WoLpH/python-progressbar/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

MANIFEST.in

@@ -8,3 +8,5 @@ include requirements.txt
 include Makefile
 include pytest.ini
 recursive-include tests *
+recursive-exclude *.pyc
+recursive-exclude *.pyo

Makefile

@@ -19,11 +19,11 @@ Install
 The package can be installed through `pip` (this is the recommended method):
 
     pip install progressbar2
-    
+
 Or if `pip` is not available, `easy_install` should work as well:
 
     easy_install progressbar2
-    
+
 Or download the latest release from Pypi (https://pypi.python.org/pypi/progressbar2) or Github.
 
 Note that the releases on Pypi are signed with my GPG key (https://pgp.mit.edu/pks/lookup?op=vindex&search=0xE81444E9CE1F695D) and can be checked using GPG:
@@ -83,7 +83,7 @@ Links
     - https://progressbar-2.readthedocs.org/en/latest/
 * Source
     - https://github.com/WoLpH/python-progressbar
-* Bug reports 
+* Bug reports
     - https://github.com/WoLpH/python-progressbar/issues
 * Package homepage
     - https://pypi.python.org/pypi/progressbar2
@@ -103,7 +103,7 @@ Wrapping an iterable
 
     import time
     import progressbar
- 
+
     for i in progressbar.progressbar(range(100)):
         time.sleep(0.02)
 
@@ -119,7 +119,7 @@ One option to force early initialization is by using the `WRAP_STDERR`
 environment variable, on Linux/Unix systems this can be done through:
 
 .. code:: sh
-   
+
     # WRAP_STDERR=true python your_script.py
 
 If you need to flush manually while wrapping, you can do so using:

README.rst

@@ -1,9 +1,9 @@
-Modifications: 
+Modifications:
 
 Copyright (c) 2012 Rick van Hattem.
 
 
-Original Projects: 
+Original Projects:
 
 Copyright (c) 2010 Kenneth Reitz.
 Copyright (c) 2010 by Armin Ronacher.

docs/_theme/LICENSE

@@ -4,4 +4,4 @@ stylesheet = flasky.css
 pygments_style = flask_theme_support.FlaskyStyle
 
 [options]
-touch_icon = 
+touch_icon =

docs/_theme/wolph/theme.conf

@@ -1,7 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+from __future__ import unicode_literals
+from __future__ import with_statement
 
 import functools
 import random
@@ -81,8 +85,30 @@ def basic_widget_example():
 
 @example
 def color_bar_example():
-    widgets = ['\x1b[33mColorful example\x1b[39m', progressbar.Percentage(),
-               progressbar.Bar(marker='\x1b[32m#\x1b[39m')]
+    widgets = [
+        '\x1b[33mColorful example\x1b[39m',
+        progressbar.Percentage(),
+        progressbar.Bar(marker='\x1b[32m#\x1b[39m'),
+    ]
+    bar = progressbar.ProgressBar(widgets=widgets, max_value=10).start()
+    for i in range(10):
+        # do something
+        time.sleep(0.1)
+        bar.update(i + 1)
+    bar.finish()
+
+
+@example
+def color_bar_animated_marker_example():
+    widgets = [
+        # Colored animated marker with colored fill:
+        progressbar.Bar(marker=progressbar.AnimatedMarker(
+            fill='x',
+            # fill='█',
+            fill_wrap='\x1b[32m{}\x1b[39m',
+            marker_wrap='\x1b[31m{}\x1b[39m',
+        )),
+    ]
     bar = progressbar.ProgressBar(widgets=widgets, max_value=10).start()
     for i in range(10):
         # do something