Skip to content

Commit b96180c

Browse files
committed
ENH: Reduce within-package absolute imports
1 parent a61e455 commit b96180c

File tree

15 files changed

+36
-49
lines changed

15 files changed

+36
-49
lines changed

nipype/algorithms/icc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from scipy.linalg import pinv
99
from ..interfaces.base import BaseInterfaceInputSpec, TraitedSpec, \
1010
BaseInterface, traits, File
11-
from nipype.utils import NUMPY_MMAP
11+
from ..utils import NUMPY_MMAP
1212

1313

1414
class ICCInputSpec(BaseInterfaceInputSpec):

nipype/algorithms/metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from ..interfaces.base import (BaseInterface, traits, TraitedSpec, File,
3131
InputMultiPath,
3232
BaseInterfaceInputSpec, isdefined)
33-
from nipype.utils import NUMPY_MMAP
33+
from ..utils import NUMPY_MMAP
3434

3535
iflogger = logging.getLogger('interface')
3636

nipype/algorithms/misc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
BaseInterfaceInputSpec, isdefined,
3535
DynamicTraitedSpec, Undefined)
3636
from ..utils.filemanip import fname_presuffix, split_filename
37-
from nipype.utils import NUMPY_MMAP
37+
from ..utils import NUMPY_MMAP
3838

3939
from . import confounds
4040

nipype/interfaces/fsl/ICA_AROMA.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@
1010
... '../../testing/data'))
1111
>>> os.chdir(datadir)
1212
"""
13-
from nipype.interfaces.base import (
14-
TraitedSpec,
15-
CommandLineInputSpec,
16-
CommandLine,
17-
File,
18-
Directory,
19-
traits,
20-
OutputMultiPath
21-
)
13+
from ..base import (TraitedSpec, CommandLineInputSpec, CommandLine,
14+
File, Directory, traits)
2215
import os
2316

17+
2418
class ICA_AROMAInputSpec(CommandLineInputSpec):
2519
feat_dir = Directory(exists=True, mandatory=True,
2620
argstr='-feat %s',

nipype/interfaces/fsl/fix.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
5555
"""
5656

57-
from nipype.interfaces.base import (
57+
from ..base import (
5858
TraitedSpec,
5959
CommandLineInputSpec,
6060
CommandLine,
@@ -64,11 +64,8 @@
6464
BaseInterfaceInputSpec,
6565
traits
6666
)
67-
from nipype.interfaces.traits_extension import (
68-
Directory,
69-
File,
70-
isdefined
71-
)
67+
from ..traits_extension import Directory, File, isdefined
68+
7269
import os
7370

7471
class TrainingSetCreatorInputSpec(BaseInterfaceInputSpec):

nipype/interfaces/niftyseg/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
See the docstrings of the individual classes for examples.
1717
"""
1818

19-
from nipype.interfaces.niftyreg.base import no_nifty_package
20-
from nipype.interfaces.niftyfit.base import NiftyFitCommand
19+
from ..niftyreg.base import no_nifty_package
20+
from ..niftyfit.base import NiftyFitCommand
2121
import subprocess
2222
import warnings
2323

nipype/interfaces/utility/wrappers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from builtins import str, bytes
2121

22-
from nipype import logging
22+
from ... import logging
2323
from ..base import (traits, DynamicTraitedSpec, Undefined, isdefined, runtime_profile,
2424
BaseInterfaceInputSpec)
2525
from ..io import IOBase, add_traits

nipype/pipeline/engine/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import pickle
2525
from functools import reduce
2626
import numpy as np
27-
from nipype.utils.misc import package_check
27+
from ...utils.misc import package_check
2828

2929
package_check('networkx', '1.3')
3030

nipype/utils/__init__.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# -*- coding: utf-8 -*-
2-
from __future__ import absolute_import
3-
4-
from nipype.utils.config import NUMPY_MMAP
5-
from nipype.utils.onetime import OneTimeProperty, setattr_on_read
6-
from nipype.utils.tmpdirs import TemporaryDirectory, InTemporaryDirectory
2+
from .config import NUMPY_MMAP
3+
from .onetime import OneTimeProperty, setattr_on_read
4+
from .tmpdirs import TemporaryDirectory, InTemporaryDirectory

nipype/workflows/dmri/fsl/artifacts.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# vi: set ft=python sts=4 ts=4 sw=4 et:
55
from __future__ import division
66

7-
from nipype.utils import NUMPY_MMAP
8-
97
from ....interfaces.io import JSONFileGrabber
108
from ....interfaces import utility as niu
119
from ....interfaces import ants
@@ -903,6 +901,7 @@ def _xfm_jacobian(in_xfm):
903901

904902
def _get_zoom(in_file, enc_dir):
905903
import nibabel as nb
904+
from nipype.utils import NUMPY_MMAP
906905

907906
zooms = nb.load(in_file, mmap=NUMPY_MMAP).header.get_zooms()
908907

nipype/workflows/smri/freesurfer/autorecon1.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# -*- coding: utf-8 -*-
22

3-
from nipype.utils import NUMPY_MMAP
4-
from nipype.interfaces.utility import Function,IdentityInterface
5-
import nipype.pipeline.engine as pe # pypeline engine
6-
from nipype.interfaces.freesurfer import *
3+
from ....utils import NUMPY_MMAP
4+
from ....pipeline import engine as pe
5+
from ....interfaces.utility import Function, IdentityInterface
6+
from ....interfaces.freesurfer import *
77
from .utils import copy_file
88

99

nipype/workflows/smri/freesurfer/autorecon2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
from nipype.interfaces.utility import Function, IdentityInterface, Merge
3-
import nipype.pipeline.engine as pe # pypeline engine
4-
from nipype.interfaces.freesurfer import *
2+
from ....interfaces.utility import Function, IdentityInterface, Merge
3+
from ....pipeline import engine as pe
4+
from ....interfaces.freesurfer import *
55
from .utils import copy_file
66

77
def copy_ltas(in_file, subjects_dir, subject_id, long_template):

nipype/workflows/smri/freesurfer/autorecon3.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# -*- coding: utf-8 -*-
2-
from nipype.interfaces.utility import IdentityInterface, Merge, Function
3-
import nipype.pipeline.engine as pe # pypeline engine
4-
from nipype.interfaces.freesurfer import *
2+
from ....interfaces.utility import IdentityInterface, Merge, Function
3+
from ....pipeline import engine as pe
4+
from ....interfaces.freesurfer import *
55
from .ba_maps import create_ba_maps_wf
6-
from nipype.interfaces.io import DataGrabber
6+
from ....interfaces.io import DataGrabber
77

88
def create_AutoRecon3(name="AutoRecon3", qcache=False, plugin_args=None,
99
th3=True, exvivo=True, entorhinal=True, fsvernum=5.3):

nipype/workflows/smri/freesurfer/ba_maps.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# -*- coding: utf-8 -*-
22
import os
3-
import nipype
4-
from nipype.interfaces.utility import Function,IdentityInterface
5-
import nipype.pipeline.engine as pe # pypeline engine
6-
from nipype.interfaces.freesurfer import *
7-
from nipype.interfaces.io import DataGrabber
8-
from nipype.interfaces.utility import Merge
3+
from ....interfaces.utility import Function, IdentityInterface
4+
from ....pipeline import engine as pe # pypeline engine
5+
from ....interfaces.freesurfer import *
6+
from ....interfaces.io import DataGrabber
7+
from ....interfaces.utility import Merge
98

109
def create_ba_maps_wf(name="Brodmann_Area_Maps", th3=True, exvivo=True,
1110
entorhinal=True):

nipype/workflows/smri/niftyreg/groupwise.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"""
88

99
from builtins import str, range
10-
import nipype.interfaces.utility as niu
11-
import nipype.interfaces.niftyreg as niftyreg
12-
import nipype.pipeline.engine as pe
10+
from ....interfaces import utility as niu
11+
from ....interfaces import niftyreg as niftyreg
12+
from ....pipeline import engine as pe
1313

1414

1515
def create_linear_gw_step(name="linear_gw_niftyreg",

0 commit comments

Comments
 (0)