From b774a08d74ddf06aa92d624f6c1e657aed3f4740 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 6 Dec 2019 12:18:39 -0800 Subject: [PATCH 1/4] FIX: minor typo in CHANGELOG.md Co-Authored-By: Mathias Goncalves --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4003c8ef..cd59e4b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,7 @@ version boost. - Do not crash and store original .json file is "JSON pretification" fails ([#342][]) - ReproIn heuristic - - tollerate WIP prefix on Philips scanners ([#343][]) + - tolerate WIP prefix on Philips scanners ([#343][]) - allow for use of `(...)` instead of `{...}` since `{}` are not allowed ([#343][]) - Support pipolar fieldmaps by providing them with `_epi` not `_magnitude`. From b694332b7f87132fa2267557074a0607ff534afc Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 6 Dec 2019 21:18:45 -0500 Subject: [PATCH 2/4] RF: use tmpdir not tmp_path fixture For compatibility with older pytest (e.g. 3.6.4 e.g. on ubuntu 18.04) Fixes #400 --- heudiconv/tests/test_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/heudiconv/tests/test_utils.py b/heudiconv/tests/test_utils.py index ad846737..00f8a0a2 100644 --- a/heudiconv/tests/test_utils.py +++ b/heudiconv/tests/test_utils.py @@ -67,11 +67,11 @@ def test_json_dumps_pretty(): assert pretty({'WipMemBlock': tstr}) == '{\n "WipMemBlock": "%s"\n}' % tstr -def test_load_json(tmp_path, caplog): +def test_load_json(tmpdir, caplog): # test invalid json ifname = 'invalid.json' - invalid_json_file = str(tmp_path / ifname) - create_tree(str(tmp_path), {ifname: u"I'm Jason Bourne"}) + invalid_json_file = str(tmpdir / ifname) + create_tree(str(tmpdir), {ifname: u"I'm Jason Bourne"}) with pytest.raises(JSONDecodeError): load_json(str(invalid_json_file)) @@ -81,7 +81,7 @@ def test_load_json(tmp_path, caplog): # test valid json vcontent = {"secret": "spy"} vfname = "valid.json" - valid_json_file = str(tmp_path / vfname) + valid_json_file = str(tmpdir / vfname) save_json(valid_json_file, vcontent) assert load_json(valid_json_file) == vcontent From d0e406f7347731446c1ea95763a9cd0833210fff Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 6 Dec 2019 21:20:11 -0500 Subject: [PATCH 3/4] ENH(TST): Fix version to older pytest to ease backward compatibility testing --- dev-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index feddbe90..aa41cc1d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,5 @@ -r requirements.txt -pytest +# Fix version to older pytest to ease backward compatibility testing +pytest==3.6.4 tinydb inotify From ea4bb74efae389ad9e10f8c73f1cff1dce1ce927 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 16 Dec 2019 13:59:17 -0500 Subject: [PATCH 4/4] Boost perspective release date in changelog to today --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd59e4b9..bc9070e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.6.0] - 2019-12-05 +## [0.6.0] - 2019-12-16 This is largely a bug fix. Metadata and order of `_key-value` fields in BIDS could change from the result of converting using previous versions, thus minor