From 23971e40e1442f9db19d0fda96dd485a261b8bda Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Fri, 12 Nov 2021 09:41:07 +0100 Subject: [PATCH] polishing --- .../publish/collect_sequences_from_job.py | 21 ++++--------------- .../perjob/m50__openpype_publish_render.py | 6 ++---- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py b/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py index 2b0e35b3b8..d2754d1f92 100644 --- a/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py +++ b/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py @@ -67,26 +67,13 @@ def collect(root, class CollectSequencesFromJob(pyblish.api.ContextPlugin): - """Gather file sequences from working directory + """Gather file sequences from job directory. - When "FILESEQUENCE" environment variable is set these paths (folders or - .json files) are parsed for image sequences. Otherwise the current - working directory is searched for file sequences. - - The json configuration may have the optional keys: - asset (str): The asset to publish to. If not provided fall back to - api.Session["AVALON_ASSET"] - subset (str): The subset to publish to. If not provided the sequence's - head (up to frame number) will be used. - frame_start (int): The start frame for the sequence - frame_end (int): The end frame for the sequence - root (str): The path to collect from (can be relative to the .json) - regex (str): A regex for the sequence filename - exclude_regex (str): A regex for filename to exclude from collection - metadata (dict): Custom metadata for instance.data["metadata"] + When "OPENPYPE_PUBLISH_DATA" environment variable is set these paths + (folders or .json files) are parsed for image sequences. Otherwise the + current working directory is searched for file sequences. """ - order = pyblish.api.CollectorOrder targets = ["rr_control"] label = "Collect Rendered Frames" diff --git a/openpype/modules/default_modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py b/openpype/modules/default_modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py index 7e18695a7b..17e4fb38d1 100644 --- a/openpype/modules/default_modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py +++ b/openpype/modules/default_modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py @@ -8,7 +8,6 @@ run it needs `OPENPYPE_ROOT` to be set to know where to execute OpenPype. import rr # noqa import rrGlobal # noqa import subprocess -from subprocess import list2cmdline import os import glob import platform @@ -156,14 +155,13 @@ class OpenPypeContextSelector: ] print(">>> running {}".format(" ".join(args))) - out = None orig = os.environ.copy() orig.update(env) try: subprocess.call(args, env=orig) except subprocess.CalledProcessError as e: - self._show_rr_warning(" Publish failed [ {} ]\n{}".format( - e.returncode, out + self._show_rr_warning(" Publish failed [ {} ]".format( + e.returncode ))