Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

OP-1066 - sanitize version

Browse source 
RR expect version in format 3.157 instead proper 3.15.7-nightly.2
This commit is contained in:
Petr Kalis 2023-05-12 18:23:38 +02:00
parent 2c3cd1c630
commit 86a1357033
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
View file

@ -3,6 +3,7 @@
import os
import attr
import json
import re
import pyblish.api
@ -229,7 +230,7 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin):
SeqEnd=1,
SeqStep=1,
SeqFileOffset=0,
Version=os.environ.get("OPENPYPE_VERSION"),
Version=self._sanitize_version(os.environ.get("OPENPYPE_VERSION")),
SceneName=abs_metadata_path,
# command line arguments
CustomAddCmdFlags=" ".join(args),
@ -256,3 +257,26 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin):
job.WaitForPreIDs += jobs_pre_ids
return job
def _sanitize_version(self, version):
"""Returns version in format MAJOR.MINORPATCH
3.15.7-nightly.2 >> 3.157
"""
VERSION_REGEX = re.compile(
r"(?P<major>0|[1-9]\d*)"
r"\.(?P<minor>0|[1-9]\d*)"
r"\.(?P<patch>0|[1-9]\d*)"
r"(?:-(?P<prerelease>[a-zA-Z\d\-.]*))?"
r"(?:\+(?P<buildmetadata>[a-zA-Z\d\-.]*))?"
)
valid_parts = VERSION_REGEX.findall(version)
if len(valid_parts) != 1:
# Return invalid version with filled 'origin' attribute
return version
# Unpack found version
major, minor, patch, pre, post = valid_parts[0]
return "{}.{}{}".format(major, minor, patch)