Skip to content

[TST] Improve py.test configuration of doctests #2802

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 1 commit into from
Nov 28, 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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions nipype/conftest.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,43 @@
import os
import shutil
from tempfile import mkdtemp
import pytest
import numpy
import os
import py.path as pp

DATADIR = os.path.realpath(
NIPYPE_DATADIR = os.path.realpath(
os.path.join(os.path.dirname(__file__), 'testing/data'))
temp_folder = mkdtemp()
data_dir = os.path.join(temp_folder, 'data')
shutil.copytree(NIPYPE_DATADIR, data_dir)


@pytest.fixture(autouse=True)
def add_np(doctest_namespace):
doctest_namespace['np'] = numpy
doctest_namespace['os'] = os

doctest_namespace["datadir"] = DATADIR
doctest_namespace["datadir"] = data_dir


@pytest.fixture(autouse=True)
def in_testing(request):
# This seems to be a reliable way to distinguish tests from doctests
if request.function is None:
os.chdir(DATADIR)
def _docdir(request):
"""Grabbed from https://stackoverflow.com/a/46991331"""
# Trigger ONLY for the doctests.
doctest_plugin = request.config.pluginmanager.getplugin("doctest")
if isinstance(request.node, doctest_plugin.DoctestItem):

# Get the fixture dynamically by its name.
tmpdir = pp.local(data_dir)

# Chdir only for the duration of the test.
with tmpdir.as_cwd():
yield

else:
# For normal tests, we have to yield, since this is a yield-fixture.
yield


def pytest_unconfigure(config):
# Delete temp folder after session is finished
shutil.rmtree(temp_folder)
20 changes: 10 additions & 10 deletions nipype/interfaces/ants/registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -736,17 +736,17 @@ class Registration(ANTSCommand):
>>> reg4.inputs.collapse_output_transforms = True
>>> outputs = reg4._list_outputs()
>>> pprint.pprint(outputs) # doctest: +ELLIPSIS,
{'composite_transform': '.../nipype/testing/data/output_Composite.h5',
{'composite_transform': '...data/output_Composite.h5',
'elapsed_time': <undefined>,
'forward_invert_flags': [],
'forward_transforms': [],
'inverse_composite_transform': '.../nipype/testing/data/output_InverseComposite.h5',
'inverse_composite_transform': '...data/output_InverseComposite.h5',
'inverse_warped_image': <undefined>,
'metric_value': <undefined>,
'reverse_invert_flags': [],
'reverse_transforms': [],
'save_state': '.../nipype/testing/data/trans.mat',
'warped_image': '.../nipype/testing/data/output_warped_image.nii.gz'}
'save_state': '...data/trans.mat',
'warped_image': '...data/output_warped_image.nii.gz'}
>>> reg4.cmdline
'antsRegistration --collapse-output-transforms 1 --dimensionality 3 --initial-moving-transform [ trans.mat, 1 ] \
--initialize-transforms-per-stage 1 --interpolation Linear --output [ output_, output_warped_image.nii.gz ] \
Expand All @@ -767,16 +767,16 @@ class Registration(ANTSCommand):
{'composite_transform': <undefined>,
'elapsed_time': <undefined>,
'forward_invert_flags': [False, False],
'forward_transforms': ['.../nipype/testing/data/output_0GenericAffine.mat',
'.../nipype/testing/data/output_1Warp.nii.gz'],
'forward_transforms': ['...data/output_0GenericAffine.mat',
'...data/output_1Warp.nii.gz'],
'inverse_composite_transform': <undefined>,
'inverse_warped_image': <undefined>,
'metric_value': <undefined>,
'reverse_invert_flags': [True, False],
'reverse_transforms': ['.../nipype/testing/data/output_0GenericAffine.mat', \
'.../nipype/testing/data/output_1InverseWarp.nii.gz'],
'save_state': '.../nipype/testing/data/trans.mat',
'warped_image': '.../nipype/testing/data/output_warped_image.nii.gz'}
'reverse_transforms': ['...data/output_0GenericAffine.mat', \
'...data/output_1InverseWarp.nii.gz'],
'save_state': '...data/trans.mat',
'warped_image': '...data/output_warped_image.nii.gz'}
>>> reg4b.aggregate_outputs() # doctest: +SKIP
>>> reg4b.cmdline
'antsRegistration --collapse-output-transforms 1 --dimensionality 3 --initial-moving-transform [ trans.mat, 1 ] \
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/bru2nii.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Bru2(CommandLine):
>>> converter = Bru2()
>>> converter.inputs.input_dir = "brukerdir"
>>> converter.cmdline # doctest: +ELLIPSIS
'Bru2 -o .../nipype/testing/data/brukerdir brukerdir'
'Bru2 -o .../data/brukerdir brukerdir'
"""
input_spec = Bru2InputSpec
output_spec = Bru2OutputSpec
Expand Down
2 changes: 1 addition & 1 deletion nipype/pipeline/plugins/lsf.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def _submit_batchtask(self, scriptfile, node):
break
iflogger.setLevel(oldlevel)
# retrieve lsf taskid
match = re.search('<(\d*)>', result.runtime.stdout)
match = re.search(r'<(\d*)>', result.runtime.stdout)
if match:
taskid = int(match.groups()[0])
else:
Expand Down
1 change: 0 additions & 1 deletion nipype/testing/data/slice_timing.1D

This file was deleted.