bump version, merge branch 'devel'

casperdcl · Jun 10, 2020 · 82bf1c7 · 82bf1c7
2 parents fd9c79c + 86418b9
commit 82bf1c7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,6 +37,9 @@ jobs:
   - name: py3.7
     python: 3.7
     env: TOXENV=py37
+  - name: py3.8
+    python: 3.8
+    env: TOXENV=py38
   - name: pypy2.7
     python: pypy
     env: TOXENV=pypy
@@ -133,18 +136,24 @@ jobs:
      - name: snapcraft
        channel: stable
        confinement: classic
+     - name: review-tools
+       channel: stable
      - name: lxd
        channel: stable
     env:
-    - SNAPCRAFT_IMAGE_INFO: '{"build_url": "$TRAVIS_BUILD_URL"}'
+    - SNAPCRAFT_IMAGE_INFO: |
+        '{"build_url": "$TRAVIS_JOB_WEB_URL"}'
+    - SNAPCRAFT_BUILD_ENVIRONMENT: lxd
+    - SNAPCRAFT_BUILD_INFO: 1  # https://snapcraft.io/blog/introducing-developer-notifications-for-snap-security-updates
     before_install:
+    - sudo usermod --append --groups lxd $USER
     - sudo /snap/bin/lxd.migrate -yes
     - sudo /snap/bin/lxd waitready
     - sudo /snap/bin/lxd init --auto
     install:
     - make snapcraft.yaml
     script:
-    - sudo snapcraft --use-lxd
+    - sg lxd -c snapcraft
     after_failure:
     - sudo journalctl -u snapd
     deploy:

diff --git a/gitfame/_gitfame.py b/gitfame/_gitfame.py
@@ -72,6 +72,10 @@
 # NB: does not support escaping of escaped character
 RE_CSPILT = re.compile(r'(?<!\\),')
 RE_NCOM_AUTH_EM = re.compile(r'^\s*(\d+)\s+(.*?)\s+<(.*)>\s*$', flags=re.M)
+# finds "boundary" line-porcelain messages
+RE_BLAME_BOUNDS = re.compile(
+    r'^\w+\s+\d+\s+\d+(\s+\d+)?\s*$[^\t]*?^boundary\s*$[^\t]*?^\t.*?$\r?\n',
+    flags=re.M | re.DOTALL)
 
 
 def hours(dates, maxCommitDiffInSec=120 * 60, firstCommitAdditionInMinutes=120):
@@ -220,6 +224,10 @@ def _get_auth_stats(
       getattr(log, "warn" if warn_binary else "debug")(fname + ':' + str(e))
       continue
     log.log(logging.NOTSET, blame_out)
+
+    # Strip boundary messages,
+    # preventing user with nearest commit to boundary owning the LOC
+    blame_out = RE_BLAME_BOUNDS.sub('', blame_out)
     loc_auth_times = RE_AUTHS.findall(blame_out)
 
     for loc, auth, tstamp in loc_auth_times:  # for each chunk
@@ -265,7 +273,14 @@ def _get_auth_stats(
     old = auth_stats
     auth_stats = {}
     for auth, stats in getattr(old, 'iteritems', old.items)():
-      auth_stats[auth2em[auth]] = stats
+      i = auth_stats.setdefault(auth2em[auth], {"loc": 0,
+                                                "files": set([]),
+                                                "commits": 0,
+                                                "ctimes": []})
+      i["loc"] += stats["loc"]
+      i["files"].update(stats["files"])
+      i["commits"] += stats["commits"]
+      i["ctimes"] += stats["ctimes"]
     del old
 
   return auth_stats

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

diff --git a/setup.py b/setup.py
@@ -111,6 +111,7 @@ def cythonize(*args, **kwargs):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation',
         'Programming Language :: Python :: Implementation :: IronPython',
         'Programming Language :: Python :: Implementation :: PyPy',

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 # deprecation warning: py{26,32,33,34}
-envlist = py{26,27,33,34,35,36,37,py,py3}, flake8, setup.py, nodeps
+envlist = py{26,27,33,34,35,36,37,38,py,py3}, flake8, setup.py, nodeps
 
 [core]
 deps =