From d521ea7f96f1e1af99396dbe7a06c836124e3eaf Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 13 Mar 2025 12:53:49 +0000 Subject: [PATCH 1/2] Use \d --- components/antlib/scripts/parse_version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/antlib/scripts/parse_version b/components/antlib/scripts/parse_version index 753fb25247f..cc133187e86 100755 --- a/components/antlib/scripts/parse_version +++ b/components/antlib/scripts/parse_version @@ -73,7 +73,7 @@ def snapshot_logic(omero_version): m = re.match(( "^" "(?P.*?)" - "(?P([-]DEV)?-\d+-[a-f0-9]+?(-dirty)?)" + "(?P([-]DEV)?-\\d+-[a-f0-9]+?(-dirty)?)" "(?P-ice[0-9]+)?" "$"), omero_version) if m: @@ -115,7 +115,7 @@ def incr_version(omero_version): omero_version = new_vers except: # But if that doesn't work, we brute force with regex - m = re.match("^([^\d]*\d+[.]\d+[.])(\d+)-SNAPSHOT$", omero_version) + m = re.match("^([^\\d]*\\d+[.]\\d+[.])(\\d+)-SNAPSHOT$", omero_version) if m: next = int(m.group(2)) + 1 omero_version = "%s%s-SNAPSHOT" % (m.group(1), next) From d5b6542e65d861fb6960703ccef1db1dd236b394 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 8 Apr 2025 15:44:47 +0100 Subject: [PATCH 2/2] use raw string --- components/antlib/scripts/parse_version | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/antlib/scripts/parse_version b/components/antlib/scripts/parse_version index cc133187e86..c136d577883 100755 --- a/components/antlib/scripts/parse_version +++ b/components/antlib/scripts/parse_version @@ -70,10 +70,11 @@ def snapshot_logic(omero_version): See gh-67 for the discussion. """ - m = re.match(( + re.compile() + m = re.match(r( "^" "(?P.*?)" - "(?P([-]DEV)?-\\d+-[a-f0-9]+?(-dirty)?)" + "(?P([-]DEV)?-\d+-[a-f0-9]+?(-dirty)?)" "(?P-ice[0-9]+)?" "$"), omero_version) if m: @@ -115,7 +116,7 @@ def incr_version(omero_version): omero_version = new_vers except: # But if that doesn't work, we brute force with regex - m = re.match("^([^\\d]*\\d+[.]\\d+[.])(\\d+)-SNAPSHOT$", omero_version) + m = re.match(r"^([^\d]*\\d+[.]\d+[.])(\d+)-SNAPSHOT$", omero_version) if m: next = int(m.group(2)) + 1 omero_version = "%s%s-SNAPSHOT" % (m.group(1), next)