Merge pull request #183 from dartmouth-pbs/bf-pretty-json

BF: do not remove all spaces after a number

Author: yarikoptic

heudiconv/utils.py

@@ -200,7 +200,8 @@ 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]+"?)[ \n]*', r' \1', js_)
+    js_ = re.sub('  *("?[-+.0-9e]+"?)(?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

tests/test_main.py

@@ -3,7 +3,6 @@
 from heudiconv.cli.run import main as runner
 from heudiconv import __version__
 from heudiconv.utils import (create_file_if_missing,
-                             json_dumps_pretty,
                              set_readonly,
                              is_readonly)
 from heudiconv.bids import (populate_bids_templates,
@@ -17,7 +16,6 @@
 import csv
 import os
 import pytest
-import stat
 import sys
 
 from mock import patch
@@ -154,15 +152,6 @@ def test_prepare_for_datalad(tmpdir):
     assert '.heudiconv/dummy.nii.gz' not in ds.repo.get_files()
 
 
-def test_json_dumps_pretty():
-    pretty = json_dumps_pretty
-    assert pretty({}) == "{}"
-    assert pretty({"a": -1, "b": "123", "c": [1, 2, 3], "d": ["1.0", "2.0"]}) \
-        == '{\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}'
-
-
 def test_get_formatted_scans_key_row():
     item = [
          ('%s/01-fmap_acq-3mm/1.3.12.2.1107.5.2.43.66112.2016101409263663466202201.dcm'

tests/test_utils.py

@@ -3,8 +3,8 @@
 from heudiconv.utils import (
     get_known_heuristics_with_descriptions,
     get_heuristic_description,
-    load_heuristic
-)
+    load_heuristic,
+    json_dumps_pretty)
 
 import pytest
 from .utils import HEURISTICS_PATH
@@ -40,4 +40,15 @@ def test_load_heuristic():
         load_heuristic('unknownsomething')
 
     with pytest.raises(ImportError):
-        load_heuristic(op.join(HEURISTICS_PATH, 'unknownsomething.py'))
+        load_heuristic(op.join(HEURISTICS_PATH, 'unknownsomething.py'))
+
+
+def test_json_dumps_pretty():
+    pretty = json_dumps_pretty
+    assert pretty({"SeriesDescription": "Trace:Nov 13 2017 14-36-14 EST"}) \
+        == '{\n  "SeriesDescription": "Trace:Nov 13 2017 14-36-14 EST"\n}'
+    assert pretty({}) == "{}"
+    assert pretty({"a": -1, "b": "123", "c": [1, 2, 3], "d": ["1.0", "2.0"]}) \
+        == '{\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}'

utils/test-compare-two-versions.sh

@@ -7,7 +7,7 @@
 PS1=+
 set -eu
 
-outdir=${OUTDIR:=compare-versions/$(basename $1)}
+outdir=${OUTDIR:=compare-versions}
 
 RUN=echo
 RUN=
@@ -33,14 +33,15 @@ function run() {
    $RUN heudiconv --random-seed 1 -c dcm2niix -o $out --datalad --bids "$@" >| $out.log 2>&1
 }
 
-run heudiconv        rolando -f heudiconv/heuristics/dbic_bids.py "$@"
-run heudiconv-master master  -f reproin                   --files "$@"
+other=other
+run heudiconv        $other "$@"
+run heudiconv-master master "$@"
 
 cd $outdir
 #git remote add rolando "$outdir/rolando"
 #git fetch rolando
 # git diff --stat rolando/master..
-if diff  -Naur --exclude=.git --ignore-matching-lines='^\s*id\s*=.*' rolando master >| diff.patch; then
+if diff  -Naur --exclude=.git --ignore-matching-lines='^\s*id\s*=.*' $other master >| diff.patch; then
     echo "Results are identical"
 else
     echo "Results differ: $PWD/diff.patch"