PYTHON-1021 - Support git describe based server versions
This commit is contained in:
parent
a3cf3cf568
commit
792b7626dc
@ -32,6 +32,7 @@ class Version(tuple):
|
||||
@classmethod
|
||||
def from_string(cls, version_string):
|
||||
mod = 0
|
||||
bump_patch_level = False
|
||||
if version_string.endswith("+"):
|
||||
version_string = version_string[0:-1]
|
||||
mod = 1
|
||||
@ -42,19 +43,43 @@ class Version(tuple):
|
||||
version_string = version_string[0:-1]
|
||||
mod = -1
|
||||
# Deal with '-rcX' substrings
|
||||
if version_string.find('-rc') != -1:
|
||||
if '-rc' in version_string:
|
||||
version_string = version_string[0:version_string.find('-rc')]
|
||||
mod = -1
|
||||
# Deal with git describe generated substrings
|
||||
elif '-' in version_string:
|
||||
version_string = version_string[0:version_string.find('-')]
|
||||
mod = -1
|
||||
bump_patch_level = True
|
||||
|
||||
|
||||
version = [int(part) for part in version_string.split(".")]
|
||||
version = cls._padded(version, 3)
|
||||
# Make from_string and from_version_array agree. For example:
|
||||
# MongoDB Enterprise > db.runCommand('buildInfo').versionArray
|
||||
# [ 3, 2, 1, -100 ]
|
||||
# MongoDB Enterprise > db.runCommand('buildInfo').version
|
||||
# 3.2.0-97-g1ef94fe
|
||||
if bump_patch_level:
|
||||
version[-1] += 1
|
||||
version.append(mod)
|
||||
|
||||
return Version(*version)
|
||||
|
||||
@classmethod
|
||||
def from_version_array(cls, version_array):
|
||||
version = list(version_array)
|
||||
if version[-1] < 0:
|
||||
version[-1] = -1
|
||||
version = cls._padded(version, 3)
|
||||
return Version(*version)
|
||||
|
||||
@classmethod
|
||||
def from_client(cls, client):
|
||||
return cls.from_string(client.server_info()['version'])
|
||||
info = client.server_info()
|
||||
if 'versionArray' in info:
|
||||
return cls.from_version_array(info['versionArray'])
|
||||
return cls.from_string(info['version'])
|
||||
|
||||
def at_least(self, *other_version):
|
||||
return self >= Version(*other_version)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user