diff --git a/.conda/post-link.sh b/.conda/post-link.sh
index e4a04effd28c68806bfa0245cff733b51dc99f53..466175166bf16d400072b948eef3383b557837b1 100755
--- a/.conda/post-link.sh
+++ b/.conda/post-link.sh
@@ -1,4 +1,3 @@
-if [ -e ${FSLDIR}/etc/fslconf/requestFSLpythonLink.sh ]; then
- $FSLDIR/etc/fslconf/requestFSLpythonLink.sh atlasquery atlasq imcp immv imglob
+if [ -e ${FSLDIR}/etc/fslconf/requestFSLpythonLink.sh ]; then
+ $FSLDIR/etc/fslconf/requestFSLpythonLink.sh atlasquery atlasq imcp immv imglob extract_noise
fi
-
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0e30f366c23da2d3cd47669a2ffa02ad1fc96151..4d5f30ba05f4ee8bebab99972fb925a0556519ce 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,9 +2,8 @@ This document contains the ``fslpy`` release history in reverse chronological
order.
-
-1.10.0 (Under development)
---------------------------
+1.10.0 (Wednesday July 18th 2018)
+---------------------------------
Added
@@ -15,8 +14,9 @@ Added
component time courses from a MELODIC ICA analysis.
* New :func:`.path.allFiles` function which returns all files underneath a
directory.
-* The :func:`.fileOrImage` and :func:`.fileOrArray` decorators now support
+* The :func:`.fileOrImage` and :func:`.fileOrArray` decorators now support
loading of files which are specified with an output basename.
+* New :mod:`.fast` wrapper function for the FSL FAST tool.
Changed
@@ -28,7 +28,6 @@ Changed
* Removed dependency on ``pytest-runner``.
-
1.9.0 (Monday June 4th 2018)
----------------------------
diff --git a/doc/fsl.utils.fslsub.rst b/doc/fsl.utils.fslsub.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f81b2253e52b3bf69dee8309f5ce3c17ddb98c6a
--- /dev/null
+++ b/doc/fsl.utils.fslsub.rst
@@ -0,0 +1,7 @@
+``fsl.utils.fslsub``
+====================
+
+.. automodule:: fsl.utils.fslsub
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/fsl.utils.rst b/doc/fsl.utils.rst
index f460cbfb3575f7145326defeab98987df135972c..574c5296a19c8858702680f0ff14f220f85ef89d 100644
--- a/doc/fsl.utils.rst
+++ b/doc/fsl.utils.rst
@@ -7,6 +7,7 @@
fsl.utils.assertions
fsl.utils.cache
fsl.utils.ensure
+ fsl.utils.fslsub
fsl.utils.idle
fsl.utils.imcp
fsl.utils.memoize
diff --git a/doc/fsl.wrappers.fast.rst b/doc/fsl.wrappers.fast.rst
new file mode 100644
index 0000000000000000000000000000000000000000..d3db02d4821a39124b891d0e1bc5a9c2444a1020
--- /dev/null
+++ b/doc/fsl.wrappers.fast.rst
@@ -0,0 +1,7 @@
+``fsl.wrappers.fast``
+=====================
+
+.. automodule:: fsl.wrappers.fast
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/fsl.wrappers.rst b/doc/fsl.wrappers.rst
index 4c9a2950e928ab2c7524465f6f05846ece5194ec..dfa190bfae732abb5fdfabd9e8d98ef1928acabd 100644
--- a/doc/fsl.wrappers.rst
+++ b/doc/fsl.wrappers.rst
@@ -6,6 +6,7 @@
fsl.wrappers.bet
fsl.wrappers.eddy
+ fsl.wrappers.fast
fsl.wrappers.flirt
fsl.wrappers.fnirt
fsl.wrappers.fslmaths
diff --git a/fsl/data/fixlabels.py b/fsl/data/fixlabels.py
index 8974cc79c9c8971649814904e11fe7f6c0f32cb4..9029b7d46ac9246cb0c1c35109e19763adcc5b9b 100644
--- a/fsl/data/fixlabels.py
+++ b/fsl/data/fixlabels.py
@@ -62,8 +62,10 @@ def loadLabelFile(filename,
separated by commas:
- The component index (starting from 1).
+
- One or more labels for the component (multiple labels must be
comma-separated).
+
- ``'True'`` if the component has been classified as *bad*,
``'False'`` otherwise. This field is optional - if the last
comma-separated token on a line is not equal (case-insensitive)
@@ -91,12 +93,15 @@ def loadLabelFile(filename,
file is returned.
:returns: A tuple containing:
- - The path to the melodic directory as specified in the label
- file
- - A list of lists, one list per component, with each list
- containing the labels for the corresponding component.
- - If ``returnIndices is True``, a list of the noisy component
- indices (starting from 1) that were specified in the file.
+
+ - The path to the melodic directory as specified in the label
+ file
+
+ - A list of lists, one list per component, with each list
+ containing the labels for the corresponding component.
+
+ - If ``returnIndices is True``, a list of the noisy component
+ indices (starting from 1) that were specified in the file.
"""
signalLabels = None
diff --git a/fsl/utils/fslsub.py b/fsl/utils/fslsub.py
index bbdc541d6c8edd9922d8b37e548bc5efebd24101..6b87c4bbf8110bf7b31b42e550b52273b8beb7a3 100644
--- a/fsl/utils/fslsub.py
+++ b/fsl/utils/fslsub.py
@@ -90,8 +90,11 @@ def submit(command,
queuing options
:arg multi_threaded: Submit a multi-threaded task - Set to a tuple
containing two elements:
+
- <pename>: a PE configures for the requested queues
+
- <threads>: number of threads to run
+
:arg verbose: If True, use verbose mode
:return: tuple of submitted job ids
diff --git a/fsl/version.py b/fsl/version.py
index 2d132cc27265103423506a2f915bf53634511d03..d859a0c63a8fde3bdc63a4352d3439d76233639a 100644
--- a/fsl/version.py
+++ b/fsl/version.py
@@ -41,7 +41,7 @@ import re
import string
-__version__ = '1.10.0.dev0'
+__version__ = '1.11.0.dev0'
"""Current version number, as a string. """
diff --git a/tests/test_image.py b/tests/test_image.py
index 34380c802e8d9a476a1b004d660b8a28e06acac7..47a6ad4ce74461b88c5589af4c86221a26b16783 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -39,8 +39,12 @@ except ImportError:
try:
import indexed_gzip as igzip
except ImportError:
+
+ class MockError(Exception):
+ pass
+
igzip = mock.MagicMock()
- igzip.ZranError = mock.MagicMock()
+ igzip.ZranError = MockError
def make_image(filename=None,