Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing conflict

Browse source
This commit is contained in:
Milan Kolar 2020-04-02 15:08:24 +02:00
commit eecedfcb47
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pype/plugins/global/publish/collect_rendered_files.py
View file

@ -84,6 +84,9 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
session_set = False
for path in paths:
path = path.format(**{
"root": os.environ["PYPE_STUDIO_PROJECTS_PATH"]
})
data = self._load_json(path)
if not session_set:
self.log.info("Setting session using data from file")

5
pype/plugins/global/publish/submit_publish_job.py
View file

@ -195,7 +195,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
mount_root = os.path.normpath(os.environ["PYPE_STUDIO_PROJECTS_MOUNT"])
network_root = os.environ["PYPE_STUDIO_PROJECTS_PATH"]
metadata_path = metadata_path.replace(mount_root, network_root)
metadata_path = os.path.normpath(metadata_path)
metadata_path = metadata_path.replace(network_root, "{root}")
# Generate the payload for Deadline submission
payload = {
@ -224,8 +224,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
# job so they use the same environment
environment = job["Props"].get("Env", {})
environment["PYPE_METADATA_FILE"] = metadata_path
environment["AVALON_PROJECT"] = api.Session.get("AVALON_PROJECT")
environment["AVALON_PROJECT"] = io.Session["AVALON_PROJECT"]
i = 0
for index, key in enumerate(environment):
if key.upper() in self.enviro_filter: