Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Directly compare version tuples, rather than converting to primitive

Browse Source
This commit is contained in:
Oliver Walters 2021-03-15 08:31:19 +11:00
parent 700effcee7
commit de85d61451
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
InvenTree/InvenTree/version.py
View File

@ -36,19 +36,6 @@ def inventreeVersionTuple(version=None):
return [int(g) for g in match.groups()] return [int(g) for g in match.groups()]
def versionTupleToInt(version):
"""
Convert a version tuple (x, y, z) to an integer.
This simple integer can then be used for direct version comparison
"""
n = version[0] * 1000 * 1000
n += version[1] * 1000
n += version[2]
return n
def isInvenTreeUpToDate(): def isInvenTreeUpToDate():
""" """
Test if the InvenTree instance is "up to date" with the latest version. Test if the InvenTree instance is "up to date" with the latest version.
@ -63,13 +50,11 @@ def isInvenTreeUpToDate():
if not latest: if not latest:
return True return True
# Extract "tuple" version # Extract "tuple" version (Python can directly compare version tuples)
version = inventreeVersionTuple(latest) latest_version = inventreeVersionTuple(latest)
version_int = versionTupleToInt(version) inventree_version = inventreeVersionTuple()
inventree_int = versionTupleToInt(inventreeVersionTuple()) return inventree_version >= latest_version
return inventree_int >= version_int
def inventreeApiVersion(): def inventreeApiVersion():