Merge tag 'v0.5.3' into debian

[0.5.3] - 2019-01-12

Minor hot bugfix release

Fixed
- Do not shorten spaces in the dates while pretty printing .json

* tag 'v0.5.3':
  Changelog+version boost for 0.5.3
  FIX: issue template
  fix: actually use template for issues
  maint: outline issue reporting, ignore certain files when docker building
  BF: avoid changing spacing in the dates strings while tuning pretty printed json
  Show must go on

Author: yarikoptic

.dockerignore

@@ -0,0 +1,2 @@
+Dockerfile
+.git/

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+### Summary
+<!-- If you are having conversion troubles, please share as much
+relevant information as possible. This includes, but is not limited to:
+- log of conversion
+- heuristic
+-->
+
+
+
+### Platform details:
+
+Choose one:
+- [ ] Local environment
+<!-- If selected, please provide OS and python version -->
+- [ ] Container
+<!-- If selected, please provide container name and tag"-->
+
+- Heudiconv version: 
+<!-- Command: heudiconv --version -->

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented (for humans) in this file
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.5.3] - 2019-01-12
+
+Minor hot bugfix release
+
+### Fixed
+- Do not shorten spaces in the dates while pretty printing .json
+
 ## [0.5.2] - 2019-01-04
 
 A variety of bugfixes

heudiconv/info.py

@@ -1,4 +1,4 @@
-__version__ = "0.5.2"
+__version__ = "0.5.3"
 __author__ = "HeuDiConv team and contributors"
 __url__ = "https://github.com/nipy/heudiconv"
 __packagename__ = 'heudiconv'

heudiconv/tests/test_utils.py

@@ -52,3 +52,10 @@ def test_json_dumps_pretty():
         == '{\n  "a": -1,\n  "b": "123",\n  "c": [1, 2, 3],\n  "d": ["1.0", "2.0"]\n}'
     assert pretty({'a': ["0.3", "-1.9128906358217845e-12", "0.2"]}) \
         == '{\n  "a": ["0.3", "-1.9128906358217845e-12", "0.2"]\n}'
+    # original, longer string
+    tstr = 'f9a7d4be-a7d7-47d2-9de0-b21e9cd10755||' \
+          'Sequence: ve11b/master r/50434d5; ' \
+          'Mar  3 2017 10:46:13 by eja'
+    # just the date which reveals the issue
+    # tstr = 'Mar  3 2017 10:46:13 by eja'
+    assert pretty({'WipMemBlock': tstr}) == '{\n  "WipMemBlock": "%s"\n}' % tstr

heudiconv/utils.py

@@ -217,8 +217,16 @@ def json_dumps_pretty(j, indent=2, sort_keys=True):
     # uniform no spaces before ]
     js_ = re.sub(" *\]", "]", js_)
     # uniform spacing before numbers
-    js_ = re.sub('  *("?[-+.0-9e]+"?)(?P<space> ?)[ \n]*',
-                 r' \1\g<space>', js_)
+    # But that thing could screw up dates within strings which would have 2 spaces
+    # in a date like Mar  3 2017, so we do negative lookahead to avoid changing
+    # in those cases
+    #import pdb; pdb.set_trace()
+    js_ = re.sub(
+        '(?<!\w{3})'    # negative lookbehind for the month
+        '  *("?[-+.0-9e]+"?)'
+        '(?! [123]\d{3})'  # negative lookahead for a year
+        '(?P<space> ?)[ \n]*',
+        r' \1\g<space>', js_)
     # no spaces after [
     js_ = re.sub('\[ ', '[', js_)
     # the load from the original dump and reload from tuned up