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

Fix #135, convert prerelease and build to string #140

Merged
merged 8 commits into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions semver.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ class VersionInfo(object):
__slots__ = ('_major', '_minor', '_patch', '_prerelease', '_build')

def __init__(self, major, minor=0, patch=0, prerelease=None, build=None):
self._major = major
self._minor = minor
self._patch = patch
self._prerelease = prerelease
self._build = build
self._major = int(major)
self._minor = int(minor)
self._patch = int(patch)
self._prerelease = None if prerelease is None else str(prerelease)
self._build = None if build is None else str(build)

@property
def major(self):
Expand Down
24 changes: 24 additions & 0 deletions test_semver.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,3 +497,27 @@ def test_immutable_unknown_attribute(version):
def test_version_info_should_be_iterable(version):
assert tuple(version) == (version.major, version.minor, version.patch,
version.prerelease, version.build)


def test_should_compare_prerelease_and_build_with_numbers():
assert VersionInfo(major=1, minor=9, patch=1, prerelease=1, build=1) < \
VersionInfo(major=1, minor=9, patch=1, prerelease=2, build=1)
assert VersionInfo(1, 9, 1, 1, 1) < VersionInfo(1, 9, 1, 2, 1)
assert VersionInfo('2') < VersionInfo(10)
assert VersionInfo('2') < VersionInfo('10')


def test_should_be_able_to_use_strings_as_major_minor_patch():
v = VersionInfo('1', '2', '3')
assert isinstance(v.major, int)
assert isinstance(v.minor, int)
assert isinstance(v.patch, int)
assert v.prerelease is None
assert v.build is None


def test_should_be_able_to_use_integers_as_prerelease_build():
v = VersionInfo('1', '2', '3', 4, 5)
assert isinstance(v.prerelease, str)
assert isinstance(v.build, str)
assert VersionInfo('1', '2', '3') == VersionInfo(1, 2, 3)
tomschr marked this conversation as resolved.
Show resolved Hide resolved