Merge branch 'master' into v1.6

.conda/post-link.sh

+if [ -z ${FSLDIR} ]; then exit; fi
+if [ ! -d ${FSLDIR}/bin ]; then exit; fi
+scripts="atlasquery atlasq imcp immv imglob"
+for script in $scripts; do
+    if [ -f ${FSLDIR}/bin/${script} ]; then rm ${FSLDIR}/bin/${script}; fi
+    ln -s ${PREFIX}/bin/${script} ${FSLDIR}/bin/${script}
+done
+

.conda/pre-unlink.sh

+if [ -z ${FSLDIR} ]; then exit; fi
+scripts="atlasquery atlasq imcp immv imglob"
+for script in $scripts; do
+    if [ -f ${FSLDIR}/bin/${script} ]; then rm ${FSLDIR}/bin/${script}; fi
+done

CHANGELOG.rst

@@ -2,6 +2,15 @@ This document contains the ``fslpy`` release history in reverse chronological
 order.
 
 
+1.6.2 (Tuesday January 30th 2018)
+---------------------------------
+
+
+* Updates to the ``conda`` installation process.
+* A new script is installed when ``fslpy`` is installed via ``pip`` or
+  ``conda`` - ``atlasquery``, which emulates the FSL ``atlasquery`` tool.
+
+
 1.6.1 (Monday January 29th 2018)
 --------------------------------
 

fsl/scripts/atlasq.py

@@ -738,5 +738,16 @@ def main(args=None):
     return 0
 
 
+def atlasquery_emulation(args=None):
+    """Entry point for ``atlasquery``. Runs as ``atlasq`` in ``ohi``
+    mode.
+    """
+
+    if args is None:
+        args = sys.argv[1:]
+
+    return main(['ohi'] + args)
+
+
 if __name__ == '__main__':
     sys.exit(main())

fsl/version.py

@@ -41,7 +41,7 @@ import            re
 import            string
 
 
-__version__ = '1.6.1'
+__version__ = '1.6.2'
 """Current version number, as a string. """
 
 

setup.py

@@ -124,10 +124,11 @@ setup(
 
     entry_points={
         'console_scripts' : [
-            'immv   = fsl.scripts.immv:main',
-            'imcp   = fsl.scripts.imcp:main',
-            'imglob = fsl.scripts.imglob:main',
-            'atlasq = fsl.scripts.atlasq:main',
+            'immv       = fsl.scripts.immv:main',
+            'imcp       = fsl.scripts.imcp:main',
+            'imglob     = fsl.scripts.imglob:main',
+            'atlasq     = fsl.scripts.atlasq:main',
+            'atlasquery = fsl.scripts.atlasq:atlasquery_emulation',
         ]
     }
 )