From 95a80df3e4e54c75dd7e9a0e868296a061379154 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 28 Jan 2022 20:14:39 +0100 Subject: [PATCH] Remove OpenPype Deadline Event Plug-in OpenPypeExecutable setting is now retrieved from the OpenPype Plug-in instead. --- .../custom/events/OpenPype/OpenPype.param | 37 ---- .../custom/events/OpenPype/OpenPype.py | 165 ------------------ .../custom/plugins/GlobalJobPreLoad.py | 2 +- 3 files changed, 1 insertion(+), 203 deletions(-) delete mode 100644 vendor/deadline/custom/events/OpenPype/OpenPype.param delete mode 100644 vendor/deadline/custom/events/OpenPype/OpenPype.py diff --git a/vendor/deadline/custom/events/OpenPype/OpenPype.param b/vendor/deadline/custom/events/OpenPype/OpenPype.param deleted file mode 100644 index 871ce47467..0000000000 --- a/vendor/deadline/custom/events/OpenPype/OpenPype.param +++ /dev/null @@ -1,37 +0,0 @@ -[State] -Type=Enum -Items=Global Enabled;Opt-In;Disabled -Category=Options -CategoryOrder=0 -CategoryIndex=0 -Label=State -Default=Global Enabled -Description=How this event plug-in should respond to events. If Global, all jobs and slaves will trigger the events for this plugin. If Opt-In, jobs and slaves can choose to trigger the events for this plugin. If Disabled, no events are triggered for this plugin. - -[PythonSearchPaths] -Type=MultiLineMultiFolder -Label=Additional Python Search Paths -Category=Options -CategoryOrder=0 -CategoryIndex=1 -Default= -Description=The list of paths to append to the PYTHONPATH environment variable. This allows the Python job to find custom modules in non-standard locations. - -[LoggingLevel] -Type=Enum -Label=Logging Level -Category=Options -CategoryOrder=0 -CategoryIndex=2 -Items=DEBUG;INFO;WARNING;ERROR -Default=DEBUG -Description=Logging level where printing will start. - -[OpenPypeExecutable] -Type=multilinemultifilename -Label=Path to OpenPype executable -Category=Job Plugins -CategoryOrder=1 -CategoryIndex=1 -Default= -Description= \ No newline at end of file diff --git a/vendor/deadline/custom/events/OpenPype/OpenPype.py b/vendor/deadline/custom/events/OpenPype/OpenPype.py deleted file mode 100644 index 8a234e831d..0000000000 --- a/vendor/deadline/custom/events/OpenPype/OpenPype.py +++ /dev/null @@ -1,165 +0,0 @@ -import Deadline.Events -import Deadline.Scripting - - -def GetDeadlineEventListener(): - return OpenPypeEventListener() - - -def CleanupDeadlineEventListener(eventListener): - eventListener.Cleanup() - - -class OpenPypeEventListener(Deadline.Events.DeadlineEventListener): - """ - Called on every Deadline plugin event, used for injecting OpenPype - environment variables into rendering process. - - Expects that job already contains env vars: - AVALON_PROJECT - AVALON_ASSET - AVALON_TASK - AVALON_APP_NAME - Without these only global environment would be pulled from OpenPype - - Configure 'Path to OpenPype executable dir' in Deadlines - 'Tools > Configure Events > openpype ' - Only directory path is needed. - - """ - def __init__(self): - pass - # self.OnJobSubmittedCallback += self.OnJobSubmitted - # self.OnJobStartedCallback += self.OnJobStarted - # self.OnJobFinishedCallback += self.OnJobFinished - # self.OnJobRequeuedCallback += self.OnJobRequeued - # self.OnJobFailedCallback += self.OnJobFailed - # self.OnJobSuspendedCallback += self.OnJobSuspended - # self.OnJobResumedCallback += self.OnJobResumed - # self.OnJobPendedCallback += self.OnJobPended - # self.OnJobReleasedCallback += self.OnJobReleased - # self.OnJobDeletedCallback += self.OnJobDeleted - # self.OnJobErrorCallback += self.OnJobError - # self.OnJobPurgedCallback += self.OnJobPurged - # - # self.OnHouseCleaningCallback += self.OnHouseCleaning - # self.OnRepositoryRepairCallback += self.OnRepositoryRepair - # - # self.OnSlaveStartedCallback += self.OnSlaveStarted - # self.OnSlaveStoppedCallback += self.OnSlaveStopped - # self.OnSlaveIdleCallback += self.OnSlaveIdle - # self.OnSlaveRenderingCallback += self.OnSlaveRendering - # self.OnSlaveStartingJobCallback += self.OnSlaveStartingJob - # self.OnSlaveStalledCallback += self.OnSlaveStalled - # - # self.OnIdleShutdownCallback += self.OnIdleShutdown - # self.OnMachineStartupCallback += self.OnMachineStartup - # self.OnThermalShutdownCallback += self.OnThermalShutdown - # self.OnMachineRestartCallback += self.OnMachineRestart - - def Cleanup(self): - pass - # del self.OnJobSubmittedCallback - # del self.OnJobStartedCallback - # del self.OnJobFinishedCallback - # del self.OnJobRequeuedCallback - # del self.OnJobFailedCallback - # del self.OnJobSuspendedCallback - # del self.OnJobResumedCallback - # del self.OnJobPendedCallback - # del self.OnJobReleasedCallback - # del self.OnJobDeletedCallback - # del self.OnJobErrorCallback - # del self.OnJobPurgedCallback - # - # del self.OnHouseCleaningCallback - # del self.OnRepositoryRepairCallback - # - # del self.OnSlaveStartedCallback - # del self.OnSlaveStoppedCallback - # del self.OnSlaveIdleCallback - # del self.OnSlaveRenderingCallback - # del self.OnSlaveStartingJobCallback - # del self.OnSlaveStalledCallback - # - # del self.OnIdleShutdownCallback - # del self.OnMachineStartupCallback - # del self.OnThermalShutdownCallback - # del self.OnMachineRestartCallback - - def updateFtrackStatus(self, job, statusName, createIfMissing=False): - """Updates version status on ftrack""" - pass - - def OnJobSubmitted(self, job): - # for 1st time submit - self.updateFtrackStatus(job, "Render Queued") - - def OnJobStarted(self, job): - # self.LogInfo("OnJobStarted") - self.updateFtrackStatus(job, "Rendering") - - def OnJobFinished(self, job): - self.updateFtrackStatus(job, "Artist Review") - - def OnJobRequeued(self, job): - - def OnJobFailed(self, job): - pass - - def OnJobSuspended(self, job): - self.updateFtrackStatus(job, "Render Queued") - - def OnJobResumed(self, job): - self.updateFtrackStatus(job, "Rendering") - - def OnJobPended(self, job): - pass - - def OnJobReleased(self, job): - pass - - def OnJobDeleted(self, job): - pass - - def OnJobError(self, job, task, report): - pass - - def OnJobPurged(self, job): - pass - - def OnHouseCleaning(self): - pass - - def OnRepositoryRepair(self, job, *args): - pass - - def OnSlaveStarted(self, job): - pass - - def OnSlaveStopped(self, job): - pass - - def OnSlaveIdle(self, job): - pass - - def OnSlaveRendering(self, host_name, job): - pass - - def OnSlaveStartingJob(self, host_name, job): - pass - - def OnSlaveStalled(self, job): - pass - - def OnIdleShutdown(self, job): - pass - - def OnMachineStartup(self, job): - pass - - def OnThermalShutdown(self, job): - pass - - def OnMachineRestart(self, job): - pass diff --git a/vendor/deadline/custom/plugins/GlobalJobPreLoad.py b/vendor/deadline/custom/plugins/GlobalJobPreLoad.py index 6f33454146..ee137a2ee3 100644 --- a/vendor/deadline/custom/plugins/GlobalJobPreLoad.py +++ b/vendor/deadline/custom/plugins/GlobalJobPreLoad.py @@ -10,7 +10,7 @@ from Deadline.Scripting import RepositoryUtils, FileUtils def get_openpype_executable(): """Return OpenPype Executable from Event Plug-in Settings""" - config = RepositoryUtils.GetEventPluginConfig("OpenPype") + config = RepositoryUtils.GetPluginConfig("OpenPype") return config.GetConfigEntryWithDefault("OpenPypeExecutable", "")