Skip to content

imccoremeta: Update ImcVersion to match the new major.minor(mr.patch) release numbering #241

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.

Sign up for GitHub

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

Open
mtimm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

imccoremeta: Update ImcVersion to match the new major.minor(mr.patch) release numbering #241

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a03e67c
imccoremeta: Update ImcVersion to match the new major.minor(mr.patch)…
mtimm Feb 13, 2024
db0c0b0
Combine regex patterns for patch version
mtimm Feb 28, 2024
b8a03e8
Limit bumping mr to 1 to 5 digits patch numbers, the new release numb…
mtimm Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions imcsdk/imccoremeta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,16 @@ def __init__(self, version):
self.__patch = None
self.__spin = None

# Matches major.minor(mr.patch), example 4.3(2.4) as well as 4.3(2.240002)
match_pattern = re.compile("^(?P<major>[1-9][0-9]{0,2})\."
"(?P<minor>(([0-9])|([1-9][0-9]{0,1})))\("
"(?P<mr>(([0-9])|([1-9][0-9]{0,2})))\."
"(?P<patch>(([0-9])|([1-9][0-9]{0,4})))\)$")
"(?P<patch>(([0-9])|([1-9][0-9]{0,5})))\)$")
match_obj = re.match(match_pattern, version)
if self._set_versions(match_obj):
return

# Matches major.minor(mrpatch), example 4.3(2a)
match_pattern = re.compile("^(?P<major>[1-9][0-9]{0,2})\."
"(?P<minor>(([0-9])|([1-9][0-9]{0,1})))\("
"(?P<mr>(([0-9])|([1-9][0-9]{0,2})))"
Expand All @@ -64,6 +66,7 @@ def __init__(self, version):
if self._set_versions(match_obj):
return

# Matches major.minor(mr), example 4.3(2)
match_pattern = re.compile("^(?P<major>[1-9][0-9]{0,2})\."
"(?P<minor>(([0-9])|([1-9][0-9]{0,1})))\("
"(?P<mr>(([0-9])|([1-9][0-9]{0,2})))\)$")
Expand Down Expand Up @@ -124,7 +127,11 @@ def _set_versions(self, match_obj):
# In this scenario assume the version to be highest patch z
if self.__spin is not None and self.__patch is None:
self.__patch = 'z'
elif self.__patch is not None and self.__mr is not None and self.__patch.isdigit() and self.__mr.isdigit():
elif (self.__patch is not None
and self.__mr is not None
and self.__patch.isdigit()
and self.__mr.isdigit()
and len(self.__patch) < 6):
log.debug("Interim version encountered: %s. MR version has been bumped up." % self.version)
self.__mr = str(int(self.__mr) + 1)
self.__patch = 'a'
Expand Down