Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
fslpy
Commits
0d611406
Commit
0d611406
authored
Jan 30, 2018
by
Paul McCarthy
🚵
Browse files
Merge branch 'master' into v1.6
parents
473f80d2
b4bb75d8
Pipeline
#1602
passed with stages
in 7 minutes and 38 seconds
Changes
6
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.conda/post-link.sh
0 → 100755
View file @
0d611406
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
0 → 100755
View file @
0d611406
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
View file @
0d611406
...
...
@@ -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
View file @
0d611406
...
...
@@ -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
View file @
0d611406
...
...
@@ -41,7 +41,7 @@ import re
import
string
__version__
=
'1.6.
1
'
__version__
=
'1.6.
2
'
"""Current version number, as a string. """
...
...
setup.py
View file @
0d611406
...
...
@@ -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'
,
]
}
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment