fix rebase mess

Author: bpinsard

niworkflows/interfaces/gradunwarp.py

@@ -29,6 +29,13 @@
     SimpleInterface
 )
 
+has_gradunwarp = False
+try:
+    from gradunwarp.core.gradient_unwarp import GradientUnwarpRunner
+    has_gradunwarp = True
+except ImportError:
+    pass
+
 
 class _GradUnwarpInputSpec(TraitedSpec):
     infile = File(exists=True, mandatory=True, desc="input image to be corrected")
@@ -63,7 +70,9 @@ class GradUnwarp(SimpleInterface):
 
     def _run_interface(self, runtime):
 
-        from gradunwarp.core.gradient_unwarp import GradientUnwarpRunner
+        if not has_gradunwarp:
+            raise RuntimeError('missing gradunwarp dependency')
+
         gur = GradientUnwarpRunner(self.inputs)
         gur.run()
         gur.write()

niworkflows/interfaces/tests/test_bids.py

@@ -300,11 +300,7 @@ def test_DerivativesDataSink_build_path(
         **entities,
     )
 
-<<<<<<< HEAD
     if isinstance(expectation, type):
-=======
-    if type(expectation) is type(Exception):
->>>>>>> 601d1d1f (fix flake8 tests)
         with pytest.raises(expectation):
             dds.run()
         return