diff --git a/mmpose/__init__.py b/mmpose/__init__.py index df71926da6..c5ddeb65a8 100644 --- a/mmpose/__init__.py +++ b/mmpose/__init__.py @@ -6,8 +6,8 @@ from .version import __version__, short_version -mmcv_minimum_version = '1.3.8' -mmcv_maximum_version = '1.5.0' +MMCV_MIN = '1.3.8' +MMCV_MAX = '1.5.0' def digit_version(version_str: str, length: int = 4): @@ -51,9 +51,9 @@ def digit_version(version_str: str, length: int = 4): mmcv_version = digit_version(mmcv.__version__) version_info = parse_version_info(__version__) -assert (mmcv_version >= digit_version(mmcv_minimum_version) - and mmcv_version <= digit_version(mmcv_maximum_version)), \ +assert (mmcv_version >= digit_version(MMCV_MIN) + and mmcv_version <= digit_version(MMCV_MAX)), \ f'MMCV=={mmcv.__version__} is used but incompatible. ' \ - f'Please install mmcv>={mmcv_minimum_version}, <={mmcv_maximum_version}.' + f'Please install mmcv>={MMCV_MIN}, <={MMCV_MAX}.' -__all__ = ['__version__', 'short_version', 'version_info'] +__all__ = ['__version__', 'short_version', 'version_info', 'digit_version'] diff --git a/tests/test_version.py b/tests/test_version.py index 080a88956d..febf4ea2db 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -1,12 +1,28 @@ -import mmcv - import mmpose +from mmpose import digit_version def test_version(): version = mmpose.__version__ - mmcv_version = mmpose.digit_version(mmcv.__version__) assert isinstance(version, str) assert isinstance(mmpose.short_version, str) assert mmpose.short_version in version - assert mmcv_version == mmpose.mmcv_version + + +def test_digit_version(): + assert digit_version('0.2.16') == (0, 2, 16, 0, 0, 0) + assert digit_version('1.2.3') == (1, 2, 3, 0, 0, 0) + assert digit_version('1.2.3rc0') == (1, 2, 3, 0, -1, 0) + assert digit_version('1.2.3rc1') == (1, 2, 3, 0, -1, 1) + assert digit_version('1.0rc0') == (1, 0, 0, 0, -1, 0) + assert digit_version('1.0') == digit_version('1.0.0') + assert digit_version('1.5.0+cuda90_cudnn7.6.3_lms') == digit_version('1.5') + assert digit_version('1.0.0dev') < digit_version('1.0.0a') + assert digit_version('1.0.0a') < digit_version('1.0.0a1') + assert digit_version('1.0.0a') < digit_version('1.0.0b') + assert digit_version('1.0.0b') < digit_version('1.0.0rc') + assert digit_version('1.0.0rc1') < digit_version('1.0.0') + assert digit_version('1.0.0') < digit_version('1.0.0post') + assert digit_version('1.0.0post') < digit_version('1.0.0post1') + assert digit_version('v1') == (1, 0, 0, 0, 0, 0) + assert digit_version('v1.1.5') == (1, 1, 5, 0, 0, 0)