From 051cbfecfbd26384bb7014e2ccabf81ec41022eb Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 26 Aug 2020 18:33:57 +0200 Subject: [PATCH] fix --- checksemver.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/checksemver.py b/checksemver.py index 87a4fc3..4a0239b 100644 --- a/checksemver.py +++ b/checksemver.py @@ -6,28 +6,28 @@ import sys parser = argparse.ArgumentParser(description='Semantic Version Validator') parser.add_argument('--versionToValidate', '-V', - help='The version to validate against the semantic versioning rules', + help='The version to validate against the semantic versioning rules', required=True) parser.add_argument('--messageToValidate', '-M', - help='A message to validate, means: it must not be empty', + help='A message to validate, means: it must not be empty', default='', required=False) parser.add_argument('--validateMessage', '-m', - help='Consider -M', + help='Consider -M', required=False, action='store_true', default=False) parser.add_argument('--printExports', '-e', - help='Print exports', + help='Print exports', action='store_true', default=False, required=False) parser.add_argument('--exportFormat', '-f', - help='Print exports in >bash< or >powershell< format, to be used in backticks or with Invoke-Expression', + help='Print exports in >bash< or >powershell< format, to be used in backticks or with Invoke-Expression', default='bash', required=False) parser.add_argument('--verbose', '-v', - help='Verbose output, overrides -q', + help='Verbose output, overrides -q', required=False, action='store_true', default=False) @@ -40,7 +40,7 @@ validateMessage = args.validateMessage printExports = args.printExports exportFormat = args.exportFormat -r = re.compile('^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$') +r = re.compile(r'^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$') # r = re.compile('^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$') if verbose: