diff --git a/zcutil/make-release.py b/zcutil/make-release.py index 7d505c279..e9e93a385 100755 --- a/zcutil/make-release.py +++ b/zcutil/make-release.py @@ -418,7 +418,7 @@ class Version (object): '''A release version.''' RGX = re.compile( - r'^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(beta|rc)?([1-9]\d*))?$', + r'^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(beta|rc|dev|lin|mac|win)?([1-9]\d*)?)?$', ) @staticmethod @@ -432,6 +432,7 @@ class Version (object): ), ) else: + print(m.groups()) [major, minor, patch, _, betarc, hotfix] = m.groups() return Version( int(major), @@ -444,10 +445,11 @@ class Version (object): def __init__(self, major, minor, patch, betarc, hotfix): for i in [major, minor, patch]: assert type(i) is int, i - assert betarc in {None, 'rc', 'beta'}, betarc + assert betarc in {None, 'beta', 'rc', 'dev', 'lin', 'mac', 'win'}, betarc assert hotfix is None or type(hotfix) is int, hotfix if betarc is not None: - assert hotfix is not None, (betarc, hotfix) + pass + # assert hotfix is not None, (betarc, hotfix) self.major = major self.minor = minor