Skip to content

Commit 6f3083a

Browse files
committed
ENH: Use PEP440-compliant versioning, including for gitversion
1 parent db630a6 commit 6f3083a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

nipype/info.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def get_nipype_gitversion():
4444
if __version__.endswith('-dev'):
4545
gitversion = get_nipype_gitversion()
4646
if gitversion:
47-
__version__ = __version__.replace('-dev', '-' + gitversion + '.dev')
47+
__version__ = '{}+{}'.format(__version__, gitversion)
4848

4949
CLASSIFIERS = ['Development Status :: 5 - Production/Stable',
5050
'Environment :: Console',
@@ -141,7 +141,8 @@ def get_nipype_gitversion():
141141
'configparser',
142142
'pytest>=%s' % PYTEST_MIN_VERSION,
143143
'mock',
144-
'pydotplus'
144+
'pydotplus',
145+
'packaging',
145146
]
146147

147148
TESTS_REQUIRES = [

nipype/interfaces/base.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from warnings import warn
3232
import simplejson as json
3333
from dateutil.parser import parse as parseutc
34+
from packaging.version import Version
3435

3536
from .. import config, logging, LooseVersion, __version__
3637
from ..utils.provenance import write_provenance
@@ -43,7 +44,7 @@
4344
from ..external.due import due
4445

4546
runtime_profile = str2bool(config.get('execution', 'profile_runtime'))
46-
nipype_version = LooseVersion(__version__)
47+
nipype_version = Version(__version__)
4748
iflogger = logging.getLogger('interface')
4849

4950
FLOAT_FORMAT = '{:.10f}'.format
@@ -445,7 +446,7 @@ def _deprecated_warn(self, obj, name, old, new):
445446
else:
446447
msg3 = ''
447448
msg = ' '.join((msg1, msg2, msg3))
448-
if LooseVersion(str(trait_spec.deprecated)) < self.package_version:
449+
if Version(str(trait_spec.deprecated)) < self.package_version:
449450
raise TraitError(msg)
450451
else:
451452
if trait_spec.new_name:

0 commit comments

Comments
 (0)