diff --git a/pype/plugins/fusion/publish/submit_deadline.py b/pype/plugins/fusion/publish/submit_deadline.py index 6e1f405afd..30d17a4c69 100644 --- a/pype/plugins/fusion/publish/submit_deadline.py +++ b/pype/plugins/fusion/publish/submit_deadline.py @@ -12,7 +12,7 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin): """Submit current Comp to Deadline Renders are submitted to a Deadline Web Service as - supplied via the environment variable AVALON_DEADLINE + supplied via the environment variable DEADLINE_REST_URL """ @@ -33,9 +33,9 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin): from avalon.fusion.lib import get_frame_path - AVALON_DEADLINE = api.Session.get("AVALON_DEADLINE", + DEADLINE_REST_URL = api.Session.get("DEADLINE_REST_URL", "http://localhost:8082") - assert AVALON_DEADLINE, "Requires AVALON_DEADLINE" + assert DEADLINE_REST_URL, "Requires DEADLINE_REST_URL" # Collect all saver instances in context that are to be rendered saver_instances = [] @@ -139,7 +139,7 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin): self.log.info(json.dumps(payload, indent=4, sort_keys=True)) # E.g. http://192.168.0.1:8082/api/jobs - url = "{}/api/jobs".format(AVALON_DEADLINE) + url = "{}/api/jobs".format(DEADLINE_REST_URL) response = requests.post(url, json=payload) if not response.ok: raise Exception(response.text) diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py index 8895e3626a..4357588e25 100644 --- a/pype/plugins/global/publish/submit_publish_job.py +++ b/pype/plugins/global/publish/submit_publish_job.py @@ -98,7 +98,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): plug-in. Renders are submitted to a Deadline Web Service as - supplied via the environment variable AVALON_DEADLINE + supplied via the environment variable DEADLINE_REST_URL Options in instance.data: - deadlineSubmission (dict, Required): The returned .json @@ -133,9 +133,9 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): def process(self, instance): - AVALON_DEADLINE = api.Session.get("AVALON_DEADLINE", + DEADLINE_REST_URL = api.Session.get("DEADLINE_REST_URL", "http://localhost:8082") - assert AVALON_DEADLINE, "Requires AVALON_DEADLINE" + assert DEADLINE_REST_URL, "Requires DEADLINE_REST_URL" # try: # deadline_url = os.environ["DEADLINE_REST_URL"] @@ -326,7 +326,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): self.log.info("Submitting..") self.log.info(json.dumps(payload, indent=4, sort_keys=True)) - url = "{}/api/jobs".format(AVALON_DEADLINE) + url = "{}/api/jobs".format(DEADLINE_REST_URL) response = requests.post(url, json=payload) if not response.ok: raise Exception(response.text) diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/plugins/maya/publish/submit_maya_deadline.py index 84f83c8e92..e476e62bb4 100644 --- a/pype/plugins/maya/publish/submit_maya_deadline.py +++ b/pype/plugins/maya/publish/submit_maya_deadline.py @@ -92,7 +92,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): """Submit available render layers to Deadline Renders are submitted to a Deadline Web Service as - supplied via the environment variable AVALON_DEADLINE + supplied via the environment variable DEADLINE_REST_URL """ @@ -104,9 +104,9 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): def process(self, instance): - AVALON_DEADLINE = api.Session.get("AVALON_DEADLINE", + DEADLINE_REST_URL = api.Session.get("DEADLINE_REST_URL", "http://localhost:8082") - assert AVALON_DEADLINE, "Requires AVALON_DEADLINE" + assert DEADLINE_REST_URL, "Requires DEADLINE_REST_URL" context = instance.context workspace = context.data["workspaceDir"] @@ -301,7 +301,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): self.log.info(json.dumps(payload, indent=4, sort_keys=True)) # E.g. http://192.168.0.1:8082/api/jobs - url = "{}/api/jobs".format(AVALON_DEADLINE) + url = "{}/api/jobs".format(DEADLINE_REST_URL) response = requests.post(url, json=payload) if not response.ok: raise Exception(response.text) diff --git a/pype/plugins/maya/publish/submit_vray_deadline.py b/pype/plugins/maya/publish/submit_vray_deadline.py index d43e92c6d8..16625e73f7 100644 --- a/pype/plugins/maya/publish/submit_vray_deadline.py +++ b/pype/plugins/maya/publish/submit_vray_deadline.py @@ -28,13 +28,13 @@ class VraySubmitDeadline(pyblish.api.InstancePlugin): def process(self, instance): - AVALON_DEADLINE = api.Session.get("AVALON_DEADLINE", + DEADLINE_REST_URL = api.Session.get("DEADLINE_REST_URL", "http://localhost:8082") - assert AVALON_DEADLINE, "Requires AVALON_DEADLINE" + assert DEADLINE_REST_URL, "Requires DEADLINE_REST_URL" context = instance.context - deadline_url = "{}/api/jobs".format(AVALON_DEADLINE) + deadline_url = "{}/api/jobs".format(DEADLINE_REST_URL) deadline_user = context.data.get("deadlineUser", getpass.getuser()) filepath = context.data["currentFile"] diff --git a/pype/plugins/maya/publish/validate_deadline_connection.py b/pype/plugins/maya/publish/validate_deadline_connection.py index 4f9f34be69..b89e3c9b2e 100644 --- a/pype/plugins/maya/publish/validate_deadline_connection.py +++ b/pype/plugins/maya/publish/validate_deadline_connection.py @@ -19,13 +19,13 @@ class ValidateDeadlineConnection(pyblish.api.ContextPlugin): return try: - AVALON_DEADLINE = os.environ["AVALON_DEADLINE"] + DEADLINE_REST_URL = os.environ["DEADLINE_REST_URL"] except KeyError: self.log.error("Deadline REST API url not found.") raise ValueError("Deadline REST API url not found.") # Check response - response = requests.get(AVALON_DEADLINE) + response = requests.get(DEADLINE_REST_URL) assert response.ok, "Response must be ok" assert response.text.startswith("Deadline Web Service "), ( "Web service did not respond with 'Deadline Web Service'" diff --git a/pype/plugins/nuke/_publish_unused/submit_deadline.py b/pype/plugins/nuke/_publish_unused/submit_deadline.py index ffb298f75d..b5476876e0 100644 --- a/pype/plugins/nuke/_publish_unused/submit_deadline.py +++ b/pype/plugins/nuke/_publish_unused/submit_deadline.py @@ -13,7 +13,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): """Submit current Comp to Deadline Renders are submitted to a Deadline Web Service as - supplied via the environment variable AVALON_DEADLINE + supplied via the environment variable DEADLINE_REST_URL """ @@ -32,9 +32,9 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): else: context.data[key] = True - AVALON_DEADLINE = api.Session.get("AVALON_DEADLINE", + DEADLINE_REST_URL = api.Session.get("DEADLINE_REST_URL", "http://localhost:8082") - assert AVALON_DEADLINE, "Requires AVALON_DEADLINE" + assert DEADLINE_REST_URL, "Requires DEADLINE_REST_URL" # Collect all saver instances in context that are to be rendered write_instances = [] @@ -137,7 +137,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): self.log.info(json.dumps(payload, indent=4, sort_keys=True)) # E.g. http://192.168.0.1:8082/api/jobs - url = "{}/api/jobs".format(AVALON_DEADLINE) + url = "{}/api/jobs".format(DEADLINE_REST_URL) response = requests.post(url, json=payload) if not response.ok: raise Exception(response.text)