Merge pull request #4085 from pypeclub/bugfix/regex-to-determine-staging

Igniter: fix regex to match semver better

igniter/bootstrap_repos.py

@@ -63,7 +63,8 @@ class OpenPypeVersion(semver.VersionInfo):
  """
  staging = False
  path = None
- _VERSION_REGEX = re.compile(r"(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?: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<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?") # noqa: E501
+ # this should match any string complying with https://semver.org/
+ _VERSION_REGEX = re.compile(r"(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>[a-zA-Z\d\-.]*))?(?:\+(?P<buildmetadata>[a-zA-Z\d\-.]*))?") # noqa: E501
  _installed_version = None
 
  def __init__(self, *args, **kwargs):
@@ -211,6 +212,8 @@ def version_in_str(string: str) -> Union[None, OpenPypeVersion]:
  OpenPypeVersion: of detected or None.
 
  """
+ # strip .zip ext if present
+ string = re.sub(r"\.zip$", "", string, flags=re.IGNORECASE)
  m = re.search(OpenPypeVersion._VERSION_REGEX, string)
  if not m:
  return None