From c6dc72e0032708d6bcf0575d0a3c68faf5b11f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= Date: Wed, 18 Sep 2024 10:58:15 +0200 Subject: [PATCH] :recycle: restore changes for submitters unused for usd --- .../publish/blender/submit_blender_deadline.py | 13 ------------- .../publish/global/submit_publish_cache_job.py | 17 +++++------------ .../publish/global/submit_publish_job.py | 17 +++++------------ .../plugins/publish/max/submit_max_deadline.py | 13 ------------- .../publish/unreal/submit_unreal_deadline.py | 14 -------------- 5 files changed, 10 insertions(+), 64 deletions(-) diff --git a/client/ayon_deadline/plugins/publish/blender/submit_blender_deadline.py b/client/ayon_deadline/plugins/publish/blender/submit_blender_deadline.py index 9d74126e80..073de909b4 100644 --- a/client/ayon_deadline/plugins/publish/blender/submit_blender_deadline.py +++ b/client/ayon_deadline/plugins/publish/blender/submit_blender_deadline.py @@ -18,13 +18,6 @@ from ayon_deadline import abstract_submit_deadline from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo -try: - from ayon_usd import get_usd_pinning_envs -except ImportError: - # usd is not enabled or available, so we just mock the function - def get_usd_pinning_envs(instance): - return {} - @attr.s class BlenderPluginInfo(): @@ -126,12 +119,6 @@ def get_job_info(self): if key in os.environ } - # TODO (antirotor): there should be better way to handle this. - # see https://github.com/ynput/ayon-core/issues/876 - usd_env = get_usd_pinning_envs(instance) - environment.update(usd_env) - keys += list(usd_env.keys()) - for key in keys: value = environment.get(key) if not value: diff --git a/client/ayon_deadline/plugins/publish/global/submit_publish_cache_job.py b/client/ayon_deadline/plugins/publish/global/submit_publish_cache_job.py index c52bdef21e..d93592a6a3 100644 --- a/client/ayon_deadline/plugins/publish/global/submit_publish_cache_job.py +++ b/client/ayon_deadline/plugins/publish/global/submit_publish_cache_job.py @@ -20,13 +20,6 @@ ) from ayon_deadline.abstract_submit_deadline import requests_post -try: - from ayon_usd import get_usd_pinning_envs -except ImportError: - # usd is not enabled or available, so we just mock the function - def get_usd_pinning_envs(instance): - return {} - class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, publish.AYONPyblishPluginMixin, @@ -84,6 +77,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, deadline_pool = "" deadline_pool_secondary = "" deadline_group = "" + deadline_chunk_size = 1 deadline_priority = None # regex for finding frame number in string @@ -91,6 +85,9 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, plugin_pype_version = "3.0" + # script path for publish_filesequence.py + publishing_script = None + def _submit_deadline_post_job(self, instance, job): """Submit publish job to Deadline. @@ -146,10 +143,6 @@ def _submit_deadline_post_job(self, instance, job): if os.getenv(env_key): environment[env_key] = os.environ[env_key] - # TODO (antirotor): there should be better way to handle this. - # see https://github.com/ynput/ayon-core/issues/876 - environment.update(get_usd_pinning_envs(instance)) - priority = self.deadline_priority or instance.data.get("priority", 50) instance_settings = self.get_attr_values_from_data(instance.data) @@ -176,7 +169,7 @@ def _submit_deadline_post_job(self, instance, job): "Comment": instance.context.data.get("comment", ""), "Department": self.deadline_department, - "ChunkSize": 1, + "ChunkSize": self.deadline_chunk_size, "Priority": priority, "InitialStatus": initial_status, diff --git a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py index 8842c1c57f..d773341e70 100644 --- a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py +++ b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py @@ -22,13 +22,6 @@ ) from ayon_deadline.abstract_submit_deadline import requests_post -try: - from ayon_usd import get_usd_pinning_envs -except ImportError: - # usd is not enabled or available, so we just mock the function - def get_usd_pinning_envs(instance): - return {} - def get_resource_files(resources, frame_range=None): """Get resource files at given path. @@ -148,6 +141,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin, deadline_pool = "" deadline_pool_secondary = "" deadline_group = "" + deadline_chunk_size = 1 deadline_priority = None # regex for finding frame number in string @@ -166,6 +160,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin, families_transfer = ["render3d", "render2d", "ftrack", "slate"] plugin_pype_version = "3.0" + # script path for publish_filesequence.py + publishing_script = None + # poor man exclusion skip_integration_repre_list = [] @@ -219,10 +216,6 @@ def _submit_deadline_post_job(self, instance, job, instances): ), } - # TODO (antirotor): there should be better way to handle this. - # see https://github.com/ynput/ayon-core/issues/876 - environment.update(get_usd_pinning_envs(instance)) - # add environments from self.environ_keys for env_key in self.environ_keys: if os.getenv(env_key): @@ -254,7 +247,7 @@ def _submit_deadline_post_job(self, instance, job, instances): "Comment": instance.context.data.get("comment", ""), "Department": self.deadline_department, - "ChunkSize": 1, + "ChunkSize": self.deadline_chunk_size, "Priority": priority, "InitialStatus": initial_status, diff --git a/client/ayon_deadline/plugins/publish/max/submit_max_deadline.py b/client/ayon_deadline/plugins/publish/max/submit_max_deadline.py index 5f9cd0489b..6a369eb001 100644 --- a/client/ayon_deadline/plugins/publish/max/submit_max_deadline.py +++ b/client/ayon_deadline/plugins/publish/max/submit_max_deadline.py @@ -23,13 +23,6 @@ from ayon_deadline import abstract_submit_deadline from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo -try: - from ayon_usd import get_usd_pinning_envs -except ImportError: - # usd is not enabled or available, so we just mock the function - def get_usd_pinning_envs(instance): - return {} - @attr.s class MaxPluginInfo(object): @@ -130,12 +123,6 @@ def get_job_info(self): if key in os.environ } - # TODO (antirotor): there should be better way to handle this. - # see https://github.com/ynput/ayon-core/issues/876 - usd_env = get_usd_pinning_envs(instance) - environment.update(usd_env) - keys += list(usd_env.keys()) - for key in keys: value = environment.get(key) if not value: diff --git a/client/ayon_deadline/plugins/publish/unreal/submit_unreal_deadline.py b/client/ayon_deadline/plugins/publish/unreal/submit_unreal_deadline.py index bdbf3bab34..cabb764437 100644 --- a/client/ayon_deadline/plugins/publish/unreal/submit_unreal_deadline.py +++ b/client/ayon_deadline/plugins/publish/unreal/submit_unreal_deadline.py @@ -10,13 +10,6 @@ from ayon_deadline import abstract_submit_deadline from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo -try: - from ayon_usd import get_usd_pinning_envs -except ImportError: - # usd is not enabled or available, so we just mock the function - def get_usd_pinning_envs(instance): - return {} - @attr.s class DeadlinePluginInfo(): @@ -106,13 +99,6 @@ def get_job_info(self): for key in keys if key in os.environ } - - # TODO (antirotor): there should be better way to handle this. - # see https://github.com/ynput/ayon-core/issues/876 - usd_env = get_usd_pinning_envs(self._instance) - environment.update(usd_env) - keys += list(usd_env.keys()) - for key in keys: value = environment.get(key) if value: