From 49e166044563b9fdced37747fa69ef31f3986e09 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 17 Mar 2020 18:22:12 +0100 Subject: [PATCH] initial commit `PYPE_STUDIO_CORE_*` environment keys replaced with `PYPE_CORE_*` --- pype/plugins/global/publish/submit_publish_job.py | 4 ++-- pype/plugins/maya/publish/submit_maya_muster.py | 15 +++++++-------- pype/plugins/nuke/publish/submit_nuke_deadline.py | 9 ++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py index 47c0272254..bc2a5384e6 100644 --- a/pype/plugins/global/publish/submit_publish_job.py +++ b/pype/plugins/global/publish/submit_publish_job.py @@ -21,8 +21,8 @@ def _get_script(): module_path = module_path[: -len(".pyc")] + ".py" module_path = os.path.normpath(module_path) - mount_root = os.path.normpath(os.environ["PYPE_STUDIO_CORE_MOUNT"]) - network_root = os.path.normpath(os.environ["PYPE_STUDIO_CORE_PATH"]) + mount_root = os.path.normpath(os.environ["PYPE_CORE_MOUNT"]) + network_root = os.path.normpath(os.environ["PYPE_CORE_PATH"]) module_path = module_path.replace(mount_root, network_root) diff --git a/pype/plugins/maya/publish/submit_maya_muster.py b/pype/plugins/maya/publish/submit_maya_muster.py index ac60c40bf7..af968ed773 100644 --- a/pype/plugins/maya/publish/submit_maya_muster.py +++ b/pype/plugins/maya/publish/submit_maya_muster.py @@ -311,12 +311,11 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin): # replace path for UNC / network share paths, co PYPE is found # over network. It assumes PYPE is located somewhere in - # PYPE_STUDIO_CORE_PATH + # PYPE_CORE_PATH pype_root = os.environ["PYPE_ROOT"].replace( - os.path.normpath( - os.environ['PYPE_STUDIO_CORE_MOUNT']), # noqa - os.path.normpath( - os.environ['PYPE_STUDIO_CORE_PATH'])) # noqa + os.path.normpath(os.environ['PYPE_CORE_MOUNT']), + os.path.normpath(os.environ['PYPE_CORE_PATH']) + ) # we must provide either full path to executable or use musters own # python named MPython.exe, residing directly in muster bin @@ -521,7 +520,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin): clean_path = "" self.log.debug("key: {}".format(key)) to_process = environment[key] - if key == "PYPE_STUDIO_CORE_MOUNT": + if key == "PYPE_CORE_MOUNT": clean_path = environment[key] elif "://" in environment[key]: clean_path = environment[key] @@ -542,8 +541,8 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin): # this should replace paths so they are pointing to network share clean_path = clean_path.replace( - os.path.normpath(environment['PYPE_STUDIO_CORE_MOUNT']), - os.path.normpath(environment['PYPE_STUDIO_CORE_PATH'])) + os.path.normpath(environment['PYPE_CORE_MOUNT']), + os.path.normpath(environment['PYPE_CORE_PATH'])) clean_environment[key] = clean_path return clean_environment diff --git a/pype/plugins/nuke/publish/submit_nuke_deadline.py b/pype/plugins/nuke/publish/submit_nuke_deadline.py index 0a9ef33398..9ee988b5ae 100644 --- a/pype/plugins/nuke/publish/submit_nuke_deadline.py +++ b/pype/plugins/nuke/publish/submit_nuke_deadline.py @@ -198,7 +198,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): clean_path = "" self.log.debug("key: {}".format(key)) to_process = environment[key] - if key == "PYPE_STUDIO_CORE_MOUNT": + if key == "PYPE_CORE_MOUNT": clean_path = environment[key] elif "://" in environment[key]: clean_path = environment[key] @@ -221,10 +221,9 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): clean_path = clean_path.replace('python2', 'python3') clean_path = clean_path.replace( - os.path.normpath( - environment['PYPE_STUDIO_CORE_MOUNT']), # noqa - os.path.normpath( - environment['PYPE_STUDIO_CORE_PATH'])) # noqa + os.path.normpath(environment['PYPE_CORE_MOUNT']), + os.path.normpath(environment['PYPE_CORE_PATH']) + ) clean_environment[key] = clean_path environment = clean_environment