Skip to content

Commit 68a8bf6

Browse files
committed
enh: install datalad/dcm2niix on circle build
1 parent f61c226 commit 68a8bf6

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

docker/generate_dockerfiles.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ function generate_base_dockerfile() {
6868
--spm12 version=r7219 \
6969
--env 'LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH' \
7070
--freesurfer version=6.0.0-min \
71+
--dcm2niix version=v1.0.20190902 \
7172
--run 'echo "cHJpbnRmICJrcnp5c3p0b2YuZ29yZ29sZXdza2lAZ21haWwuY29tCjUxNzIKICpDdnVtdkVWM3pUZmcKRlM1Si8yYzFhZ2c0RQoiID4gL29wdC9mcmVlc3VyZmVyLTYuMC4wLW1pbi9saWNlbnNlLnR4dA==" | base64 -d | sh' \
7273
--install afni ants apt-utils bzip2 convert3d file fsl-core \
7374
fsl-mni152-templates fusefat g++ git graphviz make python ruby \
74-
unzip xvfb \
75+
unzip xvfb git-annex-standalone \
7576
--add-to-entrypoint "source /etc/fsl/fsl.sh && source /etc/afni/afni.sh" \
7677
--env ANTSPATH='/usr/lib/ants' \
7778
PATH='/usr/lib/ants:$PATH' \

nipype/info.py

+1
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ def get_nipype_gitversion():
182182
]
183183

184184
EXTRA_REQUIRES = {
185+
'data': ['datalad'],
185186
'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
186187
'duecredit': ['duecredit'],
187188
'nipy': ['nitime', 'nilearn<0.5.0', 'dipy', 'nipy', 'matplotlib'],

nipype/interfaces/dcm2nii.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ def _parse_stdout(self, stdout):
425425
filenames = []
426426
for line in stdout.split("\n"):
427427
if line.startswith("Convert "): # output
428-
fname = str(re.search('\S+/\S+', line).group(0))
428+
fname = str(re.search(r'\S+/\S+', line).group(0))
429429
filenames.append(os.path.abspath(fname))
430430
return filenames
431431

0 commit comments

Comments
 (0)