From 768ad40c05809a2ada3403be4fb0543e31b206d7 Mon Sep 17 00:00:00 2001 From: abacigalup-eb <82166330+abacigalup-eb@users.noreply.github.com> Date: Mon, 7 Jun 2021 10:00:42 -0300 Subject: [PATCH 1/2] added + in regex character set --- python/invoke_release/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/invoke_release/tasks.py b/python/invoke_release/tasks.py index e96d57e..e475b7f 100644 --- a/python/invoke_release/tasks.py +++ b/python/invoke_release/tasks.py @@ -1366,7 +1366,7 @@ def release(_, verbose=False, no_stash=False): return version_regular_expression = re.compile( - r'^' + branch_name.replace('.x', r'.\d+').replace('.', r'\.') + r'([a-zA-Z\d.-]*[a-zA-Z\d]+)?$', + r'^' + branch_name.replace('.x', r'.\d+').replace('.', r'\.') + r'([a-zA-Z\d.-+]*[a-zA-Z\d]+)?$', ) try: From 101e8c8f1b31fa3809078e1bad6b6441d9878bf4 Mon Sep 17 00:00:00 2001 From: abacigalup-eb <82166330+abacigalup-eb@users.noreply.github.com> Date: Mon, 7 Jun 2021 10:15:23 -0300 Subject: [PATCH 2/2] fix character order --- python/invoke_release/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/invoke_release/tasks.py b/python/invoke_release/tasks.py index e475b7f..4697f4d 100644 --- a/python/invoke_release/tasks.py +++ b/python/invoke_release/tasks.py @@ -1366,7 +1366,7 @@ def release(_, verbose=False, no_stash=False): return version_regular_expression = re.compile( - r'^' + branch_name.replace('.x', r'.\d+').replace('.', r'\.') + r'([a-zA-Z\d.-+]*[a-zA-Z\d]+)?$', + r'^' + branch_name.replace('.x', r'.\d+').replace('.', r'\.') + r'([a-zA-Z\d.+-]*[a-zA-Z\d]+)?$', ) try: