Merge branch 'rel/3.0.0' into 'v3.0'

Rel/3.0.0

See merge request fsl/fslpy!222

CHANGELOG.rst

@@ -75,7 +75,8 @@ Fixed
   functions.
 * Fixed the :func:`.DeformationField.transform` method so it works with
   a single set of coordinates.
-
+* :class:`.Image` creation does not fail if ``loadMeta`` is set, and a
+  sidecar file containing invalid JSON is present.
 
 Removed
 ^^^^^^^

fsl/data/image.py

@@ -1162,11 +1162,19 @@ class Image(Nifti):
         self.register(self.name, self.__headerChanged, topic='transform')
         self.register(self.name, self.__headerChanged, topic='header')
 
+        # calculate min/max
+        # of image data
         if calcRange:
             self.calcRange()
 
+        # try and load metadata
+        # from JSON sidecar files
         if self.dataSource is not None and loadMeta:
+            try:
                 self.updateMeta(loadMetadata(self))
+            except Exception as e:
+                log.warning('Failed to load metadata for %s: %s',
+                            self.dataSource, e)
 
         self.__imageWrapper.register(self.__lName, self.__dataRangeChanged)
 

tests/test_image.py

@@ -1414,11 +1414,23 @@ def test_loadMeta_nonBids():
         with open(op.join('data', 'dataset_description.json'), 'wt') as f:
             pass
 
-
         img = fslimage.Image(imgfile, loadMeta=True)
         assert list(img.metaKeys()) == []
 
 
+def test_loadMeta_badJSON():
+    with tempdir():
+        make_image('image.nii.gz')
+
+        # spurious comma after b:2
+        with open('image.json', 'wt') as f:
+            f.write('{"a" : 1, "b" : 2,}')
+
+        # bad json should not cause failure
+        img = fslimage.Image('image.nii.gz', loadMeta=True)
+
+        assert list(img.metaKeys()) == []
+
 
 def test_loadMetadata():
     with tempdir():