Skip to content

MAINT: Remove ignore_exception and terminal_output traits from input specs #2618

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.

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 8 commits into from
Jul 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ before_install:
- conda config --add channels conda-forge
- travis_retry conda install -y python=${TRAVIS_PYTHON_VERSION} icu
- travis_retry pip install -r requirements.txt
- travis_retry pip install grabbit==0.1.2
- travis_retry git clone https://github.com/INCF/pybids.git ${HOME}/pybids &&
pip install -e ${HOME}/pybids
- travis_retry pip install codecov
Expand Down
4 changes: 3 additions & 1 deletion docker/generate_dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,10 @@ function generate_main_dockerfile() {
pandas psutil scikit-learn scipy traits=4.6.0' \
pip_opts="-e" \
pip_install="/src/nipype[all]" \
--miniconda env_name=neuro \
pip_install="grabbit==0.1.2" \
--run-bash "mkdir -p /src/pybids
&& curl -sSL --retry 5 https://github.com/INCF/pybids/tarball/master
&& curl -sSL --retry 5 https://github.com/INCF/pybids/tarball/0.5.1
| tar -xz -C /src/pybids --strip-components 1
&& source activate neuro
&& pip install --no-cache-dir -e /src/pybids" \
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_ACompCor.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ def test_ACompCor_inputs():
components_file=dict(usedefault=True, ),
header_prefix=dict(),
high_pass_cutoff=dict(usedefault=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
ignore_initial_volumes=dict(usedefault=True, ),
mask_files=dict(),
mask_index=dict(
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_ActivationCount.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_ActivationCount_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_files=dict(mandatory=True, ),
threshold=dict(mandatory=True, ),
)
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_AddCSVRow.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
def test_AddCSVRow_inputs():
input_map = dict(
_outputs=dict(usedefault=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_file=dict(mandatory=True, ),
)
inputs = AddCSVRow.input_spec()
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_ArtifactDetect.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ def test_ArtifactDetect_inputs():
input_map = dict(
bound_by_brainmask=dict(usedefault=True, ),
global_threshold=dict(usedefault=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
intersect_mask=dict(usedefault=True, ),
mask_file=dict(),
mask_threshold=dict(),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_CalculateMedian.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_CalculateMedian_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_files=dict(),
median_file=dict(),
median_per_file=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_ComputeDVARS.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ def test_ComputeDVARS_inputs():
figdpi=dict(usedefault=True, ),
figformat=dict(usedefault=True, ),
figsize=dict(usedefault=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_file=dict(mandatory=True, ),
in_mask=dict(mandatory=True, ),
intensity_normalization=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_ComputeMeshWarp.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_ComputeMeshWarp_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
metric=dict(usedefault=True, ),
out_file=dict(usedefault=True, ),
out_warp=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_CreateNifti.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ def test_CreateNifti_inputs():
affine=dict(),
data_file=dict(mandatory=True, ),
header_file=dict(mandatory=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
)
inputs = CreateNifti.input_spec()

Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_Distance.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_Distance_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
mask_volume=dict(),
method=dict(usedefault=True, ),
volume1=dict(mandatory=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_FramewiseDisplacement.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ def test_FramewiseDisplacement_inputs():
input_map = dict(
figdpi=dict(usedefault=True, ),
figsize=dict(usedefault=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_file=dict(mandatory=True, ),
normalize=dict(usedefault=True, ),
out_figure=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_FuzzyOverlap.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_FuzzyOverlap_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_mask=dict(),
in_ref=dict(mandatory=True, ),
in_tst=dict(mandatory=True, ),
Expand Down
9 changes: 1 addition & 8 deletions nipype/algorithms/tests/test_auto_Gunzip.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@


def test_Gunzip_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_file=dict(mandatory=True, ),
)
input_map = dict(in_file=dict(mandatory=True, ), )
inputs = Gunzip.input_spec()

for key, metadata in list(input_map.items()):
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_ICC.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_ICC_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
mask=dict(mandatory=True, ),
subjects_sessions=dict(mandatory=True, ),
)
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_MeshWarpMaths.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
def test_MeshWarpMaths_inputs():
input_map = dict(
float_trait=dict(),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_surf=dict(mandatory=True, ),
operation=dict(usedefault=True, ),
operator=dict(
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_ModifyAffine.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_ModifyAffine_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
transformation_matrix=dict(usedefault=True, ),
volumes=dict(mandatory=True, ),
)
Expand Down
9 changes: 1 addition & 8 deletions nipype/algorithms/tests/test_auto_NonSteadyStateDetector.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@


def test_NonSteadyStateDetector_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_file=dict(mandatory=True, ),
)
input_map = dict(in_file=dict(mandatory=True, ), )
inputs = NonSteadyStateDetector.input_spec()

for key, metadata in list(input_map.items()):
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_P2PDistance.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_P2PDistance_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
metric=dict(usedefault=True, ),
out_file=dict(usedefault=True, ),
out_warp=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_PickAtlas.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ def test_PickAtlas_inputs():
atlas=dict(mandatory=True, ),
dilation_size=dict(usedefault=True, ),
hemi=dict(usedefault=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
labels=dict(mandatory=True, ),
output_file=dict(),
)
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_Similarity.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_Similarity_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
mask1=dict(),
mask2=dict(),
metric=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_SimpleThreshold.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_SimpleThreshold_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
threshold=dict(mandatory=True, ),
volumes=dict(mandatory=True, ),
)
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_SpecifyModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ def test_SpecifyModel_inputs():
mandatory=True,
),
high_pass_filter_cutoff=dict(mandatory=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
input_units=dict(mandatory=True, ),
outlier_files=dict(copyfile=False, ),
parameter_source=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_SpecifySPMModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ def test_SpecifySPMModel_inputs():
mandatory=True,
),
high_pass_filter_cutoff=dict(mandatory=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
input_units=dict(mandatory=True, ),
outlier_files=dict(copyfile=False, ),
output_units=dict(usedefault=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_SpecifySparseModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ def test_SpecifySparseModel_inputs():
mandatory=True,
),
high_pass_filter_cutoff=dict(mandatory=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
input_units=dict(mandatory=True, ),
model_hrf=dict(),
outlier_files=dict(copyfile=False, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_StimulusCorrelation.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
def test_StimulusCorrelation_inputs():
input_map = dict(
concatenated_design=dict(mandatory=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
intensity_values=dict(mandatory=True, ),
realignment_parameters=dict(mandatory=True, ),
spm_mat_file=dict(mandatory=True, ),
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_TCompCor.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ def test_TCompCor_inputs():
components_file=dict(usedefault=True, ),
header_prefix=dict(),
high_pass_cutoff=dict(usedefault=True, ),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
ignore_initial_volumes=dict(usedefault=True, ),
mask_files=dict(),
mask_index=dict(
Expand Down
7 changes: 1 addition & 6 deletions nipype/algorithms/tests/test_auto_TVTKBaseInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@


def test_TVTKBaseInterface_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
), )
input_map = dict()
inputs = TVTKBaseInterface.input_spec()

for key, metadata in list(input_map.items()):
Expand Down
5 changes: 0 additions & 5 deletions nipype/algorithms/tests/test_auto_WarpPoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

def test_WarpPoints_inputs():
input_map = dict(
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
interp=dict(
mandatory=True,
usedefault=True,
Expand Down
6 changes: 0 additions & 6 deletions nipype/interfaces/afni/preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -1810,12 +1810,6 @@ class ROIStatsInputSpec(CommandLineInputSpec):
argstr='-mask_f2short',
position=2)
quiet = traits.Bool(desc='execute quietly', argstr='-quiet', position=1)
terminal_output = traits.Enum(
'allatonce',
deprecated='1.0.0',
desc='Control terminal output:`allatonce` - waits till command is '
'finished to display output',
nohash=True)


class ROIStatsOutputSpec(TraitedSpec):
Expand Down
9 changes: 0 additions & 9 deletions nipype/interfaces/afni/tests/test_auto_ABoverlap.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ def test_ABoverlap_inputs():
nohash=True,
usedefault=True,
),
ignore_exception=dict(
deprecated='1.0.0',
nohash=True,
usedefault=True,
),
in_file_a=dict(
argstr='%s',
copyfile=False,
Expand All @@ -38,10 +33,6 @@ def test_ABoverlap_inputs():
),
outputtype=dict(),
quiet=dict(argstr='-quiet', ),
terminal_output=dict(
deprecated='1.0.0',
nohash=True,
),
verb=dict(argstr='-verb', ),
)
inputs = ABoverlap.input_spec()
Expand Down
Loading