From 895dc800d0fb68e7f1926ee1a0904bd74ca5dc61 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 7 Feb 2024 10:09:53 +0100 Subject: [PATCH] remove usage of 'OPENPYPE_VERSION' and 'OPENPYPE_MONGO' --- .../publish/collect_default_deadline_server.py | 4 ++-- .../publish/submit_aftereffects_deadline.py | 9 --------- .../plugins/publish/submit_blender_deadline.py | 9 --------- .../plugins/publish/submit_fusion_deadline.py | 5 ----- .../plugins/publish/submit_harmony_deadline.py | 9 --------- .../publish/submit_houdini_cache_deadline.py | 18 ------------------ .../publish/submit_houdini_remote_publish.py | 9 --------- .../publish/submit_houdini_render_deadline.py | 9 --------- .../plugins/publish/submit_max_deadline.py | 9 --------- .../plugins/publish/submit_maya_deadline.py | 9 --------- .../submit_maya_remote_publish_deadline.py | 5 ----- .../plugins/publish/submit_nuke_deadline.py | 9 --------- .../publish/submit_publish_cache_job.py | 6 ------ .../plugins/publish/submit_publish_job.py | 6 ------ 14 files changed, 2 insertions(+), 114 deletions(-) diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py index afe425ca21..8123409052 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py +++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py @@ -27,8 +27,8 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin): try: deadline_module = context.data["ayonAddonsManager"]["deadline"] except AttributeError: - self.log.error("Cannot get OpenPype Deadline module.") - raise AssertionError("OpenPype Deadline module not found.") + self.log.error("Cannot get AYON Deadline addon.") + raise AssertionError("AYON Deadline addon not found.") deadline_settings = context.data["project_settings"]["deadline"] deadline_server_name = deadline_settings["deadline_server"] diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py index cc446e7faf..af8978c43d 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py @@ -12,7 +12,6 @@ from ayon_core.pipeline import legacy_io from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from ayon_core.tests.lib import is_in_tests -from ayon_core.lib import is_running_from_build @attr.s @@ -91,14 +90,6 @@ class AfterEffectsSubmitDeadline( "IS_TEST" ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if self._instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) for key in keys: diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py index 776d7ecdaa..cdc19e87a0 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py @@ -7,7 +7,6 @@ import attr from datetime import datetime from ayon_core.lib import ( - is_running_from_build, BoolDef, NumberDef, TextDef, @@ -112,14 +111,6 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, "IS_TEST" ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if self._instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py index 8355e857e9..a5f590188e 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py @@ -13,7 +13,6 @@ from ayon_core.pipeline.publish import ( from ayon_core.lib import ( BoolDef, NumberDef, - is_running_from_build ) @@ -232,10 +231,6 @@ class FusionSubmitDeadline( "AYON_BUNDLE_NAME", ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py index 31a9160348..5941b872a4 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py @@ -14,7 +14,6 @@ from ayon_core.pipeline import legacy_io from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from ayon_core.tests.lib import is_in_tests -from ayon_core.lib import is_running_from_build class _ZipFile(ZipFile): @@ -284,14 +283,6 @@ class HarmonySubmitDeadline( "IS_TEST" ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if self._instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) for key in keys: diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py index 96558a3af9..553e2e58c9 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py @@ -13,7 +13,6 @@ from ayon_core.pipeline import ( AYONPyblishPluginMixin ) from ayon_core.tests.lib import is_in_tests -from ayon_core.lib import is_running_from_build from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo @@ -38,10 +37,6 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline Publishing in Deadline can be helpful for scenes that publish very slow. This way it can process in the background on another machine without the Artist having to wait for the publish to finish on their local machine. - - Submission is done through the Deadline Web Service as - supplied via the environment variable AVALON_DEADLINE. - """ label = "Submit Scene to Deadline" @@ -65,12 +60,6 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline result["success"] for result in context.data["results"] ), "Errors found, aborting integration.." - # Deadline connection - AVALON_DEADLINE = legacy_io.Session.get( - "AVALON_DEADLINE", "http://localhost:8082" - ) - assert AVALON_DEADLINE, "Requires AVALON_DEADLINE" - project_name = instance.context.data["projectName"] filepath = context.data["currentFile"] scenename = os.path.basename(filepath) @@ -118,13 +107,6 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline "OPENPYPE_LOG_NO_COLORS", ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - # Add mongo url if it's enabled - if self._instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py index d1ac152715..45dc142075 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_remote_publish.py @@ -8,7 +8,6 @@ import pyblish.api from ayon_core.pipeline import legacy_io from ayon_core.tests.lib import is_in_tests -from ayon_core.lib import is_running_from_build class HoudiniSubmitPublishDeadline(pyblish.api.ContextPlugin): @@ -138,14 +137,6 @@ class HoudiniSubmitPublishDeadline(pyblish.api.ContextPlugin): "AVALON_TOOLS" ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict( {key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py index 56a1c27288..79ab96aa50 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py @@ -10,7 +10,6 @@ from ayon_core.tests.lib import is_in_tests from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from ayon_core.lib import ( - is_running_from_build, BoolDef, NumberDef ) @@ -213,14 +212,6 @@ class HoudiniSubmitDeadline( "OPENPYPE_LOG_NO_COLORS", ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if self._instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py index 6781a6a8ee..caf56db967 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py @@ -23,7 +23,6 @@ from ayon_core.hosts.max.api.lib import ( from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo -from ayon_core.lib import is_running_from_build @attr.s @@ -116,14 +115,6 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, "IS_TEST" ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if self._instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py index 76a7e5e182..1651f377d2 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -44,7 +44,6 @@ from ayon_core.hosts.maya.api.lib import get_attr_in_layer from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from ayon_core.tests.lib import is_in_tests -from ayon_core.lib import is_running_from_build from ayon_core.pipeline.farm.tools import iter_expected_files @@ -209,14 +208,6 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, "IS_TEST" ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if self._instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py index 4391613dee..ab78efa196 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py @@ -4,7 +4,6 @@ from datetime import datetime from ayon_core.pipeline import legacy_io, PublishXmlValidationError from ayon_core.tests.lib import is_in_tests -from ayon_core.lib import is_running_from_build from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo @@ -99,10 +98,6 @@ class MayaSubmitRemotePublishDeadline( "FTRACK_SERVER" ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py index 4ea3ae2eaf..9fff8edee6 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -13,7 +13,6 @@ from ayon_core.pipeline.publish import ( ) from ayon_core.tests.lib import is_in_tests from ayon_core.lib import ( - is_running_from_build, BoolDef, NumberDef ) @@ -390,14 +389,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin, "AYON_BUNDLE_NAME", ] - # Add OpenPype version if we are running from build. - if is_running_from_build(): - keys.append("OPENPYPE_VERSION") - - # Add mongo url if it's enabled - if instance.context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - # add allowed keys from preset if any if self.env_allowed_keys: keys += self.env_allowed_keys diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py index c72479b869..cb0251402d 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py @@ -153,12 +153,6 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, if job_environ.get(env_j_key): environment[env_j_key] = job_environ[env_j_key] - # Add mongo url if it's enabled - if instance.context.data.get("deadlinePassMongoUrl"): - mongo_url = os.environ.get("OPENPYPE_MONGO") - if mongo_url: - environment["OPENPYPE_MONGO"] = mongo_url - priority = self.deadline_priority or instance.data.get("priority", 50) instance_settings = self.get_attr_values_from_data(instance.data) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py index a218560adc..31d57ed2b6 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py @@ -209,12 +209,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin, if job_environ.get(env_j_key): environment[env_j_key] = job_environ[env_j_key] - # Add mongo url if it's enabled - if instance.context.data.get("deadlinePassMongoUrl"): - mongo_url = os.environ.get("OPENPYPE_MONGO") - if mongo_url: - environment["OPENPYPE_MONGO"] = mongo_url - priority = self.deadline_priority or instance.data.get("priority", 50) instance_settings = self.get_attr_values_from_data(instance.data)