Merge pull request #3561 from asmacdo/lose-nypipe.looseversion

[REF] Stop using deprecated import internally

Author: effigies

nipype/__init__.py

@@ -13,7 +13,7 @@
 """
 import os
 
-# XXX Deprecate this import
+# No longer used internally but could be used externally.
 from looseversion import LooseVersion
 
 from .info import URL as __url__, STATUS as __status__, __version__

nipype/interfaces/afni/base.py

@@ -6,7 +6,9 @@
 from sys import platform
 import shutil
 
-from ... import logging, LooseVersion
+from looseversion import LooseVersion
+
+from ... import logging
 from ...utils.filemanip import split_filename, fname_presuffix
 from ..base import (
     CommandLine,

nipype/interfaces/base/core.py

@@ -16,7 +16,9 @@
 import simplejson as json
 from traits.trait_errors import TraitError
 
-from ... import config, logging, LooseVersion
+from looseversion import LooseVersion
+
+from ... import config, logging
 from ...utils.provenance import write_provenance
 from ...utils.misc import str2bool
 from ...utils.filemanip import (

nipype/interfaces/freesurfer/base.py

@@ -16,7 +16,8 @@
 """
 import os
 
-from ... import LooseVersion
+from looseversion import LooseVersion
+
 from ...utils.filemanip import fname_presuffix
 from ..base import (
     CommandLine,

nipype/interfaces/freesurfer/preprocess.py

@@ -9,10 +9,11 @@
 import shutil
 import sys
 
+from looseversion import LooseVersion
 import numpy as np
 from nibabel import load
 
-from ... import logging, LooseVersion
+from ... import logging
 from ...utils.filemanip import fname_presuffix, check_depends
 from ..io import FreeSurferSource
 from ..base import (

nipype/interfaces/freesurfer/tests/test_preprocess.py

@@ -4,11 +4,11 @@
 import os
 
 import pytest
-from nipype.testing.fixtures import create_files_in_directory
+from looseversion import LooseVersion
 
+from nipype.testing.fixtures import create_files_in_directory
 from nipype.interfaces import freesurfer
 from nipype.interfaces.freesurfer import Info
-from nipype import LooseVersion
 
 
 @pytest.mark.skipif(freesurfer.no_freesurfer(), reason="freesurfer is not installed")

nipype/interfaces/fsl/model.py

@@ -11,9 +11,9 @@
 from string import Template
 
 import numpy as np
+from looseversion import LooseVersion
 from nibabel import load
 
-from ... import LooseVersion
 from ...utils.filemanip import simplify_list, ensure_list
 from ...utils.misc import human_order_sorted
 from ...external.due import BibTeX

nipype/interfaces/fsl/preprocess.py

@@ -11,8 +11,8 @@
 
 import numpy as np
 from nibabel import load
+from looseversion import LooseVersion
 
-from ... import LooseVersion
 from ...utils.filemanip import split_filename
 from ..base import (
     TraitedSpec,

nipype/interfaces/image.py

@@ -4,7 +4,8 @@
 
 from ..utils.filemanip import fname_presuffix
 from .base import SimpleInterface, TraitedSpec, BaseInterfaceInputSpec, traits, File
-from .. import LooseVersion
+
+from looseversion import LooseVersion
 
 
 class RescaleInputSpec(BaseInterfaceInputSpec):

nipype/interfaces/mrtrix3/base.py

@@ -2,7 +2,9 @@
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 # -*- coding: utf-8 -*-
 
-from ... import logging, LooseVersion
+from looseversion import LooseVersion
+
+from ... import logging
 from ...utils.filemanip import which
 from ..base import (
     CommandLineInputSpec,

nipype/interfaces/tests/test_image.py

@@ -4,10 +4,10 @@
 import nibabel as nb
 import pytest
 
+from looseversion import LooseVersion
 from nibabel.orientations import axcodes2ornt, ornt_transform
 
 from ..image import _as_reoriented_backport, _orientations
-from ... import LooseVersion
 
 nibabel24 = LooseVersion(nb.__version__) >= LooseVersion("2.4.0")