fix rebase mess

nipreps · May 15, 2024 · 559c8a1 · 559c8a1
1 parent 6d3d3e4
commit 559c8a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/niworkflows/interfaces/gradunwarp.py b/niworkflows/interfaces/gradunwarp.py
@@ -29,6 +29,12 @@
     SimpleInterface
 )
 
+has_gradunwarp = False
+try:
+    import gradunwrap
+    has_gradunwarp=True
+except ImportError:
+    pass
 
 class _GradUnwarpInputSpec(TraitedSpec):
     infile = File(exists=True, mandatory=True, desc="input image to be corrected")

diff --git a/niworkflows/interfaces/tests/test_bids.py b/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

diff --git a/niworkflows/testing.py b/niworkflows/testing.py
@@ -42,4 +42,3 @@ def wrapper(*args, **kwargs):
 has_fsl = fsl.Info.version() is not None
 has_freesurfer = fs.Info.version() is not None
 has_afni = afni.Info.version() is not None
-has_gradunwarp = gradunwarp.has_gradunwarp