Skip to content

Commit 2f5d636

Browse files
authored
Merge pull request #3477 from effigies/mnt/looseversion_pkg
RF: Use looseversion package instead of vendoring
2 parents b410d08 + 8557831 commit 2f5d636

File tree

11 files changed

+9
-283
lines changed

11 files changed

+9
-283
lines changed

nipype/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import os
1515

1616
# XXX Deprecate this import
17-
from .external.version import LooseVersion
17+
from looseversion import LooseVersion
1818

1919
from .info import URL as __url__, STATUS as __status__, __version__
2020
from .utils.config import NipypeConfig

nipype/external/tests/test_version.py

-35
This file was deleted.

nipype/external/version.py

-240
This file was deleted.

nipype/info.py

+1
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ def get_nipype_gitversion():
146146
"traits>=%s,!=5.0" % TRAITS_MIN_VERSION,
147147
"filelock>=3.0.0",
148148
"etelemetry>=0.2.0",
149+
"looseversion",
149150
]
150151

151152
TESTS_REQUIRES = [

nipype/interfaces/dipy/preprocess.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import nibabel as nb
55
import numpy as np
66

7-
from nipype.external.version import LooseVersion
7+
from looseversion import LooseVersion
88
from ... import logging
99
from ..base import traits, TraitedSpec, File, isdefined
1010
from .base import (

nipype/interfaces/dipy/reconstruction.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import numpy as np
99
import nibabel as nb
10-
from nipype.external.version import LooseVersion
10+
from looseversion import LooseVersion
1111

1212
from ... import logging
1313
from ..base import TraitedSpec, File, traits, isdefined

nipype/interfaces/dipy/registration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from nipype.external.version import LooseVersion
1+
from looseversion import LooseVersion
22
from ... import logging
33
from .base import HAVE_DIPY, dipy_version, dipy_to_nipype_interface, get_dipy_workflows
44

nipype/interfaces/dipy/stats.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from nipype.external.version import LooseVersion
1+
from looseversion import LooseVersion
22
from ... import logging
33
from .base import HAVE_DIPY, dipy_version, dipy_to_nipype_interface, get_dipy_workflows
44

nipype/interfaces/dipy/tracks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import os.path as op
44
import numpy as np
55
import nibabel as nb
6-
from nipype.external.version import LooseVersion
6+
from looseversion import LooseVersion
77

88
from ... import logging
99
from ..base import TraitedSpec, BaseInterfaceInputSpec, File, isdefined, traits

nipype/utils/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import errno
1515
import atexit
1616
from warnings import warn
17-
from nipype.external.version import LooseVersion
17+
from looseversion import LooseVersion
1818
import configparser
1919
import numpy as np
2020

nipype/utils/misc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from collections.abc import Iterator
1010
from warnings import warn
1111

12-
from nipype.external.version import LooseVersion
12+
from looseversion import LooseVersion
1313

1414
import numpy as np
1515

0 commit comments

Comments
 (0)