Skip to content

Commit 20f1247

Browse files
author
Jakub Kaczmarzyk
authored
rm libmng1 apt dependency (#247)
* rm libmng1 apt dependency * fix error with bare generate singularity * test r7219 on ubuntu 16.04 * use debian stretch base image * change test script to a=1
1 parent 01cdd22 commit 20f1247

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

neurodocker/generators/singularity.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ def _render_labels(self):
147147
def _add_neurodocker_header(self):
148148
kwds = {'version': 'generic', 'method': 'custom'}
149149
# If ndfreeze is requested, put it before the neurodocker header.
150-
offset = 1 if self._specs['instructions'][1][0] == 'ndfreeze' else 0
150+
offset = 0
151+
if len(self._specs['instructions']) > 1:
152+
if self._specs['instructions'][1][0] == 'ndfreeze':
153+
offset = 1
151154
self._specs['instructions'].insert(1 + offset, ('_header', kwds))
152155

153156
def _fill_parts(self):

neurodocker/interfaces/tests/test_spm12.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def test_docker(self):
99
specs = {
1010
'pkg_manager': 'apt',
1111
'instructions': [
12-
('base', 'ubuntu:18.04'),
13-
('spm12', {'version': 'dev'}),
12+
('base', 'debian:stretch'),
13+
('spm12', {'version': 'r7219'}),
1414
('user', 'neuro'),
1515
],
1616
}
@@ -23,7 +23,7 @@ def test_singularity(self):
2323
specs = {
2424
'pkg_manager': 'apt',
2525
'instructions': [
26-
('base', 'docker://ubuntu:16.04'),
26+
('base', 'docker://debian:stretch'),
2727
('spm12', {'version': 'r7219'}),
2828
('user', 'neuro'),
2929
],

neurodocker/interfaces/tests/test_spm12.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -exu
44

5-
echo 'fprintf("testing")' > /tmp/test.m
6-
$SPMMCRCMD /tmp/test.m
5+
echo "a = 1" > ~/test.m
6+
$SPMMCRCMD ~/test.m
77

88
printf 'passed'

neurodocker/templates/fsl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ generic:
1616
"5.0.9": https://fsl.fmrib.ox.ac.uk/fsldownloads/fsl-5.0.9-centos6_64.tar.gz
1717
"5.0.8": https://fsl.fmrib.ox.ac.uk/fsldownloads/oldversions/fsl-5.0.8-centos6_64.tar.gz
1818
dependencies:
19-
apt: bc dc file libfontconfig1 libfreetype6 libgl1-mesa-dev libglu1-mesa-dev libgomp1 libice6 libmng1 libxcursor1 libxft2 libxinerama1 libxrandr2 libxrender1 libxt6 wget
19+
apt: bc dc file libfontconfig1 libfreetype6 libgl1-mesa-dev libglu1-mesa-dev libgomp1 libice6 libxcursor1 libxft2 libxinerama1 libxrandr2 libxrender1 libxt6 wget
2020
yum: bc file libGL libGLU libgomp libICE libjpeg libmng libpng12 libSM libX11 libXcursor libXext libXft libXinerama libXrandr libXt wget
2121
env:
2222
FSLDIR: "{{ fsl.install_path }}"

0 commit comments

Comments
 (0)