Merge branch 'master' into 3.0/feature/pype_refactor_start

pype/lib.py

@@ -458,7 +458,7 @@ def get_version_from_path(file):
         v: version number in string ('001')
 
     """
-    pattern = re.compile(r"[\._]v([0-9]+)")
+    pattern = re.compile(r"[\._]v([0-9]+)", re.IGNORECASE)
     try:
         return pattern.findall(file)[0]
     except IndexError:

pype/plugins/global/publish/extract_burnin.py

@@ -58,7 +58,7 @@ class ExtractBurnin(pype.api.Extractor):
         if "representations" not in instance.data:
             raise RuntimeError("Burnin needs already created mov to work on.")
 
-        if self.profiles is None:
+        if self.use_legacy_code(instance):
             return self.legacy_process(instance)
         self.main_process(instance)
 
@@ -71,6 +71,12 @@ class ExtractBurnin(pype.api.Extractor):
 
         self.log.debug(instance.data["representations"])
 
+    def use_legacy_code(self, instance):
+        presets = instance.context.data.get("presets")
+        if presets is None and self.profiles is None:
+            return True
+        return "burnins" in (presets.get("tools") or {})
+
     def main_process(self, instance):
         # TODO get these data from context
         host_name = os.environ["AVALON_APP"]
@@ -830,7 +836,7 @@ class ExtractBurnin(pype.api.Extractor):
         for i, repre in enumerate(instance.data["representations"]):
             self.log.debug("__ i: `{}`, repre: `{}`".format(i, repre))
 
-            if "multipartExr" in repre.get("tags", []):
+            if instance.data.get("multipartExr") is True:
                 # ffmpeg doesn't support multipart exrs
                 continue
 

pype/plugins/global/publish/extract_jpeg.py

@@ -36,7 +36,7 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin):
             if not isinstance(repre['files'], list):
                 continue
 
-            if "multipartExr" in tags:
+            if instance.data.get("multipartExr") is True:
                 # ffmpeg doesn't support multipart exrs
                 continue
 

pype/plugins/global/publish/extract_review.py

@@ -1131,7 +1131,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
 
             tags = repre.get("tags", [])
 
-            if instance.data.get("multipartExr") is True:
+            if inst_data.get("multipartExr") is True:
                 # ffmpeg doesn't support multipart exrs
                 continue
 

pype/version.py

@@ -1 +1 @@
-__version__ = "2.9.0"
+__version__ = "2.9.1"