Skip to content

[ENH] Improved PEP8 Compliance for interfaces/spm #1593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Aug 29, 2016
Merged

[ENH] Improved PEP8 Compliance for interfaces/spm #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1adac29
test commit for build
Aug 26, 2016
78e2950
PEP8 compliance for base.py
Aug 26, 2016
9c2911e
PEP8 compliance for model.py (90%)
Aug 26, 2016
0cb565d
PEP8 compliance for model.py (100%)
Aug 26, 2016
2005b6f
PEP8 compliance for model.py (100%) V2
Aug 26, 2016
83e55cc
PEP8 compliance for utils.py
Aug 26, 2016
b81611a
PEP8 compliance for preprocess.py (5%)
Aug 26, 2016
61d4350
reverted \ in some docstrings & tests
Aug 28, 2016
58a2c66
Minor change to restart build...
Aug 28, 2016
02e4583
PEP8 compliance for preproc (25%)
mgclark Aug 28, 2016
e643da4
PEP8 compliance for preproc (60%)
mgclark Aug 28, 2016
37c5296
PEP8 compliance for preproc (85%)
mgclark Aug 28, 2016
258d772
Fix dstrings in preproc, no class descptrs tho (95%)
mgclark Aug 28, 2016
cf49830
Reverted docstring fixes in preproc
mgclark Aug 29, 2016
993865e
Merging in updated master, conflicts resolved
Aug 29, 2016
8424b80
Additional preproc cleanup & line 255 fix
Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions nipype/interfaces/spm/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@
spm.SPMCommand().version
"""

# Standard library imports
from __future__ import print_function
from builtins import range
from builtins import object

__docformat__ = 'restructuredtext'

# Standard library imports
import os
from copy import deepcopy

Expand All @@ -38,6 +35,8 @@
from ... import logging
logger = logging.getLogger('interface')

__docformat__ = 'restructuredtext'


def func_is_3d(in_file):
"""Checks if input functional files are 3d."""
Expand Down Expand Up @@ -216,7 +215,8 @@ class SPMCommandInputSpec(BaseInterfaceInputSpec):
usedefault=True)
use_mcr = traits.Bool(desc='Run m-code using SPM MCR')
use_v8struct = traits.Bool(True, min_ver='8', usedefault=True,
desc=('Generate SPM8 and higher compatible jobs')
desc=('Generate SPM8 and higher '
'compatible jobs')
)


Expand Down Expand Up @@ -476,14 +476,15 @@ def _make_matlab_command(self, contents, postscript=None):
end\n
"""
if self.mlab.inputs.mfile:
if isdefined(self.inputs.use_v8struct) and self.inputs.use_v8struct:
if (isdefined(self.inputs.use_v8struct) and
self.inputs.use_v8struct):
mscript += self._generate_job('jobs{1}.spm.%s.%s' %
(self.jobtype, self.jobname),
contents[0])
else:
if self.jobname in ['st', 'smooth', 'preproc', 'preproc8',
'fmri_spec', 'fmri_est', 'factorial_design',
'defs']:
'fmri_spec', 'fmri_est',
'factorial_design', 'defs']:
# parentheses
mscript += self._generate_job('jobs{1}.%s{1}.%s(1)' %
(self.jobtype, self.jobname),
Expand Down
Loading