bump version, merge branch 'devel'

.travis.yml

@@ -14,7 +14,7 @@ stages:
 - check
 - test
 - name: deploy
-  if: repo = casperdcl/git-fame
+  if: repo = casperdcl/git-fame AND NOT type = pull_request
 jobs:
   include:
   - stage: test

gitfame/_gitfame.py

@@ -323,7 +323,7 @@ def run(args):
     try:
       from concurrent.futures import ThreadPoolExecutor  # NOQA
       from tqdm.contrib.concurrent import thread_map
-      mapper = partial(thread_map, desc="Repos", unit="repo",
+      mapper = partial(thread_map, desc="Repos", unit="repo", miniters=1,
                        disable=args.silent_progress or len(gitdirs) <= 1)
     except ImportError:
       mapper = map

gitfame/_utils.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from functools import partial
 import sys
 import subprocess
 import logging
@@ -19,6 +20,13 @@
 
 try:
   from tqdm import tqdm
+  try:
+    from threading import RLock
+  except ImportError:
+    pass
+  else:
+    tqdm.set_lock(RLock())
+    tqdm = partial(tqdm, lock_args=(False,))
 except ImportError:
   class tqdm(object):
     def __init__(self, iterable=None, **kwargs):

gitfame/_version.py

@@ -12,7 +12,7 @@
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 1, 11, 0
+version_info = 1, 11, 1
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))

setup.py

@@ -44,7 +44,8 @@ def cythonize(*args, **kwargs):
     sys.exit(0)
 
 extras_require = dict(yaml=['pyyaml'], tabulate=[])
-extras_require['full'] = list(set(sum(extras_require.values(), ['tqdm'])))
+extras_require['full'] = list(set(sum(
+    extras_require.values(), ['tqdm>=4.42.0'])))
 extras_require['dev'] = list(set(
     extras_require['full'] + ['py-make>=0.1.0', 'twine']))