|
15 | 15 | See the docstrings of the individual classes for examples. |
16 | 16 |
|
17 | 17 | """ |
18 | | -from distutils.version import StrictVersion |
19 | 18 | import os |
| 19 | +from packaging.version import Version |
20 | 20 |
|
21 | 21 | from ... import logging |
22 | 22 | from ..base import CommandLine, CommandLineInputSpec, traits, Undefined, PackageInfo |
@@ -65,13 +65,13 @@ def __init__(self, required_version=None, **inputs): |
65 | 65 | self.required_version = required_version |
66 | 66 | _version = self.version |
67 | 67 | if _version: |
68 | | - if self._min_version is not None and StrictVersion( |
69 | | - _version |
70 | | - ) < StrictVersion(self._min_version): |
| 68 | + if self._min_version is not None and Version(_version) < Version( |
| 69 | + self._min_version |
| 70 | + ): |
71 | 71 | msg = "A later version of Niftyreg is required (%s < %s)" |
72 | 72 | iflogger.warning(msg, _version, self._min_version) |
73 | 73 | if required_version is not None: |
74 | | - if StrictVersion(_version) != StrictVersion(required_version): |
| 74 | + if Version(_version) != Version(required_version): |
75 | 75 | msg = "The version of NiftyReg differs from the required" |
76 | 76 | msg += "(%s != %s)" |
77 | 77 | iflogger.warning(msg, _version, self.required_version) |
@@ -101,11 +101,11 @@ def check_version(self): |
101 | 101 | _version = self.version |
102 | 102 | if not _version: |
103 | 103 | raise Exception("Niftyreg not found") |
104 | | - if StrictVersion(_version) < StrictVersion(self._min_version): |
| 104 | + if Version(_version) < Version(self._min_version): |
105 | 105 | err = "A later version of Niftyreg is required (%s < %s)" |
106 | 106 | raise ValueError(err % (_version, self._min_version)) |
107 | 107 | if self.required_version: |
108 | | - if StrictVersion(_version) != StrictVersion(self.required_version): |
| 108 | + if Version(_version) != Version(self.required_version): |
109 | 109 | err = "The version of NiftyReg differs from the required" |
110 | 110 | err += "(%s != %s)" |
111 | 111 | raise ValueError(err % (_version, self.required_version)) |
|
0 commit comments