From f59e692918e4b2609dcc2b349ad7722c350e6f7c Mon Sep 17 00:00:00 2001 From: Rob Aitchison <43424110+rob-aitchison@users.noreply.github.com> Date: Tue, 13 Oct 2020 13:37:00 -0700 Subject: [PATCH] SHOT-3543 Introduce Review with VRED into config (#92) * Initial work on SHOT-3543 * Working version but need to review wht actual declarations to be used here. * Updates to test new tk-shotgun-launchvred repo. * Updated app_location of tk-shotgun-launchvred for testing. * Updated engine_location of tk-vred for testing. * Cleaned up pick_environment and the two tk-shotgun-launch yml files. * Renamed to tk-shotgun-launchvredreview * Updated to point at app_store locations. * Removed published_file references. * Fixed spacing problem in frameworks.yml. --- .gitignore | 4 ++++ .pre-commit-config.yaml | 4 ++-- env/includes/app_locations.yml | 6 +++++ .../settings/tk-shotgun-launchvredreview.yml | 23 +++++++++++++++++++ env/includes/settings/tk-shotgun.yml | 5 +++- env/includes/settings/tk-vred.yml | 12 ++++++++++ env/version.yml | 2 ++ 7 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 env/includes/settings/tk-shotgun-launchvredreview.yml diff --git a/.gitignore b/.gitignore index e08e419..9ade696 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,7 @@ pip-log.txt #Mr Developer .mr.developer.cfg + +# Jetbrains Pycharm +.idea +venv diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 033f66c..491c367 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ exclude: "ui\/.*py$" # List of super useful formatters. repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.2.3 + rev: v3.2.0 hooks: # Ensures the code is syntaxically correct - id: check-ast @@ -35,7 +35,7 @@ repos: - id: trailing-whitespace # Leave black at the bottom so all touchups are done before it is run. - repo: https://github.com/ambv/black - rev: stable + rev: 20.8b1 hooks: - id: black language_version: python3 diff --git a/env/includes/app_locations.yml b/env/includes/app_locations.yml index 34a866f..81a9ac4 100644 --- a/env/includes/app_locations.yml +++ b/env/includes/app_locations.yml @@ -129,6 +129,12 @@ apps.tk-shotgun-launchpublish.location: name: tk-shotgun-launchpublish version: v0.4.0 +# shotgun launchvredreview +apps.tk-shotgun-launchvredreview.location: + type: app_store + name: tk-shotgun-launchvredreview + version: v1.0.0 + # ---- Hiero apps # hiero export diff --git a/env/includes/settings/tk-shotgun-launchvredreview.yml b/env/includes/settings/tk-shotgun-launchvredreview.yml new file mode 100644 index 0000000..261202a --- /dev/null +++ b/env/includes/settings/tk-shotgun-launchvredreview.yml @@ -0,0 +1,23 @@ +# Copyright (c) 2020 Autodesk, Inc. +# +# CONFIDENTIAL AND PROPRIETARY +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# Source Code License included in this distribution package. See LICENSE. +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# not expressly granted therein are reserved by Autodesk, Inc. + +################################################################################ + +includes: +- ../app_locations.yml + +################################################################################ + +settings.tk-shotgun-launchvredreview: + deny_platforms: [ Mac, Linux ] + viewer_extensions: [ vpb ] + hook_verify_install: "{self}/verify_install.py" + hook_launch_publish: "{self}/shotgun_launch_vred.py" + location: "@apps.tk-shotgun-launchvredreview.location" diff --git a/env/includes/settings/tk-shotgun.yml b/env/includes/settings/tk-shotgun.yml index 8fb64c9..de1e2ae 100644 --- a/env/includes/settings/tk-shotgun.yml +++ b/env/includes/settings/tk-shotgun.yml @@ -19,6 +19,7 @@ includes: - ./tk-shotgun-folders.yml - ./tk-shotgun-launchfolder.yml - ./tk-shotgun-launchpublish.yml +- ./tk-shotgun-launchvredreview.yml ################################################################################ @@ -57,13 +58,15 @@ settings.tk-shotgun.project: tk-shotgun-launchfolder: "@settings.tk-shotgun-launchfolder" location: "@engines.tk-shotgun.location" -# publishedfile_version +# version settings.tk-shotgun.version: apps: tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv" tk-shotgun-launchpublish: "@settings.tk-shotgun-launchpublish" + tk-shotgun-launchvredreview: "@settings.tk-shotgun-launchvredreview" location: "@engines.tk-shotgun.location" +# publishedfile settings.tk-shotgun.publishedfile: apps: tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv" diff --git a/env/includes/settings/tk-vred.yml b/env/includes/settings/tk-vred.yml index f00f482..902688b 100644 --- a/env/includes/settings/tk-vred.yml +++ b/env/includes/settings/tk-vred.yml @@ -51,6 +51,8 @@ settings.tk-vred.asset_step: - {app_instance: tk-multi-workfiles2, name: File Save...} - {app_instance: tk-multi-publish2, name: Publish...} render_template: vred_asset_render_work + run_at_startup: + - {app_instance: tk-multi-shotgunpanel, name: ''} location: "@engines.tk-vred.location" # project @@ -62,4 +64,14 @@ settings.tk-vred.project: tk-multi-workfiles2: "@settings.tk-multi-workfiles2.vred" menu_favourites: - {app_instance: tk-multi-workfiles2, name: File Open...} + run_at_startup: + - { app_instance: tk-multi-shotgunpanel, name: '' } + location: "@engines.tk-vred.location" + +# version for tk-shotgun-launchvredreview +settings.tk-vred.version: + apps: + tk-multi-shotgunpanel: "@settings.tk-multi-shotgunpanel.vred" + run_at_startup: + - {app_instance: tk-multi-shotgunpanel, name: ""} location: "@engines.tk-vred.location" diff --git a/env/version.yml b/env/version.yml index 54f201d..ccc1120 100644 --- a/env/version.yml +++ b/env/version.yml @@ -19,12 +19,14 @@ description: Apps and engines loaded when a Version is loaded. includes: - ./includes/frameworks.yml - ./includes/settings/tk-shotgun.yml +- ./includes/settings/tk-vred.yml ################################################################################ # configuration for all engines to load in a version context engines: tk-shotgun: "@settings.tk-shotgun.version" + tk-vred: "@settings.tk-vred.version" ################################################################################ # reference all of the common frameworks