Skip to content
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

[REF] Stop using deprecated import internally #3561

Merged
merged 2 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion nipype/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"""
import os

# XXX Deprecate this import
# XXX Deprecated import. Not used internally but could be used externally.
from looseversion import LooseVersion

from .info import URL as __url__, STATUS as __status__, __version__
Expand Down
4 changes: 3 additions & 1 deletion nipype/interfaces/afni/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion nipype/interfaces/base/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
3 changes: 2 additions & 1 deletion nipype/interfaces/freesurfer/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"""
import os

from ... import LooseVersion
from looseversion import LooseVersion

from ...utils.filemanip import fname_presuffix
from ..base import (
CommandLine,
Expand Down
3 changes: 2 additions & 1 deletion nipype/interfaces/freesurfer/preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions nipype/interfaces/freesurfer/tests/test_preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/fsl/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/fsl/preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion nipype/interfaces/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 3 additions & 1 deletion nipype/interfaces/mrtrix3/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/tests/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down