From bc07af2315115fa40e92c333115bf50eb61a5444 Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Thu, 18 Oct 2018 12:56:00 +0100
Subject: [PATCH] RF: extract_noise to fsl_ents
---
fsl/scripts/{extract_noise.py => fsl_ents.py} | 0
setup.py | 2 +-
tests/{test_extract_noise.py => test_fsl_ents.py} | 10 +++++-----
3 files changed, 6 insertions(+), 6 deletions(-)
rename fsl/scripts/{extract_noise.py => fsl_ents.py} (100%)
rename tests/{test_extract_noise.py => test_fsl_ents.py} (96%)
diff --git a/fsl/scripts/extract_noise.py b/fsl/scripts/fsl_ents.py
similarity index 100%
rename from fsl/scripts/extract_noise.py
rename to fsl/scripts/fsl_ents.py
diff --git a/setup.py b/setup.py
index ffcf92bb1..d1212cc37 100644
--- a/setup.py
+++ b/setup.py
@@ -124,7 +124,7 @@ setup(
'imglob = fsl.scripts.imglob:main',
'atlasq = fsl.scripts.atlasq:main',
'atlasquery = fsl.scripts.atlasq:atlasquery_emulation',
- 'fsl_ents = fsl.scripts.extract_noise:main',
+ 'fsl_ents = fsl.scripts.fsl_ents:main',
]
}
)
diff --git a/tests/test_extract_noise.py b/tests/test_fsl_ents.py
similarity index 96%
rename from tests/test_extract_noise.py
rename to tests/test_fsl_ents.py
index 7bb4b9917..abbdad3ed 100644
--- a/tests/test_extract_noise.py
+++ b/tests/test_fsl_ents.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# test_extract_noise.py -
+# test_fsl_ents.py -
#
# Author: Paul McCarthy <pauldmccarthy@gmail.com>
#
@@ -12,7 +12,7 @@ import numpy as np
import pytest
import fsl.utils.tempdir as tempdir
-import fsl.scripts.extract_noise as extn
+import fsl.scripts.fsl_ents as extn
def test_genComponentIndexList():
@@ -87,7 +87,7 @@ def test_loadConfoundFiles():
extn.loadConfoundFiles(conffiles, npts)
-def test_extract_noise():
+def test_fsl_ents():
with tempdir.tempdir() as td:
@@ -115,13 +115,13 @@ def test_extract_noise():
assert np.all(np.loadtxt('out.txt') == exp)
-def test_extract_noise_usage():
+def test_fsl_ents_usage():
with pytest.raises(SystemExit) as e:
extn.main([])
assert e.value.code == 0
-def test_extract_noise_badargs():
+def test_fsl_ents_badargs():
with pytest.raises(SystemExit) as e:
extn.main(['non-existent.ica', '1', '2', '3'])
--
GitLab